From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sat, 7 Mar 2015 07:47:36 +0000 (-0800)
Subject: FREQUENCIES: Accept (but ignore) ORDER subcommand.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37ff86424a5aa6c4c22a0fd4d8c59d7ce28bc2bf;p=pspp

FREQUENCIES: Accept (but ignore) ORDER subcommand.

Allows syntax generated by SPSS to work.

Reported by Tom Smekens.
---

diff --git a/doc/statistics.texi b/doc/statistics.texi
index d2dd0d63bd..d333de1db2 100644
--- a/doc/statistics.texi
+++ b/doc/statistics.texi
@@ -138,6 +138,7 @@ FREQUENCIES
                   [@{FREQ,PERCENT@}] [@{NOMISSING,MISSING@}]
         /BARCHART=[MINIMUM(@var{x_min})] [MAXIMUM(@var{x_max})]
                   [@{FREQ,PERCENT@}]
+        /ORDER=@{ANALYSIS,VARIABLE@}
 
 
 (These options are not currently implemented.)
@@ -230,6 +231,8 @@ percentages.
 The @subcmd{FREQ} and @subcmd{PERCENT} options on @subcmd{HISTOGRAM} and 
 @subcmd{PIECHART} are accepted but not currently honoured.
 
+The @subcmd{ORDER} subcommand is accepted but ignored.
+
 @node EXAMINE
 @section EXAMINE
 
diff --git a/src/language/stats/frequencies.c b/src/language/stats/frequencies.c
index aa4eddfacc..cd131f514b 100644
--- a/src/language/stats/frequencies.c
+++ b/src/language/stats/frequencies.c
@@ -1072,6 +1072,12 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds)
                 }
             }
         }
+      else if (lex_match_id (lexer, "ORDER"))
+        {
+          lex_match (lexer, T_EQUALS);
+          if (!lex_match_id (lexer, "ANALYSIS"))
+            lex_match_id (lexer, "VARIABLE");
+        }
       else
         {
           lex_error (lexer, NULL);
diff --git a/tests/language/stats/frequencies.at b/tests/language/stats/frequencies.at
index 25e8e2fe44..ff54e8e9cf 100644
--- a/tests/language/stats/frequencies.at
+++ b/tests/language/stats/frequencies.at
@@ -18,7 +18,7 @@ quux 5 8
 END DATA.
 EXECUTE.
 
-FREQUENCIES /VAR = name.
+FREQUENCIES /VAR = name/ORDER=ANALYSIS.
 ])
 AT_CHECK([pspp -O format=csv frequencies.sps], [0], [dnl
 Table: name
@@ -43,7 +43,7 @@ begin data.
 3 4
 end data.
 
-frequencies v1 v2/statistics=none.
+frequencies v1 v2/statistics=none/ORDER=VARIABLE.
 frequencies v1 v2/statistics=none.
 ])
 AT_CHECK([pspp -O format=csv frequencies.sps], [0],