lexer: New type enum token_type.

[pspp-builds.git] / src / language / data-io / get.c

diff --git a/src/language/data-io/get.c b/src/language/data-io/get.c
index 32aea2476cb58cd4c3b56674b0dec35b335874e8..fea38812f79cc70bda3a1dbe5c1896fdb6718964 100644 (file)
--- a/src/language/data-io/get.c
+++ b/src/language/data-io/get.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2007, 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
@@ -75,11 +75,11 @@ parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command
 
   for (;;)
     {
-      lex_match (lexer, '/');
+      lex_match (lexer, T_SLASH);
 
-      if (lex_match_id (lexer, "FILE") || lex_token (lexer) == T_STRING)
+      if (lex_match_id (lexer, "FILE") || lex_is_string (lexer))
        {
-         lex_match (lexer, '=');
+         lex_match (lexer, T_EQUALS);
 
           fh_unref (fh);
          fh = fh_parse (lexer, FH_REF_FILE | FH_REF_SCRATCH);
@@ -88,7 +88,7 @@ parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command
        }
       else if (type == IMPORT_CMD && lex_match_id (lexer, "TYPE"))
        {
-         lex_match (lexer, '=');
+         lex_match (lexer, T_EQUALS);
 
          if (lex_match_id (lexer, "COMM"))
            type = PFM_COMM;
@@ -96,7 +96,7 @@ parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command
            type = PFM_TAPE;
          else
            {
-             lex_error (lexer, _("expecting COMM or TAPE"));
+             lex_error (lexer, _("expecting %s or %s"), "COMM", "TAPE");
               goto error;
            }
        }
@@ -116,9 +116,9 @@ parse_read_command (struct lexer *lexer, struct dataset *ds, enum reader_command
 
   case_map_prepare_dict (dict);
 
-  while (lex_token (lexer) != '.')
+  while (lex_token (lexer) != T_ENDCMD)
     {
-      lex_match (lexer, '/');
+      lex_match (lexer, T_SLASH);
       if (!parse_dict_trim (lexer, dict))
         goto error;
     }