X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fget.c;h=fea38812f79cc70bda3a1dbe5c1896fdb6718964;hb=691c25e36fd1ee722dd35419d6110e3876b99f9c;hp=cf59c8e0fbadc78f904fe9049d84341c5bf04e60;hpb=774441e68b4d2e3a4b5c6975e9614dcd4369955e;p=pspp-builds.git diff --git a/src/language/data-io/get.c b/src/language/data-io/get.c index cf59c8e0..fea38812 100644 --- a/src/language/data-io/get.c +++ b/src/language/data-io/get.c @@ -75,11 +75,11 @@ parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command for (;;) { - lex_match (lexer, '/'); + lex_match (lexer, T_SLASH); if (lex_match_id (lexer, "FILE") || lex_is_string (lexer)) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); fh_unref (fh); fh = fh_parse (lexer, FH_REF_FILE | FH_REF_SCRATCH); @@ -88,7 +88,7 @@ parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command } else if (type == IMPORT_CMD && lex_match_id (lexer, "TYPE")) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "COMM")) type = PFM_COMM; @@ -116,9 +116,9 @@ parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command case_map_prepare_dict (dict); - while (lex_token (lexer) != '.') + while (lex_token (lexer) != T_ENDCMD) { - lex_match (lexer, '/'); + lex_match (lexer, T_SLASH); if (!parse_dict_trim (lexer, dict)) goto error; }