treewide: Replace <name>_cnt by n_<name>s and <name>_cap by allocated_<name>.

[pspp] / src / language / control / do-if.c

diff --git a/src/language/control/do-if.c b/src/language/control/do-if.c
index 61c450a52359b76683a5c7f9c6ca926801c8c032..b361fba920702e4939395857481207f09bb8d71d 100644 (file)
--- a/src/language/control/do-if.c
+++ b/src/language/control/do-if.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-2012 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
@@ -18,19 +18,19 @@
 
 #include <stdlib.h>
 
-#include "control-stack.h"
-#include <data/case.h>
-#include <data/procedure.h>
-#include <data/transformations.h>
-#include <data/value.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/str.h>
+#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 "xalloc.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -75,7 +75,7 @@ struct do_if_trns
   {
     struct dataset *ds;         /* The dataset */
     struct clause *clauses;     /* Clauses. */
-    size_t clause_cnt;          /* Number of clauses. */
+    size_t n_clauses;           /* Number of clauses. */
     int past_END_IF_index;      /* Transformation just past last clause. */
   };
 
@@ -99,7 +99,7 @@ cmd_do_if (struct lexer *lexer, struct dataset *ds)
 {
   struct do_if_trns *do_if = xmalloc (sizeof *do_if);
   do_if->clauses = NULL;
-  do_if->clause_cnt = 0;
+  do_if->n_clauses = 0;
   do_if->ds = ds;
 
   ctl_stack_push (&do_if_class, do_if);
@@ -121,29 +121,32 @@ cmd_else_if (struct lexer *lexer, struct dataset *ds)
 
 /* Parse ELSE. */
 int
-cmd_else (struct lexer *lexer, 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;
+
+  assert (ds == do_if->ds);
+
   add_else (do_if);
-  return lex_end_of_command (lexer);
+  return CMD_SUCCESS;
 }
 
 /* Parse END IF. */
 int
-cmd_end_if (struct lexer *lexer, 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);
 
   if (do_if == NULL)
     return CMD_CASCADING_FAILURE;
 
+  assert (ds == do_if->ds);
   ctl_stack_pop (do_if);
 
-  return lex_end_of_command (lexer);
+  return CMD_SUCCESS;
 }
 
 /* Closes out DO_IF, by adding a sentinel ELSE clause if
@@ -174,7 +177,7 @@ must_not_have_else (struct do_if_trns *do_if)
 {
   if (has_else (do_if))
     {
-      msg (SE, _("This command may not follow ELSE in DO IF...END IF."));
+      msg (SE, _("This command may not follow %s in %s ... %s."), "ELSE", "DO IF", "END IF");
       return false;
     }
   else
@@ -186,8 +189,8 @@ must_not_have_else (struct do_if_trns *do_if)
 static bool
 has_else (struct do_if_trns *do_if)
 {
-  return (do_if->clause_cnt != 0
-          && do_if->clauses[do_if->clause_cnt - 1].condition == NULL);
+  return (do_if->n_clauses != 0
+          && do_if->clauses[do_if->n_clauses - 1].condition == NULL);
 }
 
 /* Parses a DO IF or ELSE IF expression and appends the
@@ -198,13 +201,13 @@ parse_clause (struct lexer *lexer, struct do_if_trns *do_if, struct dataset *ds)
 {
   struct expression *condition;
 
-  condition = expr_parse (lexer, ds, EXPR_BOOLEAN);
+  condition = expr_parse_bool (lexer, NULL, ds);
   if (condition == NULL)
     return CMD_CASCADING_FAILURE;
 
   add_clause (do_if, condition);
 
-  return lex_end_of_command (lexer);
+  return CMD_SUCCESS;
 }
 
 /* Adds a clause to DO_IF that tests for the given CONDITION and,
@@ -215,12 +218,12 @@ add_clause (struct do_if_trns *do_if, struct expression *condition)
 {
   struct clause *clause;
 
-  if (do_if->clause_cnt > 0)
+  if (do_if->n_clauses > 0)
     add_transformation (do_if->ds, break_trns_proc, NULL, do_if);
 
   do_if->clauses = xnrealloc (do_if->clauses,
-                              do_if->clause_cnt + 1, sizeof *do_if->clauses);
-  clause = &do_if->clauses[do_if->clause_cnt++];
+                              do_if->n_clauses + 1, sizeof *do_if->clauses);
+  clause = &do_if->clauses[do_if->n_clauses++];
   clause->condition = condition;
   clause->target_index = next_transformation (do_if->ds);
 }
@@ -240,17 +243,17 @@ do_if_finalize_func (void *do_if_ UNUSED)
    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)
+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;
+  for (clause = do_if->clauses; clause < do_if->clauses + do_if->n_clauses;
        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)
@@ -269,7 +272,7 @@ do_if_trns_free (void *do_if_)
   struct do_if_trns *do_if = do_if_;
   struct clause *clause;
 
-  for (clause = do_if->clauses; clause < do_if->clauses + do_if->clause_cnt;
+  for (clause = do_if->clauses; clause < do_if->clauses + do_if->n_clauses;
        clause++)
     expr_free (clause->condition);
   free (do_if->clauses);
@@ -279,7 +282,8 @@ 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)
+break_trns_proc (void *do_if_, struct ccase **c UNUSED,
+                 casenumber case_num UNUSED)
 {
   struct do_if_trns *do_if = do_if_;