/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2007, 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 "data/case.h"
#include "data/casereader.h"
#include "data/data-in.h"
+#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/format.h"
-#include "data/procedure.h"
#include "data/settings.h"
#include "data/transformations.h"
#include "data/variable.h"
#include "language/lexer/variable-parser.h"
#include "libpspp/assertion.h"
#include "libpspp/compiler.h"
+#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/misc.h"
#include "libpspp/pool.h"
struct dfm_reader *reader;
struct variable *end = NULL;
struct file_handle *fh = NULL;
- struct string encoding = DS_EMPTY_INITIALIZER;
+ char *encoding = NULL;
int table;
enum data_parser_type type;
struct pool *tmp_pool;
bool ok;
- dict = in_input_program () ? dataset_dict (ds) : dict_create ();
+ dict = (in_input_program ()
+ ? dataset_dict (ds)
+ : dict_create (get_default_encoding ()));
parser = data_parser_create (dict);
reader = NULL;
{
lex_match (lexer, T_EQUALS);
fh_unref (fh);
- fh = fh_parse (lexer, FH_REF_FILE | FH_REF_INLINE);
+ fh = fh_parse (lexer, FH_REF_FILE | FH_REF_INLINE, NULL);
if (fh == NULL)
goto error;
}
if (!lex_force_string (lexer))
goto error;
- ds_init_substring (&encoding, lex_tokss (lexer));
+ free (encoding);
+ encoding = ss_xstrdup (lex_tokss (lexer));
lex_get (lexer);
}
else if (lex_match_id (lexer, "RECORDS"))
{
+ if (data_parser_get_records (parser) > 0)
+ {
+ lex_sbc_only_once ("RECORDS");
+ goto error;
+ }
lex_match (lexer, T_EQUALS);
lex_match (lexer, T_LPAREN);
- if (!lex_force_int (lexer))
+ if (!lex_force_int_range (lexer, "RECORDS", 0, INT_MAX))
goto error;
data_parser_set_records (parser, lex_integer (lexer));
lex_get (lexer);
else if (lex_match_id (lexer, "SKIP"))
{
lex_match (lexer, T_EQUALS);
- if (!lex_force_int (lexer))
+ if (!lex_force_int_range (lexer, "SKIP", 0, INT_MAX))
goto error;
data_parser_set_skip (parser, lex_integer (lexer));
lex_get (lexer);
{
if (!in_input_program ())
{
- msg (SE, _("The END subcommand may only be used within "
- "INPUT PROGRAM."));
+ msg (SE, _("The %s subcommand may only be used within %s."), "END", "INPUT PROGRAM");
goto error;
}
if (end)
{
- msg (SE, _("The END subcommand may only be specified once."));
+ lex_sbc_only_once ("END");
goto error;
}
data_parser_set_quotes (parser, ss_cstr ("'\""));
data_parser_set_soft_delimiters (parser,
ss_cstr (CC_SPACES));
- data_parser_set_hard_delimiters (parser, ss_cstr (","));
+ const char decimal = settings_get_fmt_settings ()->decimal;
+ data_parser_set_hard_delimiters (parser,
+ ss_buffer (",", (decimal == '.') ? 1 : 0));
}
}
}
}
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 (encoding && NULL == fh)
+ msg (MW, _("Encoding should not be specified for inline data. It will be "
+ "ignored."));
if (fh == NULL)
fh = fh_inline_file ();
if (type != DP_FIXED && end != NULL)
{
- msg (SE, _("The END subcommand may be used only with DATA LIST FIXED."));
+ msg (SE, _("The %s subcommand may be used only with %s."), "END", "DATA LIST FIXED");
goto error;
}
if (table)
data_parser_output_description (parser, fh);
- reader = dfm_open_reader (fh, lexer);
+ reader = dfm_open_reader (fh, lexer, encoding);
if (reader == NULL)
goto error;
add_transformation (ds, data_list_trns_proc, data_list_trns_free, trns);
}
else
- data_parser_make_active_file (parser, ds, reader, dict);
+ data_parser_make_active_file (parser, ds, reader, dict, NULL, NULL);
fh_unref (fh);
- ds_destroy (&encoding);
+ free (encoding);
- return CMD_SUCCESS;
+ return CMD_DATA_LIST;
error:
data_parser_destroy (parser);
if (!in_input_program ())
- dict_destroy (dict);
+ dict_unref (dict);
fh_unref (fh);
- ds_destroy (&encoding);
+ free (encoding);
return CMD_CASCADING_FAILURE;
}
\f
while (lex_token (lexer) != T_ENDCMD)
{
char **names;
- size_t name_cnt, name_idx;
+ size_t n_names, name_idx;
struct fmt_spec *formats, *f;
- size_t format_cnt;
+ size_t n_formats;
/* Parse everything. */
if (!parse_record_placement (lexer, &record, &column)
|| !parse_DATA_LIST_vars_pool (lexer, dict, tmp_pool,
- &names, &name_cnt, PV_NONE)
- || !parse_var_placements (lexer, tmp_pool, name_cnt, true,
- &formats, &format_cnt))
+ &names, &n_names, PV_NONE)
+ || !parse_var_placements (lexer, tmp_pool, n_names, FMT_FOR_INPUT,
+ &formats, &n_formats))
return false;
/* Create variables and var specs. */
name_idx = 0;
- for (f = formats; f < &formats[format_cnt]; f++)
+ for (f = formats; f < &formats[n_formats]; f++)
if (!execute_placement_format (f, &record, &column))
{
char *name;
if (v != NULL)
{
/* Success. */
- struct fmt_spec output = fmt_for_output_from_input (f);
+ struct fmt_spec output = fmt_for_output_from_input (
+ f, settings_get_fmt_settings ());
var_set_both_formats (v, &output);
}
else
column += f->w;
}
- assert (name_idx == name_cnt);
+ assert (name_idx == n_names);
}
return true;
{
struct fmt_spec input, output;
char **name;
- size_t name_cnt;
+ size_t n_names;
size_t i;
if (!parse_DATA_LIST_vars_pool (lexer, dict, tmp_pool,
- &name, &name_cnt, PV_NONE))
+ &name, &n_names, PV_NONE))
return false;
if (lex_match (lexer, T_LPAREN))
{
- if (!parse_format_specifier (lexer, &input)
- || !fmt_check_input (&input)
- || !lex_force_match (lexer, T_RPAREN))
+ char type[FMT_TYPE_LEN_MAX + 1];
+
+ if (!parse_abstract_format_specifier (lexer, type, &input.w,
+ &input.d))
+ return NULL;
+ if (!fmt_from_name (type, &input.type))
+ {
+ msg (SE, _("Unknown format type `%s'."), type);
+ return NULL;
+ }
+
+ /* If no width was included, use the minimum width for the type.
+ This isn't quite right, because DATETIME by itself seems to become
+ DATETIME20 (see bug #30690), whereas this will become
+ DATETIME17. The correct behavior is not documented. */
+ if (input.w == 0)
+ {
+ input.w = fmt_min_input_width (input.type);
+ input.d = 0;
+ }
+
+ if (!fmt_check_input (&input) || !lex_force_match (lexer, T_RPAREN))
return NULL;
/* As a special case, N format is treated as F format
if (input.type == FMT_N)
input.type = FMT_F;
- output = fmt_for_output_from_input (&input);
+ output = fmt_for_output_from_input (&input,
+ settings_get_fmt_settings ());
}
else
{
output = *settings_get_format ();
}
- for (i = 0; i < name_cnt; i++)
+ for (i = 0; i < n_names; i++)
{
struct variable *v;
/* If there was an END subcommand handle it. */
if (trns->end != NULL)
{
- double *end = &case_data_rw (*c, trns->end)->f;
+ double *end = case_num_rw (*c, trns->end);
if (retval == TRNS_END_FILE)
{
*end = 1.0;
projects / pspp / blobdiff