projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
q2c: Remove final untranslated strings from q2c.c.
[pspp]
/
src
/
language
/
data-io
/
get.c
diff --git
a/src/language/data-io/get.c
b/src/language/data-io/get.c
index 1b63e75ad8cc3cf6bb2a8ec6c575b167ea4a4d62..028cc3c6c525989564d841ea3c0e0fecf2cfd257 100644
(file)
--- a/
src/language/data-io/get.c
+++ b/
src/language/data-io/get.c
@@
-82,7
+82,7
@@
parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command
lex_match (lexer, T_EQUALS);
fh_unref (fh);
lex_match (lexer, T_EQUALS);
fh_unref (fh);
- fh = fh_parse (lexer, FH_REF_FILE
| FH_REF_SCRATCH
);
+ fh = fh_parse (lexer, FH_REF_FILE
, NULL
);
if (fh == NULL)
goto error;
}
if (fh == NULL)
goto error;
}
@@
-96,7
+96,7
@@
parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command
type = PFM_TAPE;
else
{
type = PFM_TAPE;
else
{
- lex_error
(lexer, _("expecting %s or %s"), "COMM", "TAPE"
);
+ lex_error
_expecting (lexer, "COMM", "TAPE", NULL_SENTINEL
);
goto error;
}
}
goto error;
}
}
@@
-106,7
+106,7
@@
parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command
if (fh == NULL)
{
if (fh == NULL)
{
- lex_sbc_missing (
lexer,
"FILE");
+ lex_sbc_missing ("FILE");
goto error;
}
goto error;
}
@@
-128,7
+128,8
@@
parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command
if (map != NULL)
reader = case_map_create_input_translator (map, reader);
if (map != NULL)
reader = case_map_create_input_translator (map, reader);
- proc_set_active_file (ds, reader, dict);
+ dataset_set_dict (ds, dict);
+ dataset_set_source (ds, reader);
fh_unref (fh);
return CMD_SUCCESS;
fh_unref (fh);
return CMD_SUCCESS;