/* PSPP - a program for statistical analysis.
- Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008, 2009, 2010 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
}
else
{
- printf ("Unknown data file type \"\%s\"\n", lex_tokid (lexer));
goto error;
}
lex_get (lexer);
parse_get_txt (struct lexer *lexer, struct dataset *ds)
{
struct data_parser *parser = NULL;
- struct dictionary *dict = NULL;
+ struct dictionary *dict = dict_create ();
struct file_handle *fh = NULL;
struct dfm_reader *reader = NULL;
if (fh == NULL)
goto error;
- parser = data_parser_create ();
+ parser = data_parser_create (dict);
has_type = false;
data_parser_set_type (parser, DP_DELIMITED);
data_parser_set_span (parser, false);
DP_DELIMITED, &has_type);
else
{
- lex_error (lexer, _("expecting FIXED or DELIMITED"));
+ lex_error (lexer, _("expecting %s or %s"), "FIXED", "DELIMITED");
goto error;
}
if (!ok)
}
else
{
- lex_error (lexer, _("expecting LINE or VARIABLES"));
+ lex_error (lexer, _("expecting %s or %s"), "LINE", "VARIABLES");
goto error;
}
}
break;
else
{
- lex_error (lexer, _("expecting VARIABLES"));
+ lex_error (lexer, _("expecting %s"), "VARIABLES");
goto error;
}
}
lex_match (lexer, '=');
- dict = dict_create ();
+
record = 1;
type = data_parser_get_type (parser);
do