X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fformats.c;h=de58615619f1548a772b3cdba64cb4e3143a25f9;hb=refs%2Fbuilds%2F20101125030504%2Fpspp;hp=d18606a5ce2eda8e4d9508e406e7170f7c3d9231;hpb=a9acce47d67e0ab35ce1690e4f1b1ac0121c2d78;p=pspp

diff --git a/src/language/dictionary/formats.c b/src/language/dictionary/formats.c
index d18606a5ce..de58615619 100644
--- a/src/language/dictionary/formats.c
+++ b/src/language/dictionary/formats.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 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
@@ -22,6 +22,7 @@
 
 #include <data/procedure.h>
 #include <data/variable.h>
+#include <data/format.h>
 #include <language/command.h>
 #include <language/lexer/format-parser.h>
 #include <language/lexer/lexer.h>
@@ -77,14 +78,14 @@ internal_cmd_formats (struct lexer *lexer, struct dataset *ds, int which)
 
   for (;;)
     {
-      if (lex_token (lexer) == '.')
+      if (lex_token (lexer) == T_ENDCMD)
 	break;
 
       if (!parse_variables (lexer, dataset_dict (ds), &v, &cv, PV_NUMERIC))
 	return CMD_FAILURE;
       type = var_get_type (v[0]);
 
-      if (!lex_match (lexer, '('))
+      if (!lex_match (lexer, T_LPAREN))
 	{
 	  msg (SE, _("`(' expected after variable list."));
 	  goto fail;
@@ -94,7 +95,7 @@ internal_cmd_formats (struct lexer *lexer, struct dataset *ds, int which)
           || !fmt_check_type_compat (&f, VAL_NUMERIC))
 	goto fail;
 
-      if (!lex_match (lexer, ')'))
+      if (!lex_match (lexer, T_RPAREN))
 	{
 	  msg (SE, _("`)' expected after output format."));
 	  goto fail;