From 83310cb45d7d8eddd9d2016baedf42ec00fe31c7 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 1 Aug 2015 04:57:02 +0200 Subject: [PATCH] REGRESSION: Relaxed the syntax parser slightly and include /METHO=ENTER in generated syntax. This improves comparibility between PSPP and other software. Addresses bug #45667 --- src/language/stats/regression.c | 3 +-- src/ui/gui/psppire-dialog-action-regression.c | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/language/stats/regression.c b/src/language/stats/regression.c index 51502e5fe0..d9409aae59 100644 --- 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 876a7651fa..5a64162993 100644 --- 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)) -- 2.30.2