X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fcontrol%2Floop.c;h=156e647ea0e617ac16446a8c8a38d84814b47071;hb=2c4b104df57f2e8b5ed2afa50819294aaac4aa6c;hp=f5d205d4303e864bf2a6203c3f6bc5792bed1657;hpb=8af88c0b7ea2fe75df7e45497988ed0371006a86;p=pspp diff --git a/src/language/control/loop.c b/src/language/control/loop.c index f5d205d430..156e647ea0 100644 --- a/src/language/control/loop.c +++ b/src/language/control/loop.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2009-2011 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 @@ -16,24 +16,24 @@ #include -#include "control-stack.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "language/control/control-stack.h" + +#include "data/case.h" +#include "data/dataset.h" +#include "data/dictionary.h" +#include "data/settings.h" +#include "data/transformations.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/expressions/public.h" +#include "language/lexer/lexer.h" +#include "libpspp/compiler.h" +#include "libpspp/message.h" +#include "libpspp/misc.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -61,7 +61,7 @@ struct loop_trns /* Iteration limit. */ int max_pass_count; /* Maximum number of passes (-1=unlimited). */ - int pass; /* Number of passes thru the loop so far. */ + int pass; /* Number of passes through the loop so far. */ /* a=a TO b [BY c]. */ struct variable *index_var; /* Index variable. */ @@ -103,7 +103,7 @@ cmd_loop (struct lexer *lexer, struct dataset *ds) bool ok = true; loop = create_loop_trns (ds); - while (lex_token (lexer) != '.' && ok) + while (lex_token (lexer) != T_ENDCMD && ok) { if (lex_match_id (lexer, "IF")) ok = parse_if_clause (lexer, loop, &loop->loop_condition); @@ -154,7 +154,7 @@ cmd_end_loop (struct lexer *lexer, struct dataset *ds) /* Parses BREAK. */ int -cmd_break (struct lexer *lexer, struct dataset *ds) +cmd_break (struct lexer *lexer UNUSED, struct dataset *ds) { struct ctl_stmt *loop = ctl_stack_search (&loop_class); if (loop == NULL) @@ -162,7 +162,7 @@ cmd_break (struct lexer *lexer, struct dataset *ds) add_transformation (ds, break_trns_proc, NULL, loop); - return lex_end_of_command (lexer); + return CMD_SUCCESS; } /* Closes a LOOP construct by emitting the END LOOP @@ -177,10 +177,7 @@ close_loop (void *loop_) /* If there's nothing else limiting the number of loops, use MXLOOPS as a limit. */ - if (loop->max_pass_count == -1 - && loop->index_var == NULL - && loop->loop_condition == NULL - && loop->end_loop_condition == NULL) + if (loop->max_pass_count == -1 && loop->index_var == NULL) loop->max_pass_count = settings_get_mxloops (); } @@ -197,7 +194,7 @@ parse_if_clause (struct lexer *lexer, return false; } - *condition = expr_parse_pool (lexer, loop->pool, loop->ds, EXPR_BOOLEAN); + *condition = expr_parse_bool (lexer, loop->pool, loop->ds); return *condition != NULL; } @@ -221,22 +218,21 @@ parse_index_clause (struct dataset *ds, struct lexer *lexer, return false; } - loop->index_var = dict_lookup_var (dataset_dict (ds), lex_tokid (lexer)); + loop->index_var = dict_lookup_var (dataset_dict (ds), lex_tokcstr (lexer)); if (loop->index_var != NULL) *created_index_var = false; else { loop->index_var = dict_create_var_assert (dataset_dict (ds), - lex_tokid (lexer), 0); + lex_tokcstr (lexer), 0); *created_index_var = true; } lex_get (lexer); - if (!lex_force_match (lexer, '=')) + if (!lex_force_match (lexer, T_EQUALS)) return false; - loop->first_expr = expr_parse_pool (lexer, loop->pool, - loop->ds, EXPR_NUMBER); + loop->first_expr = expr_parse (lexer, loop->pool, loop->ds, VAL_NUMERIC); if (loop->first_expr == NULL) return false; @@ -255,13 +251,13 @@ parse_index_clause (struct dataset *ds, struct lexer *lexer, lex_sbc_only_once (e == &loop->last_expr ? "TO" : "BY"); return false; } - *e = expr_parse_pool (lexer, loop->pool, loop->ds, EXPR_NUMBER); + *e = expr_parse (lexer, loop->pool, loop->ds, VAL_NUMERIC); if (*e == NULL) return false; } if (loop->last_expr == NULL) { - lex_sbc_missing (lexer, "TO"); + lex_sbc_missing ("TO"); return false; } if (loop->by_expr == NULL) @@ -319,7 +315,7 @@ loop_trns_proc (void *loop_, struct ccase **c, casenumber case_num) /* Even if the loop is never entered, set the index variable to the initial value. */ *c = case_unshare (*c); - case_data_rw (*c, loop->index_var)->f = loop->cur; + *case_num_rw (*c, loop->index_var) = loop->cur; /* Throw out pathological cases. */ if (!isfinite (loop->cur) || !isfinite (loop->by) @@ -367,12 +363,8 @@ end_loop_trns_proc (void *loop_, struct ccase **c, casenumber case_num UNUSED) goto break_out; /* MXLOOPS limiter. */ - if (loop->max_pass_count >= 0) - { - if (loop->pass >= loop->max_pass_count) - goto break_out; - loop->pass++; - } + if (loop->max_pass_count >= 0 && ++loop->pass >= loop->max_pass_count) + goto break_out; /* Indexing clause limiter: counting downward. */ if (loop->index_var != NULL) @@ -382,7 +374,7 @@ end_loop_trns_proc (void *loop_, struct ccase **c, casenumber case_num UNUSED) || (loop->by < 0.0 && loop->cur < loop->last)) goto break_out; *c = case_unshare (*c); - case_data_rw (*c, loop->index_var)->f = loop->cur; + *case_num_rw (*c, loop->index_var) = loop->cur; } if (loop->loop_condition != NULL