/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "gettext.h"
#define _(msgid) gettext (msgid)
-/* Private result codes for use within INPUT PROGRAM. */
-enum cmd_result_extensions
- {
- CMD_END_CASE = CMD_PRIVATE_FIRST
- };
-
/* Indicates how a `union value' should be initialized. */
struct input_program_pgm
{
{
struct input_program_pgm *inp;
bool saw_END_CASE = false;
+ bool saw_END_FILE = false;
+ bool saw_DATA_LIST = false;
dataset_clear (ds);
if (!lex_match (lexer, T_ENDCMD))
enum cmd_result result;
result = cmd_parse_in_state (lexer, ds, CMD_STATE_INPUT_PROGRAM);
- if (result == CMD_END_CASE)
+ switch (result)
{
+ case CMD_DATA_LIST:
+ saw_DATA_LIST = true;
+ break;
+
+ case CMD_END_CASE:
emit_END_CASE (ds, inp);
saw_END_CASE = true;
- }
- else if (cmd_result_is_failure (result) && result != CMD_FAILURE)
- {
- if (result == CMD_EOF)
- msg (SE, _("Unexpected end-of-file within INPUT PROGRAM."));
- inside_input_program = false;
- dataset_clear (ds);
- destroy_input_program (inp);
- return result;
+ break;
+
+ case CMD_END_FILE:
+ saw_END_FILE = true;
+ break;
+
+ case CMD_FAILURE:
+ break;
+
+ default:
+ if (cmd_result_is_failure (result)
+ && lex_get_error_mode (lexer) != LEX_ERROR_INTERACTIVE)
+ {
+ if (result == CMD_EOF)
+ msg (SE, _("Unexpected end-of-file within INPUT PROGRAM."));
+ inside_input_program = false;
+ dataset_clear (ds);
+ destroy_input_program (inp);
+ return result;
+ }
}
}
if (!saw_END_CASE)
emit_END_CASE (ds, inp);
inside_input_program = false;
+ if (!saw_DATA_LIST && !saw_END_FILE)
+ {
+ msg (SE, _("Input program must contain DATA LIST or END FILE."));
+ dataset_clear (ds);
+ destroy_input_program (inp);
+ return CMD_FAILURE;
+ }
if (dict_get_next_value_idx (dataset_dict (ds)) == 0)
{
msg (SE, _("Input program did not create any variables."));
struct file_handle *fh; /* File to be re-read. */
struct expression *e; /* Expression for column to set. */
struct reread_trns *t; /* Created transformation. */
+ char *encoding = NULL;
fh = fh_get_default_handle ();
e = NULL;
if (e)
{
- msg (SE, _("%s subcommand may be given at most once."), "COLUMN");
- expr_free (e);
- return CMD_CASCADING_FAILURE;
+ lex_sbc_only_once ("COLUMN");
+ goto error;
}
e = expr_parse (lexer, ds, EXPR_NUMBER);
if (!e)
- return CMD_CASCADING_FAILURE;
+ goto error;
}
else if (lex_match_id (lexer, "FILE"))
{
fh_unref (fh);
fh = fh_parse (lexer, FH_REF_FILE | FH_REF_INLINE, NULL);
if (fh == NULL)
- {
- expr_free (e);
- return CMD_CASCADING_FAILURE;
- }
+ goto error;
+ }
+ else if (lex_match_id (lexer, "ENCODING"))
+ {
+ lex_match (lexer, T_EQUALS);
+ if (!lex_force_string (lexer))
+ goto error;
+
+ free (encoding);
+ encoding = ss_xstrdup (lex_tokss (lexer));
+
+ lex_get (lexer);
}
else
{
lex_error (lexer, NULL);
- expr_free (e);
- return CMD_CASCADING_FAILURE;
+ goto error;
}
}
t = xmalloc (sizeof *t);
- t->reader = dfm_open_reader (fh, lexer);
+ t->reader = dfm_open_reader (fh, lexer, encoding);
t->column = e;
add_transformation (ds, reread_trns_proc, reread_trns_free, t);
fh_unref (fh);
+ free (encoding);
return CMD_SUCCESS;
+
+error:
+ expr_free (e);
+ free (encoding);
+ return CMD_CASCADING_FAILURE;
}
/* Executes a REREAD transformation. */
add_transformation (ds, end_file_trns_proc, NULL, NULL);
- return CMD_SUCCESS;
+ return CMD_END_FILE;
}
/* Executes an END FILE transformation. */