projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: Change the functions for retrieving token strings.
[pspp]
/
src
/
language
/
lexer
/
q2c.c
diff --git
a/src/language/lexer/q2c.c
b/src/language/lexer/q2c.c
index c03b6b21da6b4d16018d5a1768492440f05be614..cf5a04ee132c6df3449cccc4da8d86c1239a07e1 100644
(file)
--- a/
src/language/lexer/q2c.c
+++ b/
src/language/lexer/q2c.c
@@
-1542,7
+1542,7
@@
dump_specifier_parse (const specifier *spec, const subcommand *sbc)
dump (0, "goto lossage;");
dump (-1, "}");
dump (-1, "free (p->%s%s);", sbc->prefix, st_lower (s->valname));
dump (0, "goto lossage;");
dump (-1, "}");
dump (-1, "free (p->%s%s);", sbc->prefix, st_lower (s->valname));
- dump (0, "p->%s%s =
xstrdup (ds_cstr (lex_tokstr (lexer)
));",
+ dump (0, "p->%s%s =
ss_xstrdup (ss_tokss (lexer
));",
sbc->prefix, st_lower (s->valname));
}
else
sbc->prefix, st_lower (s->valname));
}
else
@@
-1705,7
+1705,7
@@
dump_subcommand (const subcommand *sbc)
outdent ();
if (sbc->restriction)
{
outdent ();
if (sbc->restriction)
{
- dump (0, "x =
ds_length (lex_tokstr
(lexer));");
+ dump (0, "x =
ss_length (lex_tokss
(lexer));");
dump (1, "if (!(%s))", sbc->restriction);
dump (1, "{");
dump (0, "msg (SE, _(\"String for %s must be %s.\"));",
dump (1, "if (!(%s))", sbc->restriction);
dump (1, "{");
dump (0, "msg (SE, _(\"String for %s must be %s.\"));",
@@
-1715,7
+1715,7
@@
dump_subcommand (const subcommand *sbc)
outdent ();
}
dump (0, "free(p->s_%s);", st_lower(sbc->name) );
outdent ();
}
dump (0, "free(p->s_%s);", st_lower(sbc->name) );
- dump (0, "p->s_%s =
ds_xstrdup (lex_tokstr
(lexer));",
+ dump (0, "p->s_%s =
ss_xstrdup (lex_tokss
(lexer));",
st_lower (sbc->name));
dump (0, "lex_get (lexer);");
if (sbc->restriction)
st_lower (sbc->name));
dump (0, "lex_get (lexer);");
if (sbc->restriction)
@@
-1833,13
+1833,13
@@
dump_parser (int persistent)
{
if (def->type == SBC_VARLIST)
dump (1, "if (lex_token (lexer) == T_ID "
{
if (def->type == SBC_VARLIST)
dump (1, "if (lex_token (lexer) == T_ID "
- "&& dict_lookup_var (dataset_dict (ds), lex_tok
id
(lexer)) != NULL "
- "&& lex_look_ahead (lexer) !=
T_EQUALS
)");
+ "&& dict_lookup_var (dataset_dict (ds), lex_tok
cstr
(lexer)) != NULL "
+ "&& lex_look_ahead (lexer) !=
'='
)");
else
{
dump (0, "if ((lex_token (lexer) == T_ID "
else
{
dump (0, "if ((lex_token (lexer) == T_ID "
- "&& dict_lookup_var (dataset_dict (ds), lex_tok
id
(lexer)) "
- "&& lex_look_ahead () !=
T_EQUALS
)");
+ "&& dict_lookup_var (dataset_dict (ds), lex_tok
cstr
(lexer)) "
+ "&& lex_look_ahead () !=
'='
)");
dump (1, " || token == T_ALL)");
}
dump (1, "{");
dump (1, " || token == T_ALL)");
}
dump (1, "{");