[Pspp-cvs] Changes to pspp/src/vfm.c

[Ben Pfaff]

Index: pspp/src/vfm.c
diff -u pspp/src/vfm.c:1.29 pspp/src/vfm.c:1.30
--- pspp/src/vfm.c:1.29 Mon Jan 24 04:29:53 2005
+++ pspp/src/vfm.c      Tue Mar  1 08:16:16 2005
@@ -33,7 +33,7 @@
 #include "dictionary.h"
 #include "do-ifP.h"
 #include "error.h"
-#include "expr.h"
+#include "expressions/public.h"
 #include "misc.h"
 #include "settings.h"
 #include "som.h"
@@ -339,7 +339,7 @@
 
   /* PROCESS IF. */
   if (process_if_expr != NULL
-      && expr_evaluate (process_if_expr, c, case_idx, NULL) != 1.0)
+      && expr_evaluate_num (process_if_expr, c, case_idx) != 1.0)
     return 1;
 
   return 0;
@@ -622,7 +622,7 @@
 struct ccase *
 lagged_case (int n_before)
 {
-  assert (n_before <= n_lag);
+  assert (n_before >= 1 && n_before <= n_lag);
   if (n_before <= lag_count)
     {
       int index = lag_head - n_before;