Oops - revert change that shouldn't have been applied.

[pspp] / src / compute.c

diff --git a/src/compute.c b/src/compute.c
index e299bd67f52f32100cc741cbfafdbb04c67e23cd..aed443853d9a0d65800be651c7ebc80e2d368630 100644 (file)
--- a/src/compute.c
+++ b/src/compute.c
@@ -21,12 +21,11 @@
 #include <assert.h>
 #include <stdlib.h>
 #include "alloc.h"
-#include "approx.h"
-#include "cases.h"
 #include "command.h"
 #include "error.h"
 #include "expr.h"
 #include "lexer.h"
+#include "misc.h"
 #include "str.h"
 #include "var.h"
 
@@ -398,21 +397,17 @@ lvalue_finalize (struct lvalue *lvalue,
     {
       compute->variable = dict_lookup_var (default_dict, lvalue->var_name);
       if (compute->variable == NULL)
-        compute->variable = dict_create_var (default_dict, lvalue->var_name,
-                                             0);
-      assert (compute->variable != NULL);
+         compute->variable = dict_create_var_assert (default_dict,
+                                                     lvalue->var_name, 0);
 
       compute->fv = compute->variable->fv;
       compute->width = compute->variable->width;
 
+      
+
       /* Goofy behavior, but compatible: Turn off LEAVE. */
-      if (compute->variable->left
-          && dict_class_from_id (compute->variable->name) != DC_SCRATCH)
-        {
-          devector (compute->variable);
-          compute->variable->left = 0;
-          envector (compute->variable);
-        }
+      if (dict_class_from_id (compute->variable->name) != DC_SCRATCH)
+        compute->variable->reinit = 1;
     }
   else 
     {