X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fstats%2Frank.q;h=71eaeccb1102a05ac6d0281e3054eb18a606baf6;hb=eba3cf1b8a2fcfee20eabc51aa8f91b1f276f2f7;hp=a138fc8f75dac40b028d5cb48421e377667621c7;hpb=2322678e8fddbbf158b01b2720db2636404bba3b;p=pspp

diff --git a/src/language/stats/rank.q b/src/language/stats/rank.q
index a138fc8f75..71eaeccb11 100644
--- a/src/language/stats/rank.q
+++ b/src/language/stats/rank.q
@@ -19,11 +19,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA. */
 
 #include <config.h>
-#include "command.h"
-#include "compiler.h"
-#include "dictionary.h"
-#include "sort.h"
-#include "variable.h"
+
+#include "sort-criteria.h"
+
+#include <data/dictionary.h>
+#include <data/procedure.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/stats/sort-criteria.h>
+#include <libpspp/compiler.h>
+#include <math/sort.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -42,7 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    +n=custom;
    +savage=custom;
    +print=print:!yes/no;
-   +missing=miss:!exclude/include.
+   missing=miss:!exclude/include.
 */
 /* (declarations) */
 /* (functions) */
@@ -90,7 +95,7 @@ cmd_rank(void)
   size_t i;
   n_rank_specs = 0;
 
-  if ( !parse_rank(&cmd) )
+  if ( !parse_rank(&cmd, NULL) )
     return CMD_FAILURE;
 
 #if 1
@@ -134,7 +139,7 @@ cmd_rank(void)
 /* Parser for the variables sub command  
    Returns 1 on success */
 static int
-rank_custom_variables(struct cmd_rank *cmd UNUSED)
+rank_custom_variables(struct cmd_rank *cmd UNUSED, void *aux UNUSED)
 {
   static const int terminators[2] = {T_BY, 0};
 
@@ -239,12 +244,12 @@ parse_rank_function(struct cmd_rank *cmd UNUSED, enum RANK_FUNC f)
 	  ++var_count;
 	  if ( dict_lookup_var (default_dict, tokid) != NULL )
 	    {
-	      msg(ME, _("Variable %s already exists."), tokid);
+	      msg(SE, _("Variable %s already exists."), tokid);
 	      return 0;
 	    }
 	  if ( var_count > sc->crit_cnt ) 
 	    {
-	      msg(ME, _("Too many variables in INTO clause."));
+	      msg(SE, _("Too many variables in INTO clause."));
 	      return 0;
 	    }
 
@@ -293,50 +298,50 @@ parse_rank_function(struct cmd_rank *cmd UNUSED, enum RANK_FUNC f)
 
 
 static int
-rank_custom_rank(struct cmd_rank *cmd )
+rank_custom_rank(struct cmd_rank *cmd, void *aux UNUSED )
 {
   return parse_rank_function(cmd, RANK);
 }
 
 static int
-rank_custom_normal(struct cmd_rank *cmd )
+rank_custom_normal(struct cmd_rank *cmd, void *aux UNUSED )
 {
   return parse_rank_function(cmd, NORMAL);
 }
 
 static int
-rank_custom_percent(struct cmd_rank *cmd )
+rank_custom_percent(struct cmd_rank *cmd, void *aux UNUSED )
 {
   return parse_rank_function(cmd, NORMAL);
 }
 
 static int
-rank_custom_rfraction(struct cmd_rank *cmd )
+rank_custom_rfraction(struct cmd_rank *cmd, void *aux UNUSED )
 {
   return parse_rank_function(cmd, RFRACTION);
 }
 
 static int
-rank_custom_proportion(struct cmd_rank *cmd )
+rank_custom_proportion(struct cmd_rank *cmd, void *aux UNUSED )
 {
   return parse_rank_function(cmd, PROPORTION);
 }
 
 static int
-rank_custom_n(struct cmd_rank *cmd )
+rank_custom_n(struct cmd_rank *cmd, void *aux UNUSED )
 {
   return parse_rank_function(cmd, N);
 }
 
 static int
-rank_custom_savage(struct cmd_rank *cmd )
+rank_custom_savage(struct cmd_rank *cmd, void *aux UNUSED )
 {
   return parse_rank_function(cmd, SAVAGE);
 }
 
 
 static int
-rank_custom_ntiles(struct cmd_rank *cmd )
+rank_custom_ntiles(struct cmd_rank *cmd, void *aux UNUSED )
 {
   if ( lex_force_match('(') ) 
     {