X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fcrosstabs.q;h=341a920116865dfae3d6f97766950597b4bcf29f;hb=7d34380bb2fddca820a6f414564738cc2f70afc9;hp=acec9769b48d2ecf11eff6ef837ffb15aaa027b2;hpb=f550aee00a62fe1d8baf62d83cd7efef6cc2ee92;p=pspp

diff --git a/src/language/stats/crosstabs.q b/src/language/stats/crosstabs.q
index acec9769b4..341a920116 100644
--- a/src/language/stats/crosstabs.q
+++ b/src/language/stats/crosstabs.q
@@ -406,7 +406,7 @@ crs_custom_tables (struct lexer *lexer, struct dataset *ds,
 	{
 	  if (n_by < 2)
 	    {
-	      lex_error (lexer, _("expecting BY"));
+              lex_force_match (lexer, T_BY);
 	      goto done;
 	    }
 	  else
@@ -482,12 +482,8 @@ crs_custom_variables (struct lexer *lexer, struct dataset *ds,
                                    | PV_NO_DUPLICATE | PV_NO_SCRATCH)))
 	return 0;
 
-      if (lex_token (lexer) != '(')
-	{
-	  lex_error (lexer, "expecting `('");
+      if (!lex_force_match (lexer, '('))
 	  goto lossage;
-	}
-      lex_get (lexer);
 
       if (!lex_force_int (lexer))
 	goto lossage;
@@ -507,12 +503,8 @@ crs_custom_variables (struct lexer *lexer, struct dataset *ds,
 	}
       lex_get (lexer);
 
-      if (lex_token (lexer) != ')')
-	{
-	  lex_error (lexer, "expecting `)'");
-	  goto lossage;
-	}
-      lex_get (lexer);
+      if (!lex_force_match (lexer, ')'))
+        goto lossage;
 
       for (i = orig_nv; i < proc->n_variables; i++)
         {
@@ -1214,11 +1206,11 @@ create_chisq_table (struct pivot_table *pt)
   tab_text (chisq, 1, 0, TAB_RIGHT | TAT_TITLE, _("Value"));
   tab_text (chisq, 2, 0, TAB_RIGHT | TAT_TITLE, _("df"));
   tab_text (chisq, 3, 0, TAB_RIGHT | TAT_TITLE,
-            _("Asymp. Sig. (2-sided)"));
+            _("Asymp. Sig. (2-tailed)"));
   tab_text (chisq, 4, 0, TAB_RIGHT | TAT_TITLE,
-            _("Exact Sig. (2-sided)"));
+            _("Exact Sig. (2-tailed)"));
   tab_text (chisq, 5, 0, TAB_RIGHT | TAT_TITLE,
-            _("Exact Sig. (1-sided)"));
+            _("Exact Sig. (1-tailed)"));
   tab_offset (chisq, 0, 1);
 
   return chisq;
@@ -1508,6 +1500,8 @@ format_cell_entry (struct tab_table *table, int c, int r, double value,
 
   tab_text_format (table, c, r, TAB_RIGHT, "%s%s",
                    s + strspn (s, " "), suffixes);
+
+  free (s);
 }
 
 /* Displays the crosstabulation table. */