X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Faggregate.c;h=cfa9ea66248a2ca0879d5c183f778f72cff2a657;hb=55e6e7ba37a30570f5a31e2d78c22dfa7b61a36f;hp=15376f62b88142c10fadbcba0720519df66a890c;hpb=cf43c539407ac9a76154605d83247aa98d712426;p=pspp-builds.git

diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c
index 15376f62..cfa9ea66 100644
--- a/src/language/stats/aggregate.c
+++ b/src/language/stats/aggregate.c
@@ -175,11 +175,11 @@ cmd_aggregate (struct lexer *lexer, struct dataset *ds)
   subcase_init_empty (&agr.sort);
 
   /* OUTFILE subcommand must be first. */
-  lex_match (lexer, '/');
+  lex_match (lexer, T_SLASH);
   if (!lex_force_match_id (lexer, "OUTFILE"))
     goto error;
-  lex_match (lexer, '=');
-  if (!lex_match (lexer, '*'))
+  lex_match (lexer, T_EQUALS);
+  if (!lex_match (lexer, T_ASTERISK))
     {
       out_file = fh_parse (lexer, FH_REF_FILE | FH_REF_SCRATCH);
       if (out_file == NULL)
@@ -188,7 +188,7 @@ cmd_aggregate (struct lexer *lexer, struct dataset *ds)
 
   if (out_file == NULL && lex_match_id (lexer, "MODE"))
     {
-      lex_match (lexer, '=');
+      lex_match (lexer, T_EQUALS);
       if (lex_match_id (lexer, "ADDVARIABLES"))
 	{
 	  agr.add_variables = true;
@@ -215,14 +215,14 @@ cmd_aggregate (struct lexer *lexer, struct dataset *ds)
   /* Read most of the subcommands. */
   for (;;)
     {
-      lex_match (lexer, '/');
+      lex_match (lexer, T_SLASH);
 
       if (lex_match_id (lexer, "MISSING"))
 	{
-	  lex_match (lexer, '=');
+	  lex_match (lexer, T_EQUALS);
 	  if (!lex_match_id (lexer, "COLUMNWISE"))
 	    {
-	      lex_error (lexer, _("while expecting COLUMNWISE"));
+	      lex_error (lexer, _("expecting %s"), "COLUMNWISE");
               goto error;
 	    }
 	  agr.missing = COLUMNWISE;
@@ -231,11 +231,11 @@ cmd_aggregate (struct lexer *lexer, struct dataset *ds)
         copy_documents = true;
       else if (lex_match_id (lexer, "PRESORTED"))
         presorted = true;
-      else if (lex_match_id (lexer, "BREAK"))
+      else if (lex_force_match_id (lexer, "BREAK"))
 	{
           int i;
 
-	  lex_match (lexer, '=');
+	  lex_match (lexer, T_EQUALS);
           if (!parse_sort_criteria (lexer, dict, &agr.sort, &agr.break_vars,
                                     &saw_direction))
             goto error;
@@ -249,10 +249,8 @@ cmd_aggregate (struct lexer *lexer, struct dataset *ds)
           break;
 	}
       else
-        {
-          lex_error (lexer, _("expecting BREAK"));
-          goto error;
-        }
+        goto error;
+
     }
   if (presorted && saw_direction)
     msg (SW, _("When PRESORTED is specified, specifying sorting directions "
@@ -260,7 +258,7 @@ cmd_aggregate (struct lexer *lexer, struct dataset *ds)
                "the same way as the input data."));
 
   /* Read in the aggregate functions. */
-  lex_match (lexer, '/');
+  lex_match (lexer, T_SLASH);
   if (!parse_aggregate_functions (lexer, dict, &agr))
     goto error;
 
@@ -414,7 +412,7 @@ parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
       ds_init_empty (&function_name);
 
       /* Parse the list of target variables. */
-      while (!lex_match (lexer, '='))
+      while (!lex_match (lexer, T_EQUALS))
 	{
 	  size_t n_dest_prev = n_dest;
 
@@ -434,10 +432,10 @@ parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
 
 
 
-	  if (lex_token (lexer) == T_STRING)
+	  if (lex_is_string (lexer))
 	    {
 	      struct string label;
-	      ds_init_string (&label, lex_tokstr (lexer));
+	      ds_init_substring (&label, lex_tokss (lexer));
 
 	      ds_truncate (&label, 255);
 	      dest_label[n_dest - 1] = ds_xstrdup (&label);
@@ -453,7 +451,7 @@ parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
 	  goto error;
 	}
 
-      ds_assign_string (&function_name, lex_tokstr (lexer));
+      ds_assign_substring (&function_name, lex_tokss (lexer));
       exclude = ds_chomp (&function_name, '.') ? MV_SYSTEM : MV_ANY;
 
       for (function = agr_func_tab; function->name; function++)
@@ -470,11 +468,11 @@ parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
       lex_get (lexer);
 
       /* Check for leading lparen. */
-      if (!lex_match (lexer, '('))
+      if (!lex_match (lexer, T_LPAREN))
 	{
 	  if (function->src_vars == AGR_SV_YES)
 	    {
-	      lex_error (lexer, _("expecting `('"));
+              lex_force_match (lexer, T_LPAREN);
 	      goto error;
 	    }
 	}
@@ -500,10 +498,10 @@ parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
 	      {
 		int type;
 
-		lex_match (lexer, ',');
-		if (lex_token (lexer) == T_STRING)
+		lex_match (lexer, T_COMMA);
+		if (lex_is_string (lexer))
 		  {
-		    arg[i].c = ds_xstrdup (lex_tokstr (lexer));
+		    arg[i].c = ss_xstrdup (lex_tokss (lexer));
 		    type = VAL_STRING;
 		  }
 		else if (lex_is_number (lexer))
@@ -530,11 +528,8 @@ parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
 	      }
 
 	  /* Trailing rparen. */
-	  if (!lex_match (lexer, ')'))
-	    {
-	      lex_error (lexer, _("expecting `)'"));
-	      goto error;
-	    }
+	  if (!lex_force_match (lexer, T_RPAREN))
+            goto error;
 
 	  /* Now check that the number of source variables match
 	     the number of target variables.  If we check earlier
@@ -675,9 +670,9 @@ parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
       free (dest);
       free (dest_label);
 
-      if (!lex_match (lexer, '/'))
+      if (!lex_match (lexer, T_SLASH))
 	{
-	  if (lex_token (lexer) == '.')
+	  if (lex_token (lexer) == T_ENDCMD)
 	    return true;
 
 	  lex_error (lexer, "expecting end of command");