X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fcontrol%2Floop.c;h=362f199327e00c33826d90976dd746a33ee90c9e;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=20cf69e5d9ce2abbeb14daa126909a57efb2eb32;hpb=9f087e7aa4cdff1d5d46d5e188c0017a9d2d0029;p=pspp-builds.git diff --git a/src/language/control/loop.c b/src/language/control/loop.c index 20cf69e5..362f1993 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 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2009, 2010, 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,23 +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/dictionary.h" +#include "data/procedure.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) @@ -102,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); @@ -180,7 +181,7 @@ close_loop (void *loop_) && loop->index_var == NULL && loop->loop_condition == NULL && loop->end_loop_condition == NULL) - loop->max_pass_count = get_mxloops (); + loop->max_pass_count = settings_get_mxloops (); } /* Parses an IF clause for LOOP or END LOOP and stores the @@ -220,18 +221,18 @@ 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, @@ -303,24 +304,26 @@ loop_trns_finalize (void *do_if_ UNUSED) /* Sets up LOOP for the first pass. */ static int -loop_trns_proc (void *loop_, struct ccase *c, casenumber case_num) +loop_trns_proc (void *loop_, struct ccase **c, casenumber case_num) { struct loop_trns *loop = loop_; if (loop->index_var != NULL) { /* Evaluate loop index expressions. */ - loop->cur = expr_evaluate_num (loop->first_expr, c, case_num); + loop->cur = expr_evaluate_num (loop->first_expr, *c, case_num); if (loop->by_expr != NULL) - loop->by = expr_evaluate_num (loop->by_expr, c, case_num); - loop->last = expr_evaluate_num (loop->last_expr, c, case_num); + loop->by = expr_evaluate_num (loop->by_expr, *c, case_num); + loop->last = expr_evaluate_num (loop->last_expr, *c, case_num); /* Even if the loop is never entered, set the index variable to the initial value. */ - case_data_rw (c, loop->index_var)->f = loop->cur; + *c = case_unshare (*c); + case_data_rw (*c, loop->index_var)->f = loop->cur; /* Throw out pathological cases. */ - if (!finite (loop->cur) || !finite (loop->by) || !finite (loop->last) + if (!isfinite (loop->cur) || !isfinite (loop->by) + || !isfinite (loop->last) || loop->by == 0.0 || (loop->by > 0.0 && loop->cur > loop->last) || (loop->by < 0.0 && loop->cur < loop->last)) @@ -334,7 +337,7 @@ loop_trns_proc (void *loop_, struct ccase *c, casenumber case_num) /* Check condition. */ if (loop->loop_condition != NULL - && expr_evaluate_num (loop->loop_condition, c, case_num) != 1.0) + && expr_evaluate_num (loop->loop_condition, *c, case_num) != 1.0) goto zero_pass; return loop->past_LOOP_index; @@ -355,12 +358,12 @@ loop_trns_free (void *loop_) /* Finishes a pass through the loop and starts the next. */ static int -end_loop_trns_proc (void *loop_, struct ccase *c, casenumber case_num UNUSED) +end_loop_trns_proc (void *loop_, struct ccase **c, casenumber case_num UNUSED) { struct loop_trns *loop = loop_; if (loop->end_loop_condition != NULL - && expr_evaluate_num (loop->end_loop_condition, c, case_num) != 0.0) + && expr_evaluate_num (loop->end_loop_condition, *c, case_num) != 0.0) goto break_out; /* MXLOOPS limiter. */ @@ -378,11 +381,12 @@ end_loop_trns_proc (void *loop_, struct ccase *c, casenumber case_num UNUSED) if ((loop->by > 0.0 && loop->cur > loop->last) || (loop->by < 0.0 && loop->cur < loop->last)) goto break_out; - case_data_rw (c, loop->index_var)->f = loop->cur; + *c = case_unshare (*c); + case_data_rw (*c, loop->index_var)->f = loop->cur; } if (loop->loop_condition != NULL - && expr_evaluate_num (loop->loop_condition, c, case_num) != 1.0) + && expr_evaluate_num (loop->loop_condition, *c, case_num) != 1.0) goto break_out; return loop->past_LOOP_index; @@ -393,7 +397,8 @@ end_loop_trns_proc (void *loop_, struct ccase *c, casenumber case_num UNUSED) /* Executes BREAK. */ static int -break_trns_proc (void *loop_, struct ccase *c UNUSED, casenumber case_num UNUSED) +break_trns_proc (void *loop_, struct ccase **c UNUSED, + casenumber case_num UNUSED) { struct loop_trns *loop = loop_;