REGRESSION: Relaxed the syntax parser slightly and include /METHO=ENTER in generated...

This improves comparibility between PSPP and other software.

Addresses bug #45667

diff --git a/src/language/stats/regression.c b/src/language/stats/regression.c
index 51502e5fe03f1515f00d487012543f0cf99234d8..d9409aae59bcc1301e16ed05770606457194915d 100644 (file)
--- a/src/language/stats/regression.c
+++ b/src/language/stats/regression.c
@@ -225,8 +225,7 @@ cmd_regression (struct lexer *lexer, struct dataset *ds)
 
       if (lex_match_id (lexer, "DEPENDENT"))
         {
-          if (!lex_force_match (lexer, T_EQUALS))
-            goto error;
+          lex_match (lexer, T_EQUALS);
 
          free (regression.dep_vars);
          regression.n_dep_vars = 0;

diff --git a/src/ui/gui/psppire-dialog-action-regression.c b/src/ui/gui/psppire-dialog-action-regression.c
index 876a7651fa1d7904e44413ef3b4c9ac2fe309cb6..5a64162993231405f85a672d79df514638a93bc5 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-regression.c
+++ b/src/ui/gui/psppire-dialog-action-regression.c
@@ -205,9 +205,10 @@ generate_syntax (PsppireDialogAction *a)
 
   g_string_append (string, "\n\t/VARIABLES=");
   psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->indep_vars), 0, string);
-  g_string_append (string, "\n\t/DEPENDENT=\t");
+  g_string_append (string, "\n\t/DEPENDENT=");
   psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->dep_vars), 0, string);
-
+  g_string_append (string, "\n\t/METHOD=ENTER");
+  
   selected = 0;
   for (i = 0, ok = gtk_tree_model_get_iter_first (model, &iter); ok; 
        i++, ok = gtk_tree_model_iter_next (model, &iter))