X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fxforms%2Fcompute.c;h=8245ffed0ff7cef3cefe09394cfbe9c322387d27;hb=691c25e36fd1ee722dd35419d6110e3876b99f9c;hp=a508933c68cb7686d2690ec0d75048662b3b4e18;hpb=5a6b751888278c8c849ab0f4adf99f1be610e610;p=pspp-builds.git diff --git a/src/language/xforms/compute.c b/src/language/xforms/compute.c index a508933c..8245ffed 100644 --- 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 (!lex_force_match (lexer, '=')) + if (!lex_force_match (lexer, T_EQUALS)) 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. */ - 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) @@ -346,7 +346,7 @@ lvalue_parse (struct lexer *lexer, struct dataset *ds) 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)); @@ -358,12 +358,12 @@ lvalue_parse (struct lexer *lexer, struct dataset *ds) /* 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; - if (!lex_force_match (lexer, ')')) + if (!lex_force_match (lexer, T_RPAREN)) goto lossage; } else