You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA. */
#include <config.h>
#include "data-in.h"
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
-#include "bool.h"
+#include <stdbool.h>
#include "error.h"
-#include "getline.h"
+#include "getl.h"
#include "calendar.h"
#include "lexer.h"
#include "magic.h"
#include "settings.h"
#include "str.h"
#include "var.h"
-\f
-#include "debug-print.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
+#include "debug-print.h"
\f
/* Specialized error routine. */
return;
ds_init (&title, 64);
- if (!getl_reading_script)
+ if (!getl_reading_script())
ds_puts (&title, _("data-file error: "));
if (i->f1 == i->f2)
ds_printf (&title, _("(column %d"), i->f1);
static void
trim_whitespace (struct data_in *i)
{
- while (i->s < i->e && isspace (i->s[0]))
+ while (i->s < i->e && isspace ((unsigned char) i->s[0]))
i->s++;
- while (i->s < i->e && isspace (i->e[-1]))
+ while (i->s < i->e && isspace ((unsigned char) i->e[-1]))
i->e--;
}
/* Returns nonzero if we're not at the end of the string being
parsed. */
-static inline int
+static inline bool
have_char (struct data_in *i)
{
return i->s < i->e;
\f
/* Format parsers. */
-static int parse_int (struct data_in *i, long *result);
+static bool parse_int (struct data_in *i, long *result);
/* This function is based on strtod() from the GNU C library. */
-static int
+static bool
parse_numeric (struct data_in *i)
{
int sign; /* +1 or -1. */
double num; /* The number so far. */
- int got_dot; /* Found a decimal point. */
- int got_digit; /* Count of digits. */
+ bool got_dot; /* Found a decimal point. */
+ size_t digit_cnt; /* Count of digits. */
int decimal; /* Decimal point character. */
int grouping; /* Grouping character. */
i->v->f = SYSMIS;
num = 0.0;
- got_dot = 0;
- got_digit = 0;
+ got_dot = false;
+ digit_cnt = 0;
exponent = 0;
for (; have_char (i); i->s++)
{
- if (isdigit (*i->s))
+ if (isdigit ((unsigned char) *i->s))
{
- got_digit++;
+ digit_cnt++;
/* Make sure that multiplication by 10 will not overflow. */
if (num > DBL_MAX * 0.1)
}
else if (!got_dot && *i->s == decimal)
/* Record that we have found the decimal point. */
- got_dot = 1;
+ got_dot = true;
else if ((type != FMT_COMMA && type != FMT_DOT) || *i->s != grouping)
/* Any other character terminates the number. */
break;
}
- if (!got_digit)
+ if (!digit_cnt)
{
if (got_dot)
{
i->v->f = SYSMIS;
- return 1;
+ return true;
}
dls_error (i, _("Field does not form a valid floating-point constant."));
i->v->f = SYSMIS;
- return 0;
+ return false;
}
- if (have_char (i)
- && (tolower (*i->s) == 'e' || tolower (*i->s) == 'd'
- || (type == FMT_E && (*i->s == '+' || *i->s == '-'))))
+ if (have_char (i) && strchr ("eEdD-+", *i->s))
{
/* Get the exponent specified after the `e' or `E'. */
long exp;
- if (isalpha (*i->s))
+ if (isalpha ((unsigned char) *i->s))
i->s++;
if (!parse_int (i, &exp))
{
i->v->f = SYSMIS;
- return 0;
+ return false;
}
exponent += exp;
{
dls_error (i, _("Field contents followed by garbage."));
i->v->f = SYSMIS;
- return 0;
+ return false;
}
if (num == 0.0)
{
i->v->f = 0.0;
- return 1;
+ return true;
}
/* Multiply NUM by 10 to the EXPONENT power, checking for overflow
and underflow. */
if (exponent < 0)
{
- if (-exponent + got_digit > -(DBL_MIN_10_EXP) + 5
+ if (-exponent + digit_cnt > -(DBL_MIN_10_EXP) + 5
|| num < DBL_MIN * pow (10.0, (double) -exponent))
{
dls_error (i, _("Underflow in floating-point constant."));
i->v->f = 0.0;
- return 0;
+ return false;
}
num *= pow (10.0, (double) exponent);
{
dls_error (i, _("Overflow in floating-point constant."));
i->v->f = SYSMIS;
- return 0;
+ return false;
}
num *= pow (10.0, (double) exponent);
}
i->v->f = sign > 0 ? num : -num;
- return 1;
+ return true;
}
/* Returns the integer value of hex digit C. */
return cp - s;
}
-static inline int
+static inline bool
parse_N (struct data_in *i)
{
- const unsigned char *cp;
+ const char *cp;
i->v->f = 0;
for (cp = i->s; cp < i->e; cp++)
{
- if (!isdigit (*cp))
+ if (!isdigit ((unsigned char) *cp))
{
dls_error (i, _("All characters in field must be digits."));
- return 0;
+ return false;
}
- i->v->f = i->v->f * 10.0 + *cp - '0';
+ i->v->f = i->v->f * 10.0 + (*cp - '0');
}
apply_implied_decimals (i);
- return 1;
+ return true;
}
-static inline int
+static inline bool
parse_PIBHEX (struct data_in *i)
{
double n;
- const unsigned char *cp;
+ const char *cp;
trim_whitespace (i);
n = 0.0;
for (cp = i->s; cp < i->e; cp++)
{
- if (!isxdigit (*cp))
+ if (!isxdigit ((unsigned char) *cp))
{
dls_error (i, _("Unrecognized character in field."));
- return 0;
+ return false;
}
n = n * 16.0 + hexit_value (*cp);
}
i->v->f = n;
- return 1;
+ return true;
}
-static inline int
+static inline bool
parse_RBHEX (struct data_in *i)
{
/* Validate input. */
if ((i->e - i->s) % 2)
{
dls_error (i, _("Field must have even length."));
- return 0;
+ return false;
}
{
- const unsigned char *cp;
+ const char *cp;
for (cp = i->s; cp < i->e; cp++)
- if (!isxdigit (*cp))
+ if (!isxdigit ((unsigned char) *cp))
{
dls_error (i, _("Field must contain only hex digits."));
- return 0;
+ return false;
}
}
i->v->f = u.d;
}
- return 1;
+ return true;
}
-static inline int
+static inline bool
parse_Z (struct data_in *i)
{
char buf[64];
/* Warn user that we suck. */
{
- static int warned;
+ static bool warned;
if (!warned)
{
_("Quality of zoned decimal (Z) input format code is "
"suspect. Check your results three times. Report bugs "
"to %s."),PACKAGE_BUGREPORT);
- warned = 1;
+ warned = true;
}
}
{
dls_error (i, _("Zoned decimal field contains fewer than 2 "
"characters."));
- return 0;
+ return false;
}
/* Copy sign into buf[0]. */
if ((i->e[-1] & 0xc0) != 0xc0)
{
dls_error (i, _("Bad sign byte in zoned decimal number."));
- return 0;
+ return false;
}
buf[0] = (i->e[-1] ^ (i->e[-1] >> 1)) & 0x10 ? '-' : '+';
/* Copy digits into buf[1 ... len - 1] and terminate string. */
{
- const unsigned char *sp;
+ const char *sp;
char *dp;
for (sp = i->s, dp = buf + 1; sp < i->e - 1; sp++, dp++)
else
{
dls_error (i, _("Format error in zoned decimal number."));
- return 0;
+ return false;
}
*dp = '\0';
{
char *tail;
- i->v->f = strtod ((char *) buf, (char **) &tail);
- if ((unsigned char *) tail != i->e)
+ i->v->f = strtod (buf, &tail);
+ if (tail != i->e)
{
dls_error (i, _("Error in syntax of zoned decimal number."));
- return 0;
+ return false;
}
}
if (!got_dot)
apply_implied_decimals (i);
- return 1;
+ return true;
}
-static inline int
+static inline bool
parse_IB (struct data_in *i)
{
+#ifndef WORDS_BIGENDIAN
char buf[64];
- const char *p;
+#endif
+ const unsigned char *p;
unsigned char xor;
/* We want the data to be in big-endian format. If this is a
little-endian machine, reverse the byte order. */
#ifdef WORDS_BIGENDIAN
- p = i->s;
+ p = (const unsigned char *) i->s;
#else
memcpy (buf, i->s, i->e - i->s);
- mm_reverse (buf, i->e - i->s);
- p = buf;
+ buf_reverse (buf, i->e - i->s);
+ p = (const unsigned char *) buf;
#endif
/* If the value is negative, we need to logical-NOT each value
apply_implied_decimals (i);
- return 1;
+ return true;
}
-static inline int
+static inline bool
parse_PIB (struct data_in *i)
{
int j;
i->v->f = 0.0;
#if WORDS_BIGENDIAN
for (j = 0; j < i->e - i->s; j++)
- i->v->f = i->v->f * 256.0 + i->s[j];
+ i->v->f = i->v->f * 256.0 + (unsigned char) i->s[j];
#else
for (j = i->e - i->s - 1; j >= 0; j--)
- i->v->f = i->v->f * 256.0 + i->s[j];
+ i->v->f = i->v->f * 256.0 + (unsigned char) i->s[j];
#endif
apply_implied_decimals (i);
- return 1;
+ return true;
}
-static inline int
+static inline bool
parse_P (struct data_in *i)
{
- const unsigned char *cp;
+ const char *cp;
i->v->f = 0.0;
for (cp = i->s; cp < i->e - 1; cp++)
{
- i->v->f = i->v->f * 10 + (*cp >> 4);
+ i->v->f = i->v->f * 10 + ((*cp >> 4) & 15);
i->v->f = i->v->f * 10 + (*cp & 15);
}
- i->v->f = i->v->f * 10 + (*cp >> 4);
+ i->v->f = i->v->f * 10 + ((*cp >> 4) & 15);
if ((*cp ^ (*cp >> 1)) & 0x10)
i->v->f = -i->v->f;
apply_implied_decimals (i);
- return 1;
+ return true;
}
-static inline int
+static inline bool
parse_PK (struct data_in *i)
{
- const unsigned char *cp;
+ const char *cp;
i->v->f = 0.0;
for (cp = i->s; cp < i->e; cp++)
{
- i->v->f = i->v->f * 10 + (*cp >> 4);
+ i->v->f = i->v->f * 10 + ((*cp >> 4) & 15);
i->v->f = i->v->f * 10 + (*cp & 15);
}
apply_implied_decimals (i);
- return 1;
+ return true;
}
-static inline int
+static inline bool
parse_RB (struct data_in *i)
{
union
u;
memset (u.c, 0, sizeof u.c);
- memcpy (u.c, i->s, min ((int) sizeof (u.c), i->e - i->s));
+ memcpy (u.c, i->s, min (sizeof u.c, (size_t) (i->e - i->s)));
i->v->f = u.d;
- return 1;
+ return true;
}
-static inline int
+static inline bool
parse_A (struct data_in *i)
{
- ptrdiff_t len = i->e - i->s;
-
- if (len >= i->format.w)
- memcpy (i->v->s, i->s, i->format.w);
- else
- {
- memcpy (i->v->s, i->s, len);
- memset (i->v->s + len, ' ', i->format.w - len);
- }
-
- return 1;
+ buf_copy_rpad (i->v->s, i->format.w, i->s, i->e - i->s);
+ return true;
}
-static inline int
+static inline bool
parse_AHEX (struct data_in *i)
{
/* Validate input. */
if ((i->e - i->s) % 2)
{
dls_error (i, _("Field must have even length."));
- return 0;
+ return false;
}
{
- const unsigned char *cp;
+ const char *cp;
for (cp = i->s; cp < i->e; cp++)
- if (!isxdigit (*cp))
+ if (!isxdigit ((unsigned char) *cp))
{
dls_error (i, _("Field must contain only hex digits."));
- return 0;
+ return false;
}
}
memset (i->v->s + (i->e - i->s) / 2, ' ', (i->format.w - (i->e - i->s)) / 2);
}
- return 1;
+ return true;
}
\f
/* Date & time format components. */
i->s++;
}
-static inline int
+static inline bool
parse_leader (struct data_in *i)
{
skip_whitespace (i);
- return 1;
+ return true;
}
-static inline int
+static inline bool
force_have_char (struct data_in *i)
{
if (have_char (i))
- return 1;
+ return true;
dls_error (i, _("Unexpected end of field."));
- return 0;
+ return false;
}
-static int
+static bool
parse_int (struct data_in *i, long *result)
{
- int negative = 0;
+ bool negative = false;
if (!force_have_char (i))
- return 0;
+ return false;
if (*i->s == '+')
{
}
else if (*i->s == '-')
{
- negative = 1;
+ negative = true;
i->s++;
force_have_char (i);
}
- if (!isdigit (*i->s))
+ if (!isdigit ((unsigned char) *i->s))
{
dls_error (i, _("Digit expected in field."));
- return 0;
+ return false;
}
*result = 0;
for (;;)
{
- *result = *result * 10 + *i->s++ - '0';
- if (!have_char (i) || !isdigit (*i->s))
+ *result = *result * 10 + (*i->s++ - '0');
+ if (!have_char (i) || !isdigit ((unsigned char) *i->s))
break;
}
if (negative)
*result = -*result;
- return 1;
+ return true;
}
-static int
+static bool
parse_day (struct data_in *i, long *day)
{
if (!parse_int (i, day))
- return 0;
+ return false;
if (*day >= 1 && *day <= 31)
- return 1;
+ return true;
dls_error (i, _("Day (%ld) must be between 1 and 31."), *day);
- return 0;
+ return false;
}
-static int
+static bool
parse_day_count (struct data_in *i, long *day_count)
{
return parse_int (i, day_count);
}
-static int
+static bool
parse_date_delimiter (struct data_in *i)
{
- int delim = 0;
+ bool delim = false;
while (have_char (i)
- && (*i->s == '-' || *i->s == '/' || isspace (*i->s)
+ && (*i->s == '-' || *i->s == '/' || isspace ((unsigned char) *i->s)
|| *i->s == '.' || *i->s == ','))
{
- delim = 1;
+ delim = true;
i->s++;
}
if (delim)
- return 1;
+ return true;
dls_error (i, _("Delimiter expected between fields in date."));
- return 0;
+ return false;
}
/* Association between a name and a value. */
/* Consume alphabetic characters. */
name = i->s;
length = 0;
- while (have_char (i) && isalpha (*i->s))
+ while (have_char (i) && isalpha ((unsigned char) *i->s))
{
length++;
i->s++;
if (length == 0)
{
dls_error (i, _("Parse error at `%c' expecting %s."), *i->s, what);
- return 0;
+ return false;
}
for (ep = enum_names; ep->name != NULL; ep++)
if ((ep->can_abbreviate
&& lex_id_match_len (ep->name, strlen (ep->name), name, length))
|| (!ep->can_abbreviate && length == strlen (ep->name)
- && !memcmp (name, ep->name, length)))
+ && !buf_compare_case (name, ep->name, length)))
{
*output = ep->value;
- return 1;
+ return true;
}
dls_error (i, _("Unknown %s `%.*s'."), what, (int) length, name);
- return 0;
+ return false;
}
-static int
+static bool
parse_month (struct data_in *i, long *month)
{
static const struct enum_name month_names[] =
};
if (!force_have_char (i))
- return 0;
+ return false;
- if (isdigit (*i->s))
+ if (isdigit ((unsigned char) *i->s))
{
if (!parse_int (i, month))
- return 0;
+ return false;
if (*month >= 1 && *month <= 12)
- return 1;
+ return true;
dls_error (i, _("Month (%ld) must be between 1 and 12."), *month);
- return 0;
+ return false;
}
else
return parse_enum (i, _("month"), month_names, month);
}
-static int
+static bool
parse_year (struct data_in *i, long *year)
{
if (!parse_int (i, year))
- return 0;
+ return false;
if (*year >= 0 && *year <= 199)
*year += 1900;
if (*year >= 1582 || *year <= 19999)
- return 1;
+ return true;
dls_error (i, _("Year (%ld) must be between 1582 and 19999."), *year);
- return 0;
+ return false;
}
-static int
+static bool
parse_trailer (struct data_in *i)
{
skip_whitespace (i);
if (!have_char (i))
- return 1;
+ return true;
dls_error (i, _("Trailing garbage \"%s\" following date."), i->s);
- return 0;
+ return false;
}
-static int
+static bool
parse_julian (struct data_in *i, long *julian)
{
if (!parse_int (i, julian))
- return 0;
+ return false;
{
int day = *julian % 1000;
if (day < 1 || day > 366)
{
dls_error (i, _("Julian day (%d) must be between 1 and 366."), day);
- return 0;
+ return false;
}
}
else if (year < 1582 || year > 19999)
{
dls_error (i, _("Year (%d) must be between 1582 and 19999."), year);
- return 0;
+ return false;
}
}
- return 1;
+ return true;
}
-static int
+static bool
parse_quarter (struct data_in *i, long *quarter)
{
if (!parse_int (i, quarter))
- return 0;
+ return false;
if (*quarter >= 1 && *quarter <= 4)
- return 1;
+ return true;
dls_error (i, _("Quarter (%ld) must be between 1 and 4."), *quarter);
- return 0;
+ return false;
}
-static int
+static bool
parse_q_delimiter (struct data_in *i)
{
skip_whitespace (i);
- if (!have_char (i) || tolower (*i->s) != 'q')
+ if (!have_char (i) || tolower ((unsigned char) *i->s) != 'q')
{
dls_error (i, _("`Q' expected between quarter and year."));
- return 0;
+ return false;
}
i->s++;
skip_whitespace (i);
- return 1;
+ return true;
}
-static int
+static bool
parse_week (struct data_in *i, long *week)
{
if (!parse_int (i, week))
- return 0;
+ return false;
if (*week >= 1 && *week <= 53)
- return 1;
+ return true;
dls_error (i, _("Week (%ld) must be between 1 and 53."), *week);
- return 0;
+ return false;
}
-static int
+static bool
parse_wk_delimiter (struct data_in *i)
{
skip_whitespace (i);
if (i->s + 1 >= i->e
- || tolower (i->s[0]) != 'w' || tolower (i->s[1]) != 'k')
+ || tolower ((unsigned char) i->s[0]) != 'w'
+ || tolower ((unsigned char) i->s[1]) != 'k')
{
dls_error (i, _("`WK' expected between week and year."));
- return 0;
+ return false;
}
i->s += 2;
skip_whitespace (i);
- return 1;
+ return true;
}
-static int
+static bool
parse_time_delimiter (struct data_in *i)
{
- int delim = 0;
+ bool delim = false;
- while (have_char (i)
- && (*i->s == ':' || *i->s == '.' || isspace (*i->s)))
+ while (have_char (i) && (*i->s == ':' || *i->s == '.'
+ || isspace ((unsigned char) *i->s)))
{
- delim = 1;
+ delim = true;
i->s++;
}
if (delim)
- return 1;
+ return true;
dls_error (i, _("Delimiter expected between fields in time."));
- return 0;
+ return false;
}
-static int
+static bool
parse_hour (struct data_in *i, long *hour)
{
if (!parse_int (i, hour))
- return 0;
+ return false;
if (*hour >= 0)
- return 1;
+ return true;
dls_error (i, _("Hour (%ld) must be positive."), *hour);
- return 0;
+ return false;
}
-static int
+static bool
parse_minute (struct data_in *i, long *minute)
{
if (!parse_int (i, minute))
- return 0;
+ return false;
if (*minute >= 0 && *minute <= 59)
- return 1;
+ return true;
dls_error (i, _("Minute (%ld) must be between 0 and 59."), *minute);
- return 0;
+ return false;
}
-static int
+static bool
parse_opt_second (struct data_in *i, double *second)
{
- int delim = 0;
+ bool delim = false;
char buf[64];
char *cp;
while (have_char (i)
- && (*i->s == ':' || *i->s == '.' || isspace (*i->s)))
+ && (*i->s == ':' || *i->s == '.' || isspace ((unsigned char) *i->s)))
{
- delim = 1;
+ delim = true;
i->s++;
}
- if (!delim || !isdigit (*i->s))
+ if (!delim || !isdigit ((unsigned char) *i->s))
{
*second = 0.0;
- return 1;
+ return true;
}
cp = buf;
- while (have_char (i) && isdigit (*i->s))
+ while (have_char (i) && isdigit ((unsigned char) *i->s))
*cp++ = *i->s++;
if (have_char (i) && *i->s == '.')
*cp++ = *i->s++;
- while (have_char (i) && isdigit (*i->s))
+ while (have_char (i) && isdigit ((unsigned char) *i->s))
*cp++ = *i->s++;
*cp = '\0';
*second = strtod (buf, NULL);
- return 1;
+ return true;
}
-static int
+static bool
parse_hour24 (struct data_in *i, long *hour24)
{
if (!parse_int (i, hour24))
- return 0;
+ return false;
if (*hour24 >= 0 && *hour24 <= 23)
- return 1;
+ return true;
dls_error (i, _("Hour (%ld) must be between 0 and 23."), *hour24);
- return 0;
+ return false;
}
-static int
+static bool
parse_weekday (struct data_in *i, long *weekday)
{
static const struct enum_name weekday_names[] =
return parse_enum (i, _("weekday"), weekday_names, weekday);
}
-static int
+static bool
parse_spaces (struct data_in *i)
{
skip_whitespace (i);
- return 1;
+ return true;
}
-static int
+static bool
parse_sign (struct data_in *i, int *sign)
{
if (!force_have_char (i))
- return 0;
+ return false;
switch (*i->s)
{
break;
}
- return 1;
+ return true;
}
\f
/* Date & time formats. */
return false;
}
-static int
+static bool
parse_DATE (struct data_in *i)
{
long day, month, year;
&& ymd_to_date (i, year, month, day, &i->v->f));
}
-static int
+static bool
parse_ADATE (struct data_in *i)
{
long month, day, year;
&& ymd_to_date (i, year, month, day, &i->v->f));
}
-static int
+static bool
parse_EDATE (struct data_in *i)
{
long month, day, year;
&& ymd_to_date (i, year, month, day, &i->v->f));
}
-static int
+static bool
parse_SDATE (struct data_in *i)
{
long month, day, year;
&& ymd_to_date (i, year, month, day, &i->v->f));
}
-static int
+static bool
parse_JDATE (struct data_in *i)
{
long julian;
|| !parse_julian (i, &julian)
|| !parse_trailer (i)
|| !ymd_to_ofs (i, julian / 1000, 1, 1, &ofs))
- return 0;
+ return false;
i->v->f = (ofs + julian % 1000 - 1) * 60. * 60. * 24.;
- return 1;
+ return true;
}
-static int
+static bool
parse_QYR (struct data_in *i)
{
long quarter, year;
&& ymd_to_date (i, year, (quarter - 1) * 3 + 1, 1, &i->v->f));
}
-static int
+static bool
parse_MOYR (struct data_in *i)
{
long month, year;
&& ymd_to_date (i, year, month, 1, &i->v->f));
}
-static int
+static bool
parse_WKYR (struct data_in *i)
{
long week, year;
|| !parse_wk_delimiter (i)
|| !parse_year (i, &year)
|| !parse_trailer (i))
- return 0;
+ return false;
if (year != 1582)
{
if (!ymd_to_ofs (i, year, 1, 1, &ofs))
- return 0;
+ return false;
}
else
{
if (ymd_to_ofs (i, 1583, 1, 1, &ofs))
- return 0;
+ return false;
ofs -= 365;
}
i->v->f = (ofs + (week - 1) * 7) * 60. * 60. * 24.;
- return 1;
+ return true;
}
-static int
+static bool
parse_TIME (struct data_in *i)
{
int sign;
|| !parse_time_delimiter (i)
|| !parse_minute (i, &minute)
|| !parse_opt_second (i, &second))
- return 0;
+ return false;
i->v->f = (hour * 60. * 60. + minute * 60. + second) * sign;
- return 1;
+ return true;
}
-static int
+static bool
parse_DTIME (struct data_in *i)
{
int sign;
|| !parse_time_delimiter (i)
|| !parse_minute (i, &minute)
|| !parse_opt_second (i, &second))
- return 0;
+ return false;
i->v->f = (day_count * 60. * 60. * 24.
+ hour * 60. * 60.
+ minute * 60.
+ second) * sign;
- return 1;
+ return true;
}
-static int
+static bool
parse_DATETIME (struct data_in *i)
{
long day, month, year;
|| !parse_minute (i, &minute)
|| !parse_opt_second (i, &second)
|| !ymd_to_date (i, year, month, day, &i->v->f))
- return 0;
+ return false;
i->v->f += hour24 * 60. * 60. + minute * 60. + second;
- return 1;
+ return true;
}
-static int
+static bool
parse_WKDAY (struct data_in *i)
{
long weekday;
if (!parse_leader (i)
|| !parse_weekday (i, &weekday)
|| !parse_trailer (i))
- return 0;
+ return false;
i->v->f = weekday;
- return 1;
+ return true;
}
-static int
+static bool
parse_MONTH (struct data_in *i)
{
long month;
if (!parse_leader (i)
|| !parse_month (i, &month)
|| !parse_trailer (i))
- return 0;
+ return false;
i->v->f = month;
- return 1;
+ return true;
}
\f
/* Main dispatcher. */
i->v->f = get_blanks();
}
-int
+bool
data_in (struct data_in *i)
{
const struct fmt_desc *const fmt = &formats[i->format.type];
+ assert (check_input_specifier (&i->format, 0));
+
/* Check that we've got a string to work with. */
if (i->e == i->s || i->format.w <= 0)
{
default_result (i);
- return 1;
+ return true;
}
i->f2 = i->f1 + (i->e - i->s) - 1;
if (fmt->cat & FCAT_BLANKS_SYSMIS)
{
- const unsigned char *cp;
+ const char *cp;
cp = i->s;
for (;;)
{
- if (!isspace (*cp))
+ if (!isspace ((unsigned char) *cp))
break;
if (++cp == i->e)
{
i->v->f = get_blanks();
- return 1;
+ return true;
}
}
}
{
- static int (*const handlers[FMT_NUMBER_OF_FORMATS])(struct data_in *) =
+ static bool (*const handlers[FMT_NUMBER_OF_FORMATS])(struct data_in *) =
{
parse_numeric, parse_N, parse_numeric, parse_numeric,
parse_numeric, parse_numeric, parse_numeric,
parse_WKDAY, parse_MONTH,
};
- int (*handler)(struct data_in *);
- int success;
+ bool (*handler)(struct data_in *);
+ bool success;
handler = handlers[i->format.type];
assert (handler != NULL);
projects / pspp-builds.git / blobdiff