X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Ffactor.c;h=ed10d16d6d25ee24ed98bf9770eb7b90e2560355;hb=687a88f81434045ba4230b503fc582e20a0f1c02;hp=c34feb8d05ee7312e0f1e0cbf08be7c4002b0cd3;hpb=68ae62595cb0507622afda5568a3a20e28857f88;p=pspp

diff --git a/src/language/stats/factor.c b/src/language/stats/factor.c
index c34feb8d05..ed10d16d6d 100644
--- a/src/language/stats/factor.c
+++ b/src/language/stats/factor.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010, 2011, 2012, 2014 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011, 2012, 2014, 2015, 2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1051,7 +1051,28 @@ cmd_factor (struct lexer *lexer, struct dataset *ds)
     {
       lex_match (lexer, T_SLASH);
 
-      if (lex_match_id (lexer, "PLOT"))
+      if (lex_match_id (lexer, "ANALYSIS"))
+        {
+          struct const_var_set *vs;
+          const struct variable **vars;
+          size_t n_vars;
+          bool ok;
+
+          lex_match (lexer, T_EQUALS);
+
+          vs = const_var_set_create_from_array (factor.vars, factor.n_vars);
+          ok = parse_const_var_set_vars (lexer, vs, &vars, &n_vars,
+                                         PV_NO_DUPLICATE | PV_NUMERIC);
+          const_var_set_destroy (vs);
+
+          if (!ok)
+            goto error;
+
+          free (factor.vars);
+          factor.vars = vars;
+          factor.n_vars = n_vars;
+        }
+      else if (lex_match_id (lexer, "PLOT"))
 	{
           lex_match (lexer, T_EQUALS);
           while (lex_token (lexer) != T_ENDCMD && lex_token (lexer) != T_SLASH)
@@ -1113,9 +1134,9 @@ cmd_factor (struct lexer *lexer, struct dataset *ds)
 	      else if (lex_match_id (lexer, "PROMAX"))
 		{
 		  factor.promax_power = 5;
-		  if (lex_match (lexer, T_LPAREN))
+		  if (lex_match (lexer, T_LPAREN)
+                      && lex_force_int (lexer))
 		    {
-		      lex_force_int (lexer);
 		      factor.promax_power = lex_integer (lexer);
 		      lex_get (lexer);
 		      lex_force_match (lexer, T_RPAREN);
@@ -1141,9 +1162,9 @@ cmd_factor (struct lexer *lexer, struct dataset *ds)
 	    {
 	      if (lex_match_id (lexer, "FACTORS"))
 		{
-		  if ( lex_force_match (lexer, T_LPAREN))
+		  if ( lex_force_match (lexer, T_LPAREN)
+                       && lex_force_int (lexer))
 		    {
-		      lex_force_int (lexer);
 		      factor.n_factors = lex_integer (lexer);
 		      lex_get (lexer);
 		      lex_force_match (lexer, T_RPAREN);
@@ -1151,9 +1172,9 @@ cmd_factor (struct lexer *lexer, struct dataset *ds)
 		}
 	      else if (lex_match_id (lexer, "MINEIGEN"))
 		{
-		  if ( lex_force_match (lexer, T_LPAREN))
+		  if ( lex_force_match (lexer, T_LPAREN)
+                       && lex_force_num (lexer))
 		    {
-		      lex_force_num (lexer);
 		      factor.min_eigen = lex_number (lexer);
 		      lex_get (lexer);
 		      lex_force_match (lexer, T_RPAREN);
@@ -1161,29 +1182,29 @@ cmd_factor (struct lexer *lexer, struct dataset *ds)
 		}
 	      else if (lex_match_id (lexer, "ECONVERGE"))
 		{
-		  if ( lex_force_match (lexer, T_LPAREN))
+		  if ( lex_force_match (lexer, T_LPAREN)
+                       && lex_force_num (lexer))
 		    {
-		      lex_force_num (lexer);
 		      factor.econverge = lex_number (lexer);
 		      lex_get (lexer);
 		      lex_force_match (lexer, T_RPAREN);
 		    }
 		}
 	      else if (lex_match_id (lexer, "RCONVERGE"))
-		{
-		  if ( lex_force_match (lexer, T_LPAREN))
-		    {
-		      lex_force_num (lexer);
-		      factor.rconverge = lex_number (lexer);
-		      lex_get (lexer);
-		      lex_force_match (lexer, T_RPAREN);
-		    }
+                {
+                  if (lex_force_match (lexer, T_LPAREN)
+                      && lex_force_num (lexer))
+                    {
+                      factor.rconverge = lex_number (lexer);
+                      lex_get (lexer);
+                      lex_force_match (lexer, T_RPAREN);
+                    }
 		}
 	      else if (lex_match_id (lexer, "ITERATE"))
 		{
-		  if ( lex_force_match (lexer, T_LPAREN))
+		  if ( lex_force_match (lexer, T_LPAREN)
+                       && lex_force_int (lexer))
 		    {
-		      lex_force_int (lexer);
 		      n_iterations = lex_integer (lexer);
 		      lex_get (lexer);
 		      lex_force_match (lexer, T_RPAREN);
@@ -1242,9 +1263,9 @@ cmd_factor (struct lexer *lexer, struct dataset *ds)
 		}
 	      else if (lex_match_id (lexer, "BLANK"))
 		{
-		  if ( lex_force_match (lexer, T_LPAREN))
+		  if ( lex_force_match (lexer, T_LPAREN)
+                       && lex_force_num (lexer))
 		    {
-		      lex_force_num (lexer);
 		      factor.blank = lex_number (lexer);
 		      lex_get (lexer);
 		      lex_force_match (lexer, T_RPAREN);