struct dictionary *dict;
struct data_parser *parser;
struct dfm_reader *reader;
- struct variable *end;
- struct file_handle *fh;
+ struct variable *end = NULL;
+ struct file_handle *fh = NULL;
+ struct string encoding = DS_EMPTY_INITIALIZER;
int table;
enum data_parser_type type;
bool ok;
dict = in_input_program () ? dataset_dict (ds) : dict_create ();
- parser = data_parser_create ();
+ parser = data_parser_create (dict);
reader = NULL;
- end = NULL;
- fh = NULL;
table = -1; /* Print table if nonzero, -1=undecided. */
has_type = false;
if (fh == NULL)
goto error;
}
+ else if (lex_match_id (lexer, "ENCODING"))
+ {
+ lex_match (lexer, '=');
+ if (!lex_force_string (lexer))
+ goto error;
+
+ ds_init_string (&encoding, lex_tokstr (lexer));
+
+ lex_get (lexer);
+ }
else if (lex_match_id (lexer, "RECORDS"))
{
lex_match (lexer, '=');
if (lex_match_id (lexer, "TAB"))
delim = '\t';
- else if (lex_token (lexer) == T_STRING
+ else if (lex_is_string (lexer)
&& ds_length (lex_tokstr (lexer)) == 1)
{
delim = ds_first (lex_tokstr (lexer));
}
type = data_parser_get_type (parser);
+ if (! ds_is_empty (&encoding))
+ {
+ if ( NULL == fh)
+ msg (MW, _("Encoding should not be specified for inline data. It will be ignored."));
+ else
+ dict_set_encoding (dict, ds_cstr (&encoding));
+ }
+
if (fh == NULL)
fh = fh_inline_file ();
fh_set_default_handle (fh);
data_parser_make_active_file (parser, ds, reader, dict);
fh_unref (fh);
+ ds_destroy (&encoding);
return CMD_SUCCESS;
if (!in_input_program ())
dict_destroy (dict);
fh_unref (fh);
+ ds_destroy (&encoding);
return CMD_CASCADING_FAILURE;
}
\f