X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fcontrol%2Fdo-if.c;h=fe9ca73008e7ba8ed64e02621adbffbf2cd9bb60;hb=2be9bee9da6a2ce27715e58128569594319abfa2;hp=e53fc898481b3d355d8349a1d587be1307b7f02f;hpb=244ade48f9c233532cc535d3233fdef53bf9266b;p=pspp-builds.git diff --git a/src/language/control/do-if.c b/src/language/control/do-if.c index e53fc898..fe9ca730 100644 --- a/src/language/control/do-if.c +++ b/src/language/control/do-if.c @@ -1,38 +1,36 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . +/* PSPP - a program for statistical analysis. + 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 the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include #include -#include "control-stack.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/case.h" +#include "data/dataset.h" +#include "data/transformations.h" +#include "data/value.h" +#include "language/command.h" +#include "language/control/control-stack.h" +#include "language/expressions/public.h" +#include "language/lexer/lexer.h" +#include "libpspp/compiler.h" +#include "libpspp/message.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -45,7 +43,7 @@ So, the following code: - DO IF a. + DO IF a. ...block 1... ELSE IF b. ...block 2... @@ -66,7 +64,7 @@ */ /* A conditional clause. */ -struct clause +struct clause { struct expression *condition; /* Test expression; NULL for ELSE clause. */ int target_index; /* Transformation to jump to if true. */ @@ -83,9 +81,8 @@ struct do_if_trns static const struct ctl_class do_if_class; -static int parse_clause (struct do_if_trns *, struct dataset *ds); -static void add_clause (struct do_if_trns *, - struct expression *condition, int target_index); +static int parse_clause (struct lexer *, struct do_if_trns *, struct dataset *ds); +static void add_clause (struct do_if_trns *, struct expression *condition); static void add_else (struct do_if_trns *); static bool has_else (struct do_if_trns *); @@ -98,7 +95,7 @@ static trns_free_func do_if_trns_free; /* Parse DO IF. */ int -cmd_do_if (struct dataset *ds) +cmd_do_if (struct lexer *lexer, struct dataset *ds) { struct do_if_trns *do_if = xmalloc (sizeof *do_if); do_if->clauses = NULL; @@ -109,34 +106,34 @@ cmd_do_if (struct dataset *ds) add_transformation_with_finalizer (ds, do_if_finalize_func, do_if_trns_proc, do_if_trns_free, do_if); - return parse_clause (do_if, ds); + return parse_clause (lexer, do_if, ds); } /* Parse ELSE IF. */ int -cmd_else_if (struct dataset *ds) +cmd_else_if (struct lexer *lexer, struct dataset *ds) { struct do_if_trns *do_if = ctl_stack_top (&do_if_class); if (do_if == NULL || !must_not_have_else (do_if)) return CMD_CASCADING_FAILURE; - return parse_clause (do_if, ds); + return parse_clause (lexer, do_if, ds); } /* Parse ELSE. */ int -cmd_else (struct dataset *ds) +cmd_else (struct lexer *lexer UNUSED, struct dataset *ds) { struct do_if_trns *do_if = ctl_stack_top (&do_if_class); assert (ds == do_if->ds); if (do_if == NULL || !must_not_have_else (do_if)) return CMD_CASCADING_FAILURE; add_else (do_if); - return lex_end_of_command (); + return CMD_SUCCESS; } /* Parse END IF. */ int -cmd_end_if (struct dataset *ds) +cmd_end_if (struct lexer *lexer UNUSED, struct dataset *ds) { struct do_if_trns *do_if = ctl_stack_top (&do_if_class); assert (ds == do_if->ds); @@ -146,7 +143,7 @@ cmd_end_if (struct dataset *ds) ctl_stack_pop (do_if); - return lex_end_of_command (); + return CMD_SUCCESS; } /* Closes out DO_IF, by adding a sentinel ELSE clause if @@ -155,8 +152,8 @@ static void close_do_if (void *do_if_) { struct do_if_trns *do_if = do_if_; - - if (!has_else (do_if)) + + if (!has_else (do_if)) add_else (do_if); do_if->past_END_IF_index = next_transformation (do_if->ds); } @@ -164,16 +161,16 @@ close_do_if (void *do_if_) /* Adds an ELSE clause to DO_IF pointing to the next transformation. */ static void -add_else (struct do_if_trns *do_if) +add_else (struct do_if_trns *do_if) { assert (!has_else (do_if)); - add_clause (do_if, NULL, next_transformation (do_if->ds)); + add_clause (do_if, NULL); } /* Returns true if DO_IF does not yet have an ELSE clause. Reports an error and returns false if it does already. */ static bool -must_not_have_else (struct do_if_trns *do_if) +must_not_have_else (struct do_if_trns *do_if) { if (has_else (do_if)) { @@ -187,7 +184,7 @@ must_not_have_else (struct do_if_trns *do_if) /* Returns true if DO_IF already has an ELSE clause, false otherwise. */ static bool -has_else (struct do_if_trns *do_if) +has_else (struct do_if_trns *do_if) { return (do_if->clause_cnt != 0 && do_if->clauses[do_if->clause_cnt - 1].condition == NULL); @@ -197,24 +194,24 @@ has_else (struct do_if_trns *do_if) corresponding clause to DO_IF. Checks for end of command and returns a command return code. */ static int -parse_clause (struct do_if_trns *do_if, struct dataset *ds) +parse_clause (struct lexer *lexer, struct do_if_trns *do_if, struct dataset *ds) { struct expression *condition; - condition = expr_parse (ds, EXPR_BOOLEAN); + condition = expr_parse (lexer, ds, EXPR_BOOLEAN); if (condition == NULL) return CMD_CASCADING_FAILURE; - add_clause (do_if, condition, next_transformation (ds)); + add_clause (do_if, condition); - return lex_end_of_command (); + return CMD_SUCCESS; } /* Adds a clause to DO_IF that tests for the given CONDITION and, - if true, jumps to TARGET_INDEX. */ + if true, jumps to the set of transformations produced by + following commands. */ static void -add_clause (struct do_if_trns *do_if, - struct expression *condition, int target_index) +add_clause (struct do_if_trns *do_if, struct expression *condition) { struct clause *clause; @@ -225,13 +222,13 @@ add_clause (struct do_if_trns *do_if, do_if->clause_cnt + 1, sizeof *do_if->clauses); clause = &do_if->clauses[do_if->clause_cnt++]; clause->condition = condition; - clause->target_index = target_index; + clause->target_index = next_transformation (do_if->ds); } /* Finalizes DO IF by clearing the control stack, thus ensuring - that all open DO IFs are closed. */ + that all open DO IFs are closed. */ static void -do_if_finalize_func (void *do_if_ UNUSED) +do_if_finalize_func (void *do_if_ UNUSED) { /* This will be called multiple times if multiple DO IFs were executed, which is slightly unclean, but at least it's @@ -242,24 +239,24 @@ do_if_finalize_func (void *do_if_ UNUSED) /* DO IF transformation procedure. Checks each clause and jumps to the appropriate transformation. */ -static int -do_if_trns_proc (void *do_if_, struct ccase *c, casenumber case_num UNUSED) +static int +do_if_trns_proc (void *do_if_, struct ccase **c, casenumber case_num UNUSED) { struct do_if_trns *do_if = do_if_; struct clause *clause; for (clause = do_if->clauses; clause < do_if->clauses + do_if->clause_cnt; - clause++) + clause++) { if (clause->condition != NULL) { - double boolean = expr_evaluate_num (clause->condition, c, case_num); + double boolean = expr_evaluate_num (clause->condition, *c, case_num); if (boolean == 1.0) return clause->target_index; else if (boolean == SYSMIS) return do_if->past_END_IF_index; } - else + else return clause->target_index; } return do_if->past_END_IF_index; @@ -281,8 +278,9 @@ do_if_trns_free (void *do_if_) } /* Breaks out of a DO IF construct. */ -static int -break_trns_proc (void *do_if_, struct ccase *c UNUSED, casenumber case_num UNUSED) +static int +break_trns_proc (void *do_if_, struct ccase **c UNUSED, + casenumber case_num UNUSED) { struct do_if_trns *do_if = do_if_; @@ -290,7 +288,7 @@ break_trns_proc (void *do_if_, struct ccase *c UNUSED, casenumber case_num UNUSE } /* DO IF control structure class definition. */ -static const struct ctl_class do_if_class = +static const struct ctl_class do_if_class = { "DO IF", "END IF",