Remove "Written by Ben Pfaff <blp@gnu.org>" lines everywhere.

[pspp-builds.git] / src / language / expressions / optimize.c

diff --git a/src/language/expressions/optimize.c b/src/language/expressions/optimize.c
index c5ba6224dfd0f07c00db74c0bf8e00415fa9d15f..90d90c676ca553339ff895208b57a2d8969e6511 100644 (file)
--- a/src/language/expressions/optimize.c
+++ b/src/language/expressions/optimize.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -24,6 +23,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <libpspp/alloc.h>
+#include <libpspp/assertion.h>
 #include <data/calendar.h>
 #include <data/data-in.h>
 #include <libpspp/message.h>
@@ -44,7 +44,7 @@ expr_optimize (union any_node *node, struct expression *e)
 {
   int nonconst_cnt = 0; /* Number of nonconstant children. */
   int sysmis_cnt = 0;   /* Number of system-missing children. */
-  struct operation *op;
+  const struct operation *op;
   struct composite_node *c;
   int i;
 
@@ -157,12 +157,10 @@ evaluate_tree (struct composite_node *node, struct expression *e)
 #include "optimize.inc"
 
     default:
-      assert (0);
+      NOT_REACHED ();
     }
 
-  /* Not reached. */
-  assert (0);
-  abort ();
+  NOT_REACHED ();
 }
 
 static double
@@ -302,14 +300,14 @@ flatten_atom (union any_node *n, struct expression *e)
       break;
 
     default:
-      abort ();
+      NOT_REACHED ();
     }
 }
 
 static void
 flatten_composite (union any_node *n, struct expression *e)
 {
-  struct operation *op = &operations[n->type];
+  const struct operation *op = &operations[n->type];
   size_t i;
       
   for (i = 0; i < n->composite.arg_cnt; i++)
@@ -363,7 +361,7 @@ flatten_node (union any_node *n, struct expression *e)
   else if (is_composite (n->type))
     flatten_composite (n, e);
   else 
-    abort ();
+    NOT_REACHED ();
 }
 
 static union operation_data *