Got rid of "struct long_vec", envector(), devector(), etc.

[pspp-builds.git] / src / loop.c

diff --git a/src/loop.c b/src/loop.c
index b7dac89557d66109e32254edf0c8077522b6088b..424e5aabaf6aba050e536cadc7472b067924e2d7 100644 (file)
--- a/src/loop.c
+++ b/src/loop.c
@@ -30,8 +30,6 @@
 #include "str.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* *INDENT-OFF* */
@@ -194,7 +192,7 @@ internal_cmd_loop (void)
   /* Parse indexing clause. */
   if (token == T_ID && lex_look_ahead () == '=')
     {
-      struct variable *v = find_variable (tokid);
+      struct variable *v = dict_lookup_var (default_dict, tokid);
 
       two->flags |= LPC_INDEX;
 
@@ -254,14 +252,9 @@ internal_cmd_loop (void)
   /* Find variable; create if necessary. */
   if (name[0])
     {
-      two->index = find_variable (name);
+      two->index = dict_lookup_var (default_dict, name);
       if (!two->index)
-       {
-         two->index = force_create_variable (&default_dict, name, NUMERIC, 0);
-#if DEBUGGING
-         envector (two->index);
-#endif
-       }
+        two->index = dict_create_var (default_dict, name, 0);
     }
   
   /* Push on control stack. */
@@ -540,7 +533,7 @@ cmd_break (void)
 }
 
 static int
-break_trns_proc (struct trns_header * trns, struct ccase * c unused)
+break_trns_proc (struct trns_header * trns, struct ccase * c UNUSED)
 {
   return ((struct break_trns *) trns)->loop_term;
 }