projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Encapsulated lexer and updated calling functions accordingly.
[pspp-builds.git]
/
src
/
language
/
dictionary
/
formats.c
diff --git
a/src/language/dictionary/formats.c
b/src/language/dictionary/formats.c
index 384e45a9d75360881a12cbc08f2f38164bc61b5d..71e4d95f7c52a6207fe14e79ae80d136a650949a 100644
(file)
--- a/
src/language/dictionary/formats.c
+++ b/
src/language/dictionary/formats.c
@@
-42,28
+42,28
@@
enum
FORMATS_WRITE = 002
};
FORMATS_WRITE = 002
};
-static int internal_cmd_formats (struct dataset *ds, int);
+static int internal_cmd_formats (struct
lexer *, struct
dataset *ds, int);
int
int
-cmd_print_formats (struct dataset *ds)
+cmd_print_formats (struct
lexer *lexer, struct
dataset *ds)
{
{
- return internal_cmd_formats (ds, FORMATS_PRINT);
+ return internal_cmd_formats (
lexer,
ds, FORMATS_PRINT);
}
int
}
int
-cmd_write_formats (struct dataset *ds)
+cmd_write_formats (struct
lexer *lexer, struct
dataset *ds)
{
{
- return internal_cmd_formats (ds, FORMATS_WRITE);
+ return internal_cmd_formats (
lexer,
ds, FORMATS_WRITE);
}
int
}
int
-cmd_formats (struct dataset *ds)
+cmd_formats (struct
lexer *lexer, struct
dataset *ds)
{
{
- return internal_cmd_formats (ds, FORMATS_PRINT | FORMATS_WRITE);
+ return internal_cmd_formats (
lexer,
ds, FORMATS_PRINT | FORMATS_WRITE);
}
static int
}
static int
-internal_cmd_formats (struct dataset *ds, int which)
+internal_cmd_formats (struct
lexer *lexer, struct
dataset *ds, int which)
{
/* Variables. */
struct variable **v;
{
/* Variables. */
struct variable **v;
@@
-80,24
+80,24
@@
internal_cmd_formats (struct dataset *ds, int which)
for (;;)
{
for (;;)
{
- if (
token
== '.')
+ if (
lex_token (lexer)
== '.')
break;
break;
- if (!parse_variables (dataset_dict (ds), &v, &cv, PV_NUMERIC))
+ if (!parse_variables (
lexer,
dataset_dict (ds), &v, &cv, PV_NUMERIC))
return CMD_FAILURE;
type = v[0]->type;
return CMD_FAILURE;
type = v[0]->type;
- if (!lex_match ('('))
+ if (!lex_match (
lexer,
'('))
{
msg (SE, _("`(' expected after variable list."));
goto fail;
}
{
msg (SE, _("`(' expected after variable list."));
goto fail;
}
- if (!parse_format_specifier (&f)
+ if (!parse_format_specifier (
lexer,
&f)
|| !fmt_check_output (&f)
|| !fmt_check_type_compat (&f, NUMERIC))
goto fail;
|| !fmt_check_output (&f)
|| !fmt_check_type_compat (&f, NUMERIC))
goto fail;
- if (!lex_match (')'))
+ if (!lex_match (
lexer,
')'))
{
msg (SE, _("`)' expected after output format."));
goto fail;
{
msg (SE, _("`)' expected after output format."));
goto fail;