Make the expression code a little nicer and fix bugs found

[pspp-builds.git] / src / inpt-pgm.c

diff --git a/src/inpt-pgm.c b/src/inpt-pgm.c
index ee2fd7cb1302c0a495a0ef26ed59a00a9e68314f..69f5b0483db015877d4942ef5ec15196cbed4763 100644 (file)
--- a/src/inpt-pgm.c
+++ b/src/inpt-pgm.c
@@ -18,7 +18,7 @@
    02111-1307, USA. */
 
 #include <config.h>
-#include <assert.h>
+#include "error.h"
 #include <float.h>
 #include <stdlib.h>
 #include "alloc.h"
@@ -303,6 +303,7 @@ end_case_trns_proc (struct trns_header *t UNUSED, struct ccase * c UNUSED,
                     int case_num UNUSED)
 {
   assert (0);
+  abort ();
 }
 
 /* REREAD transformation. */
@@ -342,7 +343,7 @@ cmd_reread (void)
              return CMD_FAILURE;
            }
          
-         e = expr_parse (PXP_NUMERIC);
+         e = expr_parse (EXPR_NUMERIC);
          if (!e)
            return CMD_FAILURE;
        }