X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fdata-io%2Fplacement-parser.c;h=4d0a0b4c3b17d180e4465a00bda54bc4aed8e359;hb=178a771cd0c7cf2f4d6d08ac4b8431656aa29274;hp=4f1d062cb8d3b18734afacfc427f1bfd5b1b5408;hpb=173d1687aea88e0e5e1b1d8615ed68ebefb15d08;p=pspp

diff --git a/src/language/data-io/placement-parser.c b/src/language/data-io/placement-parser.c
index 4f1d062cb8..4d0a0b4c3b 100644
--- a/src/language/data-io/placement-parser.c
+++ b/src/language/data-io/placement-parser.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010, 2011 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
@@ -16,20 +16,19 @@
 
 #include <config.h>
 
-#include <language/data-io/placement-parser.h>
+#include "language/data-io/placement-parser.h"
 
 #include <assert.h>
 
-#include <language/lexer/format-parser.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
+#include "data/format.h"
+#include "language/lexer/format-parser.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
 
-#include <data/format.h>
-
-#include "xalloc.h"
-#include "xsize.h"
+#include "gl/xalloc.h"
+#include "gl/xsize.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -70,7 +69,7 @@ parse_var_placements (struct lexer *lexer, struct pool *pool, size_t var_cnt, bo
   assert (var_cnt > 0);
   if (lex_is_number (lexer))
     return fixed_parse_columns (lexer, pool, var_cnt, for_input, formats, format_cnt);
-  else if (lex_match (lexer, '('))
+  else if (lex_match (lexer, T_LPAREN))
     {
       size_t assignment_cnt;
       size_t i;
@@ -123,14 +122,14 @@ fixed_parse_columns (struct lexer *lexer, struct pool *pool, size_t var_cnt, boo
     }
 
   /* Format specifier. */
-  if (lex_match (lexer, '('))
+  if (lex_match (lexer, T_LPAREN))
     {
       /* Get format type. */
       if (lex_token (lexer) == T_ID)
 	{
 	  if (!parse_format_specifier_name (lexer, &format.type))
             return false;
-	  lex_match (lexer, ',');
+	  lex_match (lexer, T_COMMA);
 	}
       else
 	format.type = FMT_F;
@@ -144,7 +143,7 @@ fixed_parse_columns (struct lexer *lexer, struct pool *pool, size_t var_cnt, boo
       else
 	format.d = 0;
 
-      if (!lex_force_match (lexer, ')'))
+      if (!lex_force_match (lexer, T_RPAREN))
 	return false;
     }
   else
@@ -173,7 +172,7 @@ fixed_parse_fortran (struct lexer *lexer, struct pool *pool, bool for_input,
   size_t formats_used = 0;
 
   *formats = NULL;
-  while (!lex_match (lexer, ')'))
+  while (!lex_match (lexer, T_RPAREN))
     {
       struct fmt_spec f;
       struct fmt_spec *new_formats;
@@ -191,7 +190,7 @@ fixed_parse_fortran (struct lexer *lexer, struct pool *pool, bool for_input,
 	count = 1;
 
       /* Parse format specifier. */
-      if (lex_match (lexer, '('))
+      if (lex_match (lexer, T_LPAREN))
         {
           /* Call ourselves recursively to handle parentheses. */
           if (!fixed_parse_fortran (lexer, pool, for_input,
@@ -202,7 +201,7 @@ fixed_parse_fortran (struct lexer *lexer, struct pool *pool, bool for_input,
         {
           new_formats = &f;
           new_format_cnt = 1;
-          if (lex_match (lexer, '/'))
+          if (lex_match (lexer, T_SLASH))
             f.type = PRS_TYPE_NEW_REC;
           else
             {
@@ -253,7 +252,7 @@ fixed_parse_fortran (struct lexer *lexer, struct pool *pool, bool for_input,
           formats_used += new_format_cnt;
         }
 
-      lex_match (lexer, ',');
+      lex_match (lexer, T_COMMA);
     }
 
   *format_cnt = formats_used;
@@ -293,12 +292,10 @@ execute_placement_format (const struct fmt_spec *format,
    stores a 1-based column number into *COLUMN if successful,
    otherwise emits an error message and returns false. */
 static bool
-parse_column (struct lexer *lexer, int base, int *column)
+parse_column (int value, int base, int *column)
 {
   assert (base == 0 || base == 1);
-  if (!lex_force_int (lexer))
-    return false;
-  *column = lex_integer (lexer) - base + 1;
+  *column = value - base + 1;
   if (*column < 1)
     {
       if (base == 1)
@@ -307,7 +304,6 @@ parse_column (struct lexer *lexer, int base, int *column)
         msg (SE, _("Column positions for fields must not be negative."));
       return false;
     }
-  lex_get (lexer);
   return true;
 }
 
@@ -330,15 +326,18 @@ parse_column_range (struct lexer *lexer, int base,
                     bool *range_specified)
 {
   /* First column. */
-  if (!parse_column (lexer, base, first_column))
+  if (!lex_force_int (lexer)
+      || !parse_column (lex_integer (lexer), base, first_column))
     return false;
+  lex_get (lexer);
 
   /* Last column. */
-  lex_negative_to_dash (lexer);
-  if (lex_match (lexer, '-'))
+  if (lex_is_integer (lexer) && lex_integer (lexer) < 0)
     {
-      if (!parse_column (lexer, base, last_column))
+      if (!parse_column (-lex_integer (lexer), base, last_column))
         return false;
+      lex_get (lexer);
+
       if (*last_column < *first_column)
 	{
 	  msg (SE, _("The ending column for a field must be "
@@ -369,7 +368,7 @@ parse_column_range (struct lexer *lexer, int base,
 bool
 parse_record_placement (struct lexer *lexer, int *record, int *column)
 {
-  while (lex_match (lexer, '/'))
+  while (lex_match (lexer, T_SLASH))
     {
       if (lex_is_integer (lexer))
         {