X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fdata-io%2Fget.c;h=d32f25567a25dcfd28cf7b3dad7189cc2bee29f6;hb=a8b84a10b8749b3e2ecbfa0b73deb97e1b682d4e;hp=ea65b5c14e7524c4ad14453ef2b972524f3547bf;hpb=92e42986429596633f71457a585b3266209822dd;p=pspp diff --git a/src/language/data-io/get.c b/src/language/data-io/get.c index ea65b5c14e..d32f25567a 100644 --- a/src/language/data-io/get.c +++ b/src/language/data-io/get.c @@ -66,7 +66,8 @@ cmd_import (struct lexer *lexer, struct dataset *ds) /* Parses a GET or IMPORT command. */ static int -parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command type) +parse_read_command (struct lexer *lexer, struct dataset *ds, + enum reader_command command) { struct casereader *reader = NULL; struct file_handle *fh = NULL; @@ -86,15 +87,12 @@ parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command if (fh == NULL) goto error; } - else if (type == IMPORT_CMD && lex_match_id (lexer, "TYPE")) + else if (command == IMPORT_CMD && lex_match_id (lexer, "TYPE")) { lex_match (lexer, T_EQUALS); - if (lex_match_id (lexer, "COMM")) - type = PFM_COMM; - else if (lex_match_id (lexer, "TAPE")) - type = PFM_TAPE; - else + if (!lex_match_id (lexer, "COMM") + && !lex_match_id (lexer, "TAPE")) { lex_error_expecting (lexer, "COMM", "TAPE", NULL_SENTINEL); goto error; @@ -106,7 +104,7 @@ parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command if (fh == NULL) { - lex_sbc_missing (lexer, "FILE"); + lex_sbc_missing ("FILE"); goto error; }