X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fglm.c;h=d0dc4bc83ca9d2a926593c233cabdba58755070f;hb=cd221d80fafb54e550398c6de105d4c1b7f02ba0;hp=c7b62a6b69269d13fa222c32f953767edfe2580f;hpb=49edfd56432f86f83dd3d4499a2744f19eccbea4;p=pspp diff --git a/src/language/stats/glm.c b/src/language/stats/glm.c index c7b62a6b69..d0dc4bc83c 100644 --- a/src/language/stats/glm.c +++ b/src/language/stats/glm.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2010, 2011, 2012 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 @@ -43,9 +43,10 @@ #include "math/covariance.h" #include "math/interaction.h" #include "math/moments.h" -#include "output/tab.h" +#include "output/pivot-table.h" #include "gettext.h" +#define N_(msgid) msgid #define _(msgid) gettext (msgid) struct glm_spec @@ -81,7 +82,7 @@ struct glm_workspace struct categoricals *cats; - /* + /* Sums of squares due to different variables. Element 0 is the SSE for the entire model. For i > 0, element i is the SS due to variable i. @@ -155,7 +156,8 @@ cmd_glm (struct lexer *lexer, struct dataset *ds) PV_NO_DUPLICATE | PV_NUMERIC)) goto error; - lex_force_match (lexer, T_BY); + if (! lex_force_match (lexer, T_BY)) + goto error; if (!parse_variables_const (lexer, glm.dict, &glm.factor_vars, &glm.n_factor_vars, @@ -229,10 +231,10 @@ cmd_glm (struct lexer *lexer, struct dataset *ds) lex_error (lexer, NULL); goto error; } - + glm.alpha = lex_number (lexer); lex_get (lexer); - if ( ! lex_force_match (lexer, T_RPAREN)) + if (! lex_force_match (lexer, T_RPAREN)) { lex_error (lexer, NULL); goto error; @@ -248,34 +250,28 @@ cmd_glm (struct lexer *lexer, struct dataset *ds) else if (lex_match_id (lexer, "METHOD")) { lex_match (lexer, T_EQUALS); - if ( !lex_force_match_id (lexer, "SSTYPE")) + if (!lex_force_match_id (lexer, "SSTYPE")) { lex_error (lexer, NULL); goto error; } - if ( ! lex_force_match (lexer, T_LPAREN)) + if (! lex_force_match (lexer, T_LPAREN)) { lex_error (lexer, NULL); goto error; } - if ( ! lex_force_int (lexer)) + if (!lex_force_int_range (lexer, "SSTYPE", 1, 3)) { lex_error (lexer, NULL); goto error; } glm.ss_type = lex_integer (lexer); - if (1 != glm.ss_type && 2 != glm.ss_type ) - { - msg (ME, _("Only types 1 & 2 sum of squares are currently implemented")); - goto error; - } - lex_get (lexer); - if ( ! lex_force_match (lexer, T_RPAREN)) + if (! lex_force_match (lexer, T_RPAREN)) { lex_error (lexer, NULL); goto error; @@ -305,7 +301,7 @@ cmd_glm (struct lexer *lexer, struct dataset *ds) } } - if ( ! design ) + if (! design) { design_full (&glm); } @@ -326,6 +322,7 @@ cmd_glm (struct lexer *lexer, struct dataset *ds) free (glm.factor_vars); for (i = 0 ; i < glm.n_interactions; ++i) interaction_destroy (glm.interactions[i]); + free (glm.interactions); free (glm.dep_vars); @@ -358,11 +355,11 @@ fill_submatrix (const gsl_matrix * cov, gsl_matrix * submatrix, bool *dropped_f) size_t j; size_t n = 0; size_t m = 0; - + for (i = 0; i < cov->size1; i++) { if (not_dropped (i, dropped_f)) - { + { m = 0; for (j = 0; j < cov->size2; j++) { @@ -371,7 +368,7 @@ fill_submatrix (const gsl_matrix * cov, gsl_matrix * submatrix, bool *dropped_f) gsl_matrix_set (submatrix, n, m, gsl_matrix_get (cov, i, j)); m++; - } + } } n++; } @@ -379,18 +376,18 @@ fill_submatrix (const gsl_matrix * cov, gsl_matrix * submatrix, bool *dropped_f) } -/* +/* Type 1 sums of squares. Populate SSQ with the Type 1 sums of squares according to COV */ static void ssq_type1 (struct covariance *cov, gsl_vector *ssq, const struct glm_spec *cmd) { - gsl_matrix *cm = covariance_calculate_unnormalized (cov); + const gsl_matrix *cm = covariance_calculate_unnormalized (cov); size_t i; size_t k; - bool *model_dropped = xcalloc (covariance_dim (cov), sizeof (*model_dropped)); - bool *submodel_dropped = xcalloc (covariance_dim (cov), sizeof (*submodel_dropped)); + bool *model_dropped = XCALLOC (covariance_dim (cov), bool); + bool *submodel_dropped = XCALLOC (covariance_dim (cov), bool); const struct categoricals *cats = covariance_get_categoricals (cov); size_t n_dropped_model = 0; @@ -408,7 +405,7 @@ ssq_type1 (struct covariance *cov, gsl_vector *ssq, const struct glm_spec *cmd) { gsl_matrix *model_cov = NULL; gsl_matrix *submodel_cov = NULL; - + n_dropped_submodel = n_dropped_model; for (i = cmd->n_dep_vars; i < covariance_dim (cov); i++) { @@ -417,10 +414,10 @@ ssq_type1 (struct covariance *cov, gsl_vector *ssq, const struct glm_spec *cmd) for (i = cmd->n_dep_vars; i < covariance_dim (cov); i++) { - const struct interaction * x = + const struct interaction * x = categoricals_get_interaction_by_subscript (cats, i - cmd->n_dep_vars); - if ( x == cmd->interactions [k]) + if (x == cmd->interactions [k]) { model_dropped[i] = false; n_dropped_model--; @@ -438,7 +435,7 @@ ssq_type1 (struct covariance *cov, gsl_vector *ssq, const struct glm_spec *cmd) gsl_vector_set (ssq, k + 1, gsl_matrix_get (submodel_cov, 0, 0) - gsl_matrix_get (model_cov, 0, 0) - ); + ); gsl_matrix_free (model_cov); gsl_matrix_free (submodel_cov); @@ -446,21 +443,20 @@ ssq_type1 (struct covariance *cov, gsl_vector *ssq, const struct glm_spec *cmd) free (model_dropped); free (submodel_dropped); - gsl_matrix_free (cm); } -/* +/* Type 2 sums of squares. Populate SSQ with the Type 2 sums of squares according to COV */ static void ssq_type2 (struct covariance *cov, gsl_vector *ssq, const struct glm_spec *cmd) { - gsl_matrix *cm = covariance_calculate_unnormalized (cov); + const gsl_matrix *cm = covariance_calculate_unnormalized (cov); size_t i; size_t k; - bool *model_dropped = xcalloc (covariance_dim (cov), sizeof (*model_dropped)); - bool *submodel_dropped = xcalloc (covariance_dim (cov), sizeof (*submodel_dropped)); + bool *model_dropped = XCALLOC (covariance_dim (cov), bool); + bool *submodel_dropped = XCALLOC (covariance_dim (cov), bool); const struct categoricals *cats = covariance_get_categoricals (cov); for (k = 0; k < cmd->n_interactions; k++) @@ -471,7 +467,7 @@ ssq_type2 (struct covariance *cov, gsl_vector *ssq, const struct glm_spec *cmd) size_t n_dropped_submodel = 0; for (i = cmd->n_dep_vars; i < covariance_dim (cov); i++) { - const struct interaction * x = + const struct interaction * x = categoricals_get_interaction_by_subscript (cats, i - cmd->n_dep_vars); model_dropped[i] = false; @@ -482,7 +478,7 @@ ssq_type2 (struct covariance *cov, gsl_vector *ssq, const struct glm_spec *cmd) n_dropped_submodel++; submodel_dropped[i] = true; - if ( cmd->interactions [k]->n_vars < x->n_vars) + if (cmd->interactions [k]->n_vars < x->n_vars) { assert (n_dropped_model < covariance_dim (cov)); n_dropped_model++; @@ -502,7 +498,7 @@ ssq_type2 (struct covariance *cov, gsl_vector *ssq, const struct glm_spec *cmd) gsl_vector_set (ssq, k + 1, gsl_matrix_get (submodel_cov, 0, 0) - gsl_matrix_get (model_cov, 0, 0) - ); + ); gsl_matrix_free (model_cov); gsl_matrix_free (submodel_cov); @@ -510,9 +506,66 @@ ssq_type2 (struct covariance *cov, gsl_vector *ssq, const struct glm_spec *cmd) free (model_dropped); free (submodel_dropped); - gsl_matrix_free (cm); } +/* + Type 3 sums of squares. + Populate SSQ with the Type 2 sums of squares according to COV + */ +static void +ssq_type3 (struct covariance *cov, gsl_vector *ssq, const struct glm_spec *cmd) +{ + const gsl_matrix *cm = covariance_calculate_unnormalized (cov); + size_t i; + size_t k; + bool *model_dropped = XCALLOC (covariance_dim (cov), bool); + bool *submodel_dropped = XCALLOC (covariance_dim (cov), bool); + const struct categoricals *cats = covariance_get_categoricals (cov); + + double ss0; + gsl_matrix *submodel_cov = gsl_matrix_alloc (cm->size1, cm->size2); + fill_submatrix (cm, submodel_cov, submodel_dropped); + reg_sweep (submodel_cov, 0); + ss0 = gsl_matrix_get (submodel_cov, 0, 0); + gsl_matrix_free (submodel_cov); + free (submodel_dropped); + + for (k = 0; k < cmd->n_interactions; k++) + { + gsl_matrix *model_cov = NULL; + size_t n_dropped_model = 0; + + for (i = cmd->n_dep_vars; i < covariance_dim (cov); i++) + { + const struct interaction * x = + categoricals_get_interaction_by_subscript (cats, i - cmd->n_dep_vars); + + model_dropped[i] = false; + + if (cmd->interactions [k] == x) + { + assert (n_dropped_model < covariance_dim (cov)); + n_dropped_model++; + model_dropped[i] = true; + } + } + + model_cov = gsl_matrix_alloc (cm->size1 - n_dropped_model, cm->size2 - n_dropped_model); + + fill_submatrix (cm, model_cov, model_dropped); + + reg_sweep (model_cov, 0); + + gsl_vector_set (ssq, k + 1, + gsl_matrix_get (model_cov, 0, 0) - ss0); + + gsl_matrix_free (model_cov); + } + free (model_dropped); +} + + + //static void dump_matrix (const gsl_matrix *m); static void @@ -529,12 +582,21 @@ run_glm (struct glm_spec *cmd, struct casereader *input, struct glm_workspace ws; struct covariance *cov; + input = casereader_create_filter_missing (input, + cmd->dep_vars, cmd->n_dep_vars, + cmd->exclude, + NULL, NULL); + + input = casereader_create_filter_missing (input, + cmd->factor_vars, cmd->n_factor_vars, + cmd->exclude, + NULL, NULL); + ws.cats = categoricals_create (cmd->interactions, cmd->n_interactions, - cmd->wv, cmd->exclude, - NULL, NULL, NULL, NULL); + cmd->wv, MV_ANY); cov = covariance_2pass_create (cmd->n_dep_vars, cmd->dep_vars, - ws.cats, cmd->wv, cmd->exclude); + ws.cats, cmd->wv, cmd->exclude, true); c = casereader_peek (input, 0); @@ -584,20 +646,20 @@ run_glm (struct glm_spec *cmd, struct casereader *input, if (cmd->dump_coding) { - struct tab_table *t = - covariance_dump_enc_header (cov, - 1 + casereader_count_cases (input)); + struct pivot_table *t = covariance_dump_enc_header (cov); for (reader = input; (c = casereader_read (reader)) != NULL; case_unref (c)) { covariance_dump_enc (cov, c, t); } - casereader_destroy (reader); - tab_submit (t); + + pivot_table_submit (t); } { - gsl_matrix *cm = covariance_calculate_unnormalized (cov); + const gsl_matrix *ucm = covariance_calculate_unnormalized (cov); + gsl_matrix *cm = gsl_matrix_alloc (ucm->size1, ucm->size2); + gsl_matrix_memcpy (cm, ucm); // dump_matrix (cm); @@ -616,16 +678,16 @@ run_glm (struct glm_spec *cmd, struct casereader *input, ssq_type1 (cov, ws.ssq, cmd); break; case 2: - case 3: - /* Type 3 is not yet implemented :( but for balanced designs it is the same as type 2 */ ssq_type2 (cov, ws.ssq, cmd); break; + case 3: + ssq_type3 (cov, ws.ssq, cmd); + break; default: NOT_REACHED (); break; } // dump_matrix (cm); - gsl_matrix_free (cm); } @@ -640,150 +702,120 @@ run_glm (struct glm_spec *cmd, struct casereader *input, taint_destroy (taint); } -static const char *roman[] = - { - "", /* The Romans had no concept of zero */ - "I", - "II", - "III", - "IV" - }; +static void +put_glm_row (struct pivot_table *table, int row, + double a, double b, double c, double d, double e) +{ + double entries[] = { a, b, c, d, e }; + + for (size_t col = 0; col < sizeof entries / sizeof *entries; col++) + if (entries[col] != SYSMIS) + pivot_table_put2 (table, col, row, + pivot_value_new_number (entries[col])); +} static void output_glm (const struct glm_spec *cmd, const struct glm_workspace *ws) { - const struct fmt_spec *wfmt = - cmd->wv ? var_get_print_format (cmd->wv) : &F_8_0; + struct pivot_table *table = pivot_table_create ( + N_("Tests of Between-Subjects Effects")); + + pivot_dimension_create (table, PIVOT_AXIS_COLUMN, N_("Statistics"), + (cmd->ss_type == 1 ? N_("Type I Sum Of Squares") + : cmd->ss_type == 2 ? N_("Type II Sum Of Squares") + : N_("Type III Sum Of Squares")), PIVOT_RC_OTHER, + N_("df"), PIVOT_RC_COUNT, + N_("Mean Square"), PIVOT_RC_OTHER, + N_("F"), PIVOT_RC_OTHER, + N_("Sig."), PIVOT_RC_SIGNIFICANCE); + + struct pivot_dimension *source = pivot_dimension_create ( + table, PIVOT_AXIS_ROW, N_("Source"), + cmd->intercept ? N_("Corrected Model") : N_("Model")); double n_total, mean; - double df_corr = 0.0; - double mse = 0; - - int f; - int r; - const int heading_columns = 1; - const int heading_rows = 1; - struct tab_table *t; - - const int nc = 6; - int nr = heading_rows + 4 + cmd->n_interactions; - if (cmd->intercept) - nr++; - - msg (MW, "GLM is experimental. Do not rely on these results."); - t = tab_create (nc, nr); - tab_title (t, _("Tests of Between-Subjects Effects")); - - tab_headers (t, heading_columns, 0, heading_rows, 0); - - tab_box (t, TAL_2, TAL_2, -1, TAL_1, 0, 0, nc - 1, nr - 1); - - tab_hline (t, TAL_2, 0, nc - 1, heading_rows); - tab_vline (t, TAL_2, heading_columns, 0, nr - 1); - - tab_text (t, 0, 0, TAB_CENTER | TAT_TITLE, _("Source")); - - /* TRANSLATORS: The parameter is a roman numeral */ - tab_text_format (t, 1, 0, TAB_CENTER | TAT_TITLE, - _("Type %s Sum of Squares"), - roman[cmd->ss_type]); - tab_text (t, 2, 0, TAB_CENTER | TAT_TITLE, _("df")); - tab_text (t, 3, 0, TAB_CENTER | TAT_TITLE, _("Mean Square")); - tab_text (t, 4, 0, TAB_CENTER | TAT_TITLE, _("F")); - tab_text (t, 5, 0, TAB_CENTER | TAT_TITLE, _("Sig.")); - moments_calculate (ws->totals, &n_total, &mean, NULL, NULL, NULL); - if (cmd->intercept) - df_corr += 1.0; - - df_corr += categoricals_df_total (ws->cats); - - mse = gsl_vector_get (ws->ssq, 0) / (n_total - df_corr); - - r = heading_rows; - tab_text (t, 0, r, TAB_LEFT | TAT_TITLE, _("Corrected Model")); - - r++; + double df_corr = 1.0 + categoricals_df_total (ws->cats); + double mse = gsl_vector_get (ws->ssq, 0) / (n_total - df_corr); + double intercept_ssq = pow2 (mean * n_total) / n_total; if (cmd->intercept) { - const double intercept = pow2 (mean * n_total) / n_total; - const double df = 1.0; - const double F = intercept / df / mse; - tab_text (t, 0, r, TAB_LEFT | TAT_TITLE, _("Intercept")); - tab_double (t, 1, r, 0, intercept, NULL); - tab_double (t, 2, r, 0, 1.00, wfmt); - tab_double (t, 3, r, 0, intercept / df, NULL); - tab_double (t, 4, r, 0, F, NULL); - tab_double (t, 5, r, 0, gsl_cdf_fdist_Q (F, df, n_total - df_corr), - NULL); - r++; + int row = pivot_category_create_leaf ( + source->root, pivot_value_new_text (N_("Intercept"))); + + /* The intercept for unbalanced models is of limited use and + nobody knows how to calculate it properly */ + if (categoricals_isbalanced (ws->cats)) + { + const double df = 1.0; + const double F = intercept_ssq / df / mse; + put_glm_row (table, row, intercept_ssq, 1.0, intercept_ssq / df, + F, gsl_cdf_fdist_Q (F, df, n_total - df_corr)); + } } - for (f = 0; f < cmd->n_interactions; ++f) + double ssq_effects = 0.0; + for (int f = 0; f < cmd->n_interactions; ++f) { + double df = categoricals_df (ws->cats, f); + double ssq = gsl_vector_get (ws->ssq, f + 1); + ssq_effects += ssq; + if (!cmd->intercept) + { + df++; + ssq += intercept_ssq; + } + double F = ssq / df / mse; + struct string str = DS_EMPTY_INITIALIZER; - const double df = categoricals_df (ws->cats, f); - const double ssq = gsl_vector_get (ws->ssq, f + 1); - const double F = ssq / df / mse; interaction_to_string (cmd->interactions[f], &str); - tab_text (t, 0, r, TAB_LEFT | TAT_TITLE, ds_cstr (&str)); - ds_destroy (&str); - - tab_double (t, 1, r, 0, ssq, NULL); - tab_double (t, 2, r, 0, df, wfmt); - tab_double (t, 3, r, 0, ssq / df, NULL); - tab_double (t, 4, r, 0, F, NULL); + int row = pivot_category_create_leaf ( + source->root, pivot_value_new_user_text_nocopy (ds_steal_cstr (&str))); - tab_double (t, 5, r, 0, gsl_cdf_fdist_Q (F, df, n_total - df_corr), - NULL); - r++; + put_glm_row (table, row, ssq, df, ssq / df, F, + gsl_cdf_fdist_Q (F, df, n_total - df_corr)); } { - /* Corrected Model */ - const double df = df_corr - 1.0; - const double ssq = ws->total_ssq - gsl_vector_get (ws->ssq, 0); - const double F = ssq / df / mse; - tab_double (t, 1, heading_rows, 0, ssq, NULL); - tab_double (t, 2, heading_rows, 0, df, wfmt); - tab_double (t, 3, heading_rows, 0, ssq / df, NULL); - tab_double (t, 4, heading_rows, 0, F, NULL); - - tab_double (t, 5, heading_rows, 0, - gsl_cdf_fdist_Q (F, df, n_total - df_corr), NULL); + /* Model / Corrected Model */ + double df = df_corr; + double ssq = ws->total_ssq - gsl_vector_get (ws->ssq, 0); + if (cmd->intercept) + df--; + else + ssq += intercept_ssq; + double F = ssq / df / mse; + put_glm_row (table, 0, ssq, df, ssq / df, F, + gsl_cdf_fdist_Q (F, df, n_total - df_corr)); } { + int row = pivot_category_create_leaf (source->root, + pivot_value_new_text (N_("Error"))); const double df = n_total - df_corr; const double ssq = gsl_vector_get (ws->ssq, 0); const double mse = ssq / df; - tab_text (t, 0, r, TAB_LEFT | TAT_TITLE, _("Error")); - tab_double (t, 1, r, 0, ssq, NULL); - tab_double (t, 2, r, 0, df, wfmt); - tab_double (t, 3, r++, 0, mse, NULL); + put_glm_row (table, row, ssq, df, mse, SYSMIS, SYSMIS); + } + + { + int row = pivot_category_create_leaf (source->root, + pivot_value_new_text (N_("Total"))); + put_glm_row (table, row, ws->total_ssq + intercept_ssq, n_total, + SYSMIS, SYSMIS, SYSMIS); } if (cmd->intercept) { - const double intercept = pow2 (mean * n_total) / n_total; - const double ssq = intercept + ws->total_ssq; - - tab_text (t, 0, r, TAB_LEFT | TAT_TITLE, _("Total")); - tab_double (t, 1, r, 0, ssq, NULL); - tab_double (t, 2, r, 0, n_total, wfmt); - - r++; + int row = pivot_category_create_leaf ( + source->root, pivot_value_new_text (N_("Corrected Total"))); + put_glm_row (table, row, ws->total_ssq, n_total - 1.0, SYSMIS, + SYSMIS, SYSMIS); } - tab_text (t, 0, r, TAB_LEFT | TAT_TITLE, _("Corrected Total")); - - - tab_double (t, 1, r, 0, ws->total_ssq, NULL); - tab_double (t, 2, r, 0, n_total - 1.0, wfmt); - - tab_submit (t); + pivot_table_submit (table); } #if 0 @@ -806,83 +838,23 @@ dump_matrix (const gsl_matrix * m) - -/* Match a variable. - If the match succeeds, the variable will be placed in VAR. - Returns true if successful */ -static bool -lex_match_variable (struct lexer *lexer, const struct glm_spec *glm, const struct variable **var) -{ - if (lex_token (lexer) != T_ID) - return false; - - *var = parse_variable_const (lexer, glm->dict); - - if ( *var == NULL) - return false; - return true; -} - -/* An interaction is a variable followed by {*, BY} followed by an interaction */ -static bool -parse_design_interaction (struct lexer *lexer, struct glm_spec *glm, struct interaction **iact) -{ - const struct variable *v = NULL; - assert (iact); - - switch (lex_next_token (lexer, 1)) - { - case T_ENDCMD: - case T_SLASH: - case T_COMMA: - case T_ID: - case T_BY: - case T_ASTERISK: - break; - default: - return false; - break; - } - - if (! lex_match_variable (lexer, glm, &v)) - { - interaction_destroy (*iact); - *iact = NULL; - return false; - } - - assert (v); - - if ( *iact == NULL) - *iact = interaction_create (v); - else - interaction_add_variable (*iact, v); - - if ( lex_match (lexer, T_ASTERISK) || lex_match (lexer, T_BY)) - { - return parse_design_interaction (lexer, glm, iact); - } - - return true; -} - static bool parse_nested_variable (struct lexer *lexer, struct glm_spec *glm) { const struct variable *v = NULL; - if ( ! lex_match_variable (lexer, glm, &v)) + if (! lex_match_variable (lexer, glm->dict, &v)) return false; if (lex_match (lexer, T_LPAREN)) { - if ( ! parse_nested_variable (lexer, glm)) + if (! parse_nested_variable (lexer, glm)) return false; - if ( ! lex_force_match (lexer, T_RPAREN)) + if (! lex_force_match (lexer, T_RPAREN)) return false; } - lex_error (lexer, "Nested variables are not yet implemented"); return false; + lex_error (lexer, "Nested variables are not yet implemented"); return false; return true; } @@ -891,7 +863,7 @@ static bool parse_design_term (struct lexer *lexer, struct glm_spec *glm) { struct interaction *iact = NULL; - if (parse_design_interaction (lexer, glm, &iact)) + if (parse_design_interaction (lexer, glm->dict, &iact)) { /* Interaction parsing successful. Add to list of interactions */ glm->interactions = xrealloc (glm->interactions, sizeof *glm->interactions * ++glm->n_interactions); @@ -899,7 +871,7 @@ parse_design_term (struct lexer *lexer, struct glm_spec *glm) return true; } - if ( parse_nested_variable (lexer, glm)) + if (parse_nested_variable (lexer, glm)) return true; return false; @@ -917,7 +889,7 @@ parse_design_spec (struct lexer *lexer, struct glm_spec *glm) if (lex_token (lexer) == T_ENDCMD || lex_token (lexer) == T_SLASH) return true; - if ( ! parse_design_term (lexer, glm)) + if (! parse_design_term (lexer, glm)) return false; lex_match (lexer, T_COMMA);