projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: Use error helper functions in more situations.
[pspp-builds.git]
/
src
/
language
/
xforms
/
compute.c
diff --git
a/src/language/xforms/compute.c
b/src/language/xforms/compute.c
index 5089d80ded1b13abd40b6e94041ae9d7f4a0873d..0ab4e3a4bb5ac44cdc6aeaf5a0251b4df2914833 100644
(file)
--- a/
src/language/xforms/compute.c
+++ b/
src/language/xforms/compute.c
@@
-20,8
+20,8
@@
#include <stdlib.h>
#include "data/case.h"
#include <stdlib.h>
#include "data/case.h"
+#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/dictionary.h"
-#include "data/procedure.h"
#include "data/transformations.h"
#include "data/variable.h"
#include "data/vector.h"
#include "data/transformations.h"
#include "data/variable.h"
#include "data/vector.h"
@@
-100,7
+100,7
@@
cmd_compute (struct lexer *lexer, struct dataset *ds)
lvalue_finalize (lvalue, compute, dict);
lvalue_finalize (lvalue, compute, dict);
- return
lex_end_of_command (lexer)
;
+ return
CMD_SUCCESS
;
fail:
lvalue_destroy (lvalue, dict);
fail:
lvalue_destroy (lvalue, dict);
@@
-256,7
+256,7
@@
cmd_if (struct lexer *lexer, struct dataset *ds)
lvalue_finalize (lvalue, compute, dict);
lvalue_finalize (lvalue, compute, dict);
- return
lex_end_of_command (lexer)
;
+ return
CMD_SUCCESS
;
fail:
lvalue_destroy (lvalue, dict);
fail:
lvalue_destroy (lvalue, dict);
@@
-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
) == T_LPAREN)
+ if (lex_
next_token (lexer, 1
) == T_LPAREN)
{
/* Vector. */
lvalue->vector = dict_lookup_vector (dict, lex_tokcstr (lexer));
{
/* Vector. */
lvalue->vector = dict_lookup_vector (dict, lex_tokcstr (lexer));