X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Ffrequencies.q;h=ecaefdf64e421196160009769ffe2e4438797262;hb=refs%2Fbuilds%2F20101125030504%2Fpspp;hp=723d26e8341c3f7c732f3ed394067dea0b4204c6;hpb=c9f2716572b756bb46191da2ce5be22911d5c8a8;p=pspp

diff --git a/src/language/stats/frequencies.q b/src/language/stats/frequencies.q
index 723d26e834..ecaefdf64e 100644
--- a/src/language/stats/frequencies.q
+++ b/src/language/stats/frequencies.q
@@ -618,10 +618,10 @@ frq_custom_variables (struct lexer *lexer, struct dataset *ds,
   size_t n_vars;
   size_t i;
 
-  lex_match (lexer, '=');
+  lex_match (lexer, T_EQUALS);
   if (lex_token (lexer) != T_ALL
       && (lex_token (lexer) != T_ID
-          || dict_lookup_var (dataset_dict (ds), lex_tokid (lexer)) == NULL))
+          || dict_lookup_var (dataset_dict (ds), lex_tokcstr (lexer)) == NULL))
     return 2;
 
   /* Get list of current variables, to avoid duplicates. */
@@ -662,8 +662,9 @@ frq_custom_grouped (struct lexer *lexer, struct dataset *ds, struct cmd_frequenc
 {
   struct frq_proc *frq = frq_;
 
-  lex_match (lexer, '=');
-  if ((lex_token (lexer) == T_ID && dict_lookup_var (dataset_dict (ds), lex_tokid (lexer)) != NULL)
+  lex_match (lexer, T_EQUALS);
+  if ((lex_token (lexer) == T_ID
+       && dict_lookup_var (dataset_dict (ds), lex_tokcstr (lexer)) != NULL)
       || lex_token (lexer) == T_ID)
     for (;;)
       {
@@ -680,7 +681,7 @@ frq_custom_grouped (struct lexer *lexer, struct dataset *ds, struct cmd_frequenc
 	if (!parse_variables_const (lexer, dataset_dict (ds), &v, &n,
                               PV_NO_DUPLICATE | PV_NUMERIC))
 	  return 0;
-	if (lex_match (lexer, '('))
+	if (lex_match (lexer, T_LPAREN))
 	  {
 	    nl = ml = 0;
 	    dl = NULL;
@@ -693,11 +694,11 @@ frq_custom_grouped (struct lexer *lexer, struct dataset *ds, struct cmd_frequenc
 		  }
 		dl[nl++] = lex_tokval (lexer);
 		lex_get (lexer);
-		lex_match (lexer, ',');
+		lex_match (lexer, T_COMMA);
 	      }
 	    /* Note that nl might still be 0 and dl might still be
 	       NULL.  That's okay. */
-	    if (!lex_match (lexer, ')'))
+	    if (!lex_match (lexer, T_RPAREN))
 	      {
 		free (v);
 		msg (SE, _("`)' expected after GROUPED interval list."));
@@ -737,12 +738,12 @@ frq_custom_grouped (struct lexer *lexer, struct dataset *ds, struct cmd_frequenc
           }
 
 	free (v);
-	if (!lex_match (lexer, '/'))
+	if (!lex_match (lexer, T_SLASH))
 	  break;
-	if ((lex_token (lexer) != T_ID || dict_lookup_var (dataset_dict (ds), lex_tokid (lexer)) != NULL)
+	if ((lex_token (lexer) != T_ID || dict_lookup_var (dataset_dict (ds), lex_tokcstr (lexer)) != NULL)
             && lex_token (lexer) != T_ALL)
 	  {
-	    lex_put_back (lexer, '/');
+	    lex_put_back (lexer, T_SLASH);
 	    break;
 	  }
       }