X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fdata-list.c;h=754341ccac3a120c8dc840e4d261894db54e9ba1;hb=75ac1e869e551495c403cf94a3a24dd0dfee98ef;hp=17c6032d252b97181864f43e4158900b071316fe;hpb=2814862a2c45a39f9822cf4c64ca3884822d064d;p=pspp

diff --git a/src/language/data-io/data-list.c b/src/language/data-io/data-list.c
index 17c6032d25..754341ccac 100644
--- a/src/language/data-io/data-list.c
+++ b/src/language/data-io/data-list.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010, 2011, 2012 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
@@ -122,7 +122,14 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
 	  lex_match (lexer, T_LPAREN);
 	  if (!lex_force_int (lexer))
 	    goto error;
-          data_parser_set_records (parser, lex_integer (lexer));
+
+	  int records = lex_integer (lexer);
+	  if (records < 0)
+	    {
+	      msg (SE, _("The %s value must be non-negative."), "RECORDS");
+	      goto error;
+	    }
+          data_parser_set_records (parser, records);
 	  lex_get (lexer);
 	  lex_match (lexer, T_RPAREN);
 	}
@@ -131,20 +138,25 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
 	  lex_match (lexer, T_EQUALS);
 	  if (!lex_force_int (lexer))
 	    goto error;
-          data_parser_set_skip (parser, lex_integer (lexer));
+	  int skip = lex_integer (lexer);
+	  if (skip < 0)
+	    {
+	      msg (SE, _("The %s value must be non-negative."), "SKIP");
+	      goto error;
+	    }
+          data_parser_set_skip (parser, skip);
 	  lex_get (lexer);
 	}
       else if (lex_match_id (lexer, "END"))
 	{
           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."));
+	      msg (SE, _("The %s subcommand may only be specified once."), "END");
 	      goto error;
 	    }
 
@@ -230,7 +242,9 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
                   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_decimal_char (FMT_F);
+                  data_parser_set_hard_delimiters (parser,
+                                                   ss_buffer (",", (decimal == '.') ? 1 : 0));
                 }
             }
         }
@@ -252,7 +266,7 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
 
   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;
     }
 
@@ -292,17 +306,17 @@ cmd_data_list (struct lexer *lexer, struct dataset *ds)
       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);
   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);
   free (encoding);
   return CMD_CASCADING_FAILURE;
@@ -429,9 +443,28 @@ parse_free (struct lexer *lexer, struct dictionary *dict,
 
       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