X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fcontrol%2Floop.c;h=dafc0ba8b4c2a534657fc51a85e6f18a08fe4613;hb=909f10f57c532130c7fb16c103b1328416f5fb06;hp=f31486f605f7bd7680257bf4dd0710738374b02a;hpb=81fff61a96bece351e381ad3fef8ab1248a952ba;p=pspp-builds.git diff --git a/src/language/control/loop.c b/src/language/control/loop.c index f31486f6..dafc0ba8 100644 --- a/src/language/control/loop.c +++ b/src/language/control/loop.c @@ -1,6 +1,5 @@ /* PSPP - computes sample statistics. Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -58,6 +57,7 @@ struct loop_trns { struct pool *pool; + struct dataset *ds; /* Iteration limit. */ int max_pass_count; /* Maximum number of passes (-1=unlimited). */ @@ -79,52 +79,55 @@ struct loop_trns int past_END_LOOP_index; /* Just past END LOOP transformation. */ }; -static struct ctl_class loop_class; +static const struct ctl_class loop_class; static trns_finalize_func loop_trns_finalize; static trns_proc_func loop_trns_proc, end_loop_trns_proc, break_trns_proc; static trns_free_func loop_trns_free; -static struct loop_trns *create_loop_trns (void); -static bool parse_if_clause (struct loop_trns *, struct expression **); -static bool parse_index_clause (struct loop_trns *, char index_var_name[]); +static struct loop_trns *create_loop_trns (struct dataset *); +static bool parse_if_clause (struct lexer *, + struct loop_trns *, struct expression **); +static bool parse_index_clause (struct dataset *, struct lexer *, + struct loop_trns *, bool *created_index_var); static void close_loop (void *); /* LOOP. */ /* Parses LOOP. */ int -cmd_loop (void) +cmd_loop (struct lexer *lexer, struct dataset *ds) { struct loop_trns *loop; - char index_var_name[LONG_NAME_LEN + 1]; + bool created_index_var = false; bool ok = true; - loop = create_loop_trns (); - while (token != '.' && ok) + loop = create_loop_trns (ds); + while (lex_token (lexer) != '.' && ok) { - if (lex_match_id ("IF")) - ok = parse_if_clause (loop, &loop->loop_condition); + if (lex_match_id (lexer, "IF")) + ok = parse_if_clause (lexer, loop, &loop->loop_condition); else - ok = parse_index_clause (loop, index_var_name); + ok = parse_index_clause (ds, lexer, loop, &created_index_var); } - /* Find index variable and create if necessary. */ - if (ok && index_var_name[0] != '\0') + /* Clean up if necessary. */ + if (!ok) { - loop->index_var = dict_lookup_var (default_dict, index_var_name); - if (loop->index_var == NULL) - loop->index_var = dict_create_var (default_dict, index_var_name, 0); + loop->max_pass_count = 0; + if (loop->index_var != NULL && created_index_var) + { + dict_delete_var (dataset_dict (ds), loop->index_var); + loop->index_var = NULL; + } } - - if (!ok) - loop->max_pass_count = 0; - return ok ? CMD_SUCCESS : CMD_FAILURE; + + return ok ? CMD_SUCCESS : CMD_CASCADING_FAILURE; } /* Parses END LOOP. */ int -cmd_end_loop (void) +cmd_end_loop (struct lexer *lexer, struct dataset *ds) { struct loop_trns *loop; bool ok = true; @@ -132,12 +135,14 @@ cmd_end_loop (void) loop = ctl_stack_top (&loop_class); if (loop == NULL) return CMD_CASCADING_FAILURE; + + assert (loop->ds == ds); /* Parse syntax. */ - if (lex_match_id ("IF")) - ok = parse_if_clause (loop, &loop->end_loop_condition); + if (lex_match_id (lexer, "IF")) + ok = parse_if_clause (lexer, loop, &loop->end_loop_condition); if (ok) - ok = lex_end_of_command () == CMD_SUCCESS; + ok = lex_end_of_command (lexer) == CMD_SUCCESS; if (!ok) loop->max_pass_count = 0; @@ -149,15 +154,15 @@ cmd_end_loop (void) /* Parses BREAK. */ int -cmd_break (void) +cmd_break (struct lexer *lexer, struct dataset *ds) { struct ctl_stmt *loop = ctl_stack_search (&loop_class); if (loop == NULL) return CMD_CASCADING_FAILURE; - add_transformation (break_trns_proc, NULL, loop); + add_transformation (ds, break_trns_proc, NULL, loop); - return lex_end_of_command (); + return lex_end_of_command (lexer); } /* Closes a LOOP construct by emitting the END LOOP @@ -167,8 +172,8 @@ close_loop (void *loop_) { struct loop_trns *loop = loop_; - add_transformation (end_loop_trns_proc, NULL, loop); - loop->past_END_LOOP_index = next_transformation (); + add_transformation (loop->ds, end_loop_trns_proc, NULL, loop); + loop->past_END_LOOP_index = next_transformation (loop->ds); /* If there's nothing else limiting the number of loops, use MXLOOPS as a limit. */ @@ -183,39 +188,64 @@ close_loop (void *loop_) resulting expression to *CONDITION. Returns true if successful, false on failure. */ static bool -parse_if_clause (struct loop_trns *loop, struct expression **condition) +parse_if_clause (struct lexer *lexer, + struct loop_trns *loop, struct expression **condition) { - *condition = expr_parse_pool (loop->pool, default_dict, EXPR_BOOLEAN); + if (*condition != NULL) + { + lex_sbc_only_once ("IF"); + return false; + } + + *condition = expr_parse_pool (lexer, loop->pool, loop->ds, EXPR_BOOLEAN); return *condition != NULL; } /* Parses an indexing clause into LOOP. - Stores the index variable's name in INDEX_VAR_NAME[]. + Stores true in *CREATED_INDEX_VAR if the index clause created + a new variable, false otherwise. Returns true if successful, false on failure. */ static bool -parse_index_clause (struct loop_trns *loop, char index_var_name[]) +parse_index_clause (struct dataset *ds, struct lexer *lexer, + struct loop_trns *loop, bool *created_index_var) { - if (token != T_ID) + if (loop->index_var != NULL) + { + msg (SE, _("Only one index clause may be specified.")); + return false; + } + + if (lex_token (lexer) != T_ID) { - lex_error (NULL); + lex_error (lexer, NULL); return false; } - strcpy (index_var_name, tokid); - lex_get (); - if (!lex_force_match ('=')) + loop->index_var = dict_lookup_var (dataset_dict (ds), lex_tokid (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); + *created_index_var = true; + } + lex_get (lexer); + + if (!lex_force_match (lexer, '=')) return false; - loop->first_expr = expr_parse_pool (loop->pool, default_dict, EXPR_NUMBER); + loop->first_expr = expr_parse_pool (lexer, loop->pool, + loop->ds, EXPR_NUMBER); if (loop->first_expr == NULL) return false; for (;;) { struct expression **e; - if (lex_match (T_TO)) + if (lex_match (lexer, T_TO)) e = &loop->last_expr; - else if (lex_match (T_BY)) + else if (lex_match (lexer, T_BY)) e = &loop->by_expr; else break; @@ -225,13 +255,13 @@ parse_index_clause (struct loop_trns *loop, char index_var_name[]) lex_sbc_only_once (e == &loop->last_expr ? "TO" : "BY"); return false; } - *e = expr_parse_pool (loop->pool, default_dict, EXPR_NUMBER); + *e = expr_parse_pool (lexer, loop->pool, loop->ds, EXPR_NUMBER); if (*e == NULL) return false; } if (loop->last_expr == NULL) { - lex_sbc_missing ("TO"); + lex_sbc_missing (lexer, "TO"); return false; } if (loop->by_expr == NULL) @@ -242,7 +272,7 @@ parse_index_clause (struct loop_trns *loop, char index_var_name[]) /* Creates, initializes, and returns a new loop_trns. */ static struct loop_trns * -create_loop_trns (void) +create_loop_trns (struct dataset *ds) { struct loop_trns *loop = pool_create_container (struct loop_trns, pool); loop->max_pass_count = -1; @@ -250,10 +280,11 @@ create_loop_trns (void) loop->index_var = NULL; loop->first_expr = loop->by_expr = loop->last_expr = NULL; loop->loop_condition = loop->end_loop_condition = NULL; + loop->ds = ds; - add_transformation_with_finalizer (loop_trns_finalize, + add_transformation_with_finalizer (ds, loop_trns_finalize, loop_trns_proc, loop_trns_free, loop); - loop->past_LOOP_index = next_transformation (); + loop->past_LOOP_index = next_transformation (ds); ctl_stack_push (&loop_class, loop); @@ -273,7 +304,7 @@ loop_trns_finalize (void *do_if_ UNUSED) /* Sets up LOOP for the first pass. */ static int -loop_trns_proc (void *loop_, struct ccase *c, int case_num) +loop_trns_proc (void *loop_, struct ccase *c, casenumber case_num) { struct loop_trns *loop = loop_; @@ -287,7 +318,7 @@ loop_trns_proc (void *loop_, struct ccase *c, int case_num) /* Even if the loop is never entered, set the index variable to the initial value. */ - case_data_rw (c, loop->index_var->fv)->f = loop->cur; + case_data_rw (c, loop->index_var)->f = loop->cur; /* Throw out pathological cases. */ if (!finite (loop->cur) || !finite (loop->by) || !finite (loop->last) @@ -325,12 +356,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, int 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) != 1.0) + && expr_evaluate_num (loop->end_loop_condition, c, case_num) != 0.0) goto break_out; /* MXLOOPS limiter. */ @@ -348,7 +379,7 @@ end_loop_trns_proc (void *loop_, struct ccase *c, int 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->fv)->f = loop->cur; + case_data_rw (c, loop->index_var)->f = loop->cur; } if (loop->loop_condition != NULL @@ -363,7 +394,7 @@ end_loop_trns_proc (void *loop_, struct ccase *c, int case_num UNUSED) /* Executes BREAK. */ static int -break_trns_proc (void *loop_, struct ccase *c UNUSED, int case_num UNUSED) +break_trns_proc (void *loop_, struct ccase *c UNUSED, casenumber case_num UNUSED) { struct loop_trns *loop = loop_; @@ -371,7 +402,7 @@ break_trns_proc (void *loop_, struct ccase *c UNUSED, int case_num UNUSED) } /* LOOP control structure class definition. */ -static struct ctl_class loop_class = +static const struct ctl_class loop_class = { "LOOP", "END LOOP",