X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fmeans.c;h=8fa1ba81cd51f7326e228c6a2d2047a5804e74a1;hb=eff2701d5d282bfc0c1b52bd2af985705b11b307;hp=debb4436764263bfa1c9147600a5bc388d1051e9;hpb=e75e64e8deb02f7f48b00e3475704ac07e31a978;p=pspp diff --git a/src/language/stats/means.c b/src/language/stats/means.c index debb443676..8fa1ba81cd 100644 --- a/src/language/stats/means.c +++ b/src/language/stats/means.c @@ -511,23 +511,19 @@ parse_means_table_syntax (struct lexer *lexer, const struct means *cmd, struct m return false; /* Factor variable (s) */ - while (lex_token (lexer) != T_ENDCMD && lex_token (lexer) != T_SLASH) + while (lex_match (lexer, T_BY)) { - if (lex_match (lexer, T_BY)) - { - table->n_layers++; - table->layers = - pool_realloc (cmd->pool, table->layers, - sizeof (*table->layers) * table->n_layers); - - if (!parse_variables_const_pool - (lexer, cmd->pool, cmd->dict, - &table->layers[table->n_layers - 1].factor_vars, - &table->layers[table->n_layers - 1].n_factor_vars, - PV_NO_DUPLICATE)) - return false; - - } + table->n_layers++; + table->layers = + pool_realloc (cmd->pool, table->layers, + sizeof (*table->layers) * table->n_layers); + + if (!parse_variables_const_pool + (lexer, cmd->pool, cmd->dict, + &table->layers[table->n_layers - 1].factor_vars, + &table->layers[table->n_layers - 1].n_factor_vars, + PV_NO_DUPLICATE)) + return false; } /* There is always at least one layer.