+Sat Jan 7 13:30:54 WST 2006 John Darrington <john@darrington.wattle.id.au>
+
+ * command.c data-in.c main.c: Fixed bug which crept in when
+ separating getl from readline.
+
+ * vars-atr.c value-labels.h: Fixed constness of val_labs_count.
+
Fri Dec 23 20:59:01 WST 2005 John Darrington <john@darrington.wattle.id.au>
* getl.c error.c: Separated file_loc functionality from error.c
int
cmd_exit (void)
{
- if (getl_reading_script)
+ if (getl_reading_script())
{
msg (SE, _("This command is not accepted in a syntax file. "
"Instead, use FINISH to terminate a syntax file."));
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);
assert (0);
}
- if (getl_reading_script)
+ if (getl_reading_script())
{
err_break ();
while (token != T_STOP && token != '.')
/* Returns the number of value labels in VLS. */
size_t
-val_labs_count (struct val_labs *vls)
+val_labs_count (const struct val_labs *vls)
{
assert (vls != NULL);
void val_labs_set_width (struct val_labs *, int new_width);
void val_labs_destroy (struct val_labs *);
void val_labs_clear (struct val_labs *);
-size_t val_labs_count (struct val_labs *);
+size_t val_labs_count (const struct val_labs *);
int val_labs_add (struct val_labs *, union value, const char *);
int val_labs_replace (struct val_labs *, union value, const char *);
if (lex_id_to_token (name, strlen (name)) != T_ID)
{
if (issue_error)
- msg (SE, _("%s may not be used as a variable name because it "
+ msg (SE, _("`%s' may not be used as a variable name because it "
"is a reserved word."), name);
return false;
}