Changed a few instances of SHORT_NAME_LEN to LONG_NAME_LEN

[pspp-builds.git] / src / numeric.c

diff --git a/src/numeric.c b/src/numeric.c
index b97410a51bc234ffb826e06d6705f339ea56e6eb..ee8ec552ef60ebd29213ee8fd526802222c6f637 100644 (file)
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -18,9 +18,10 @@
    02111-1307, USA. */
 
 #include <config.h>
-#include <assert.h>
+#include "error.h"
 #include <stdlib.h>
 #include "command.h"
+#include "dictionary.h"
 #include "error.h"
 #include "lexer.h"
 #include "str.h"
@@ -42,7 +43,6 @@ cmd_numeric (void)
      be used. */
   struct fmt_spec f;
 
-  lex_match_id ("NUMERIC");
   do
     {
       if (!parse_DATA_LIST_vars (&v, &nv, PV_NONE))
@@ -116,7 +116,6 @@ cmd_string (void)
   /* Width of variables to create. */
   int width;
 
-  lex_match_id ("STRING");
   do
     {
       if (!parse_DATA_LIST_vars (&v, &nv, PV_NONE))
@@ -148,6 +147,7 @@ cmd_string (void)
          break;
        default:
          assert (0);
+          abort ();
        }
 
       /* Create each variable. */
@@ -188,7 +188,6 @@ cmd_leave (void)
 
   int i;
 
-  lex_match_id ("LEAVE");
   if (!parse_variables (default_dict, &v, &nv, PV_NONE))
     return CMD_FAILURE;
   for (i = 0; i < nv; i++)