projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: New type enum token_type.
[pspp-builds.git]
/
src
/
language
/
xforms
/
compute.c
diff --git
a/src/language/xforms/compute.c
b/src/language/xforms/compute.c
index a508933c68cb7686d2690ec0d75048662b3b4e18..8245ffed0ff7cef3cefe09394cfbe9c322387d27 100644
(file)
--- a/
src/language/xforms/compute.c
+++ b/
src/language/xforms/compute.c
@@
-90,7
+90,7
@@
cmd_compute (struct lexer *lexer, struct dataset *ds)
if (lvalue == NULL)
goto fail;
if (lvalue == NULL)
goto fail;
- if (!lex_force_match (lexer,
'='
))
+ if (!lex_force_match (lexer,
T_EQUALS
))
goto fail;
compute->rvalue = parse_rvalue (lexer, lvalue, ds);
if (compute->rvalue == NULL)
goto fail;
compute->rvalue = parse_rvalue (lexer, lvalue, ds);
if (compute->rvalue == NULL)
@@
-246,7
+246,7
@@
cmd_if (struct lexer *lexer, struct dataset *ds)
goto fail;
/* Rvalue expression. */
goto fail;
/* Rvalue expression. */
- if (!lex_force_match (lexer,
'='
))
+ if (!lex_force_match (lexer,
T_EQUALS
))
goto fail;
compute->rvalue = parse_rvalue (lexer, lvalue, ds);
if (compute->rvalue == NULL)
goto fail;
compute->rvalue = parse_rvalue (lexer, lvalue, ds);
if (compute->rvalue == NULL)
@@
-346,7
+346,7
@@
lvalue_parse (struct lexer *lexer, struct dataset *ds)
if (!lex_force_id (lexer))
goto lossage;
if (!lex_force_id (lexer))
goto lossage;
- if (lex_look_ahead (lexer) ==
'('
)
+ if (lex_look_ahead (lexer) ==
T_LPAREN
)
{
/* Vector. */
lvalue->vector = dict_lookup_vector (dict, lex_tokid (lexer));
{
/* Vector. */
lvalue->vector = dict_lookup_vector (dict, lex_tokid (lexer));
@@
-358,12
+358,12
@@
lvalue_parse (struct lexer *lexer, struct dataset *ds)
/* Vector element. */
lex_get (lexer);
/* Vector element. */
lex_get (lexer);
- if (!lex_force_match (lexer,
'('
))
+ if (!lex_force_match (lexer,
T_LPAREN
))
goto lossage;
lvalue->element = expr_parse (lexer, ds, EXPR_NUMBER);
if (lvalue->element == NULL)
goto lossage;
goto lossage;
lvalue->element = expr_parse (lexer, ds, EXPR_NUMBER);
if (lvalue->element == NULL)
goto lossage;
- if (!lex_force_match (lexer,
')'
))
+ if (!lex_force_match (lexer,
T_RPAREN
))
goto lossage;
}
else
goto lossage;
}
else