Improve error message for creating a new string var with COMPUTE or IF.

[pspp] / src / language / control / loop.c

diff --git a/src/language/control/loop.c b/src/language/control/loop.c
index 10d57105ccc8189d582be05dd501e04ae60a4a38..765d21314793e0165e235ec7c9ae3a0917a6048f 100644 (file)
--- a/src/language/control/loop.c
+++ b/src/language/control/loop.c
@@ -177,10 +177,7 @@ close_loop (void *loop_)
 
   /* If there's nothing else limiting the number of loops, use
      MXLOOPS as a limit. */
-  if (loop->max_pass_count == -1
-      && loop->index_var == NULL
-      && loop->loop_condition == NULL
-      && loop->end_loop_condition == NULL)
+  if (loop->max_pass_count == -1 && loop->index_var == NULL)
     loop->max_pass_count = settings_get_mxloops ();
 }
 
@@ -197,7 +194,7 @@ parse_if_clause (struct lexer *lexer,
       return false;
     }
 
-  *condition = expr_parse_pool (lexer, loop->pool, loop->ds, EXPR_BOOLEAN);
+  *condition = expr_parse_bool (lexer, loop->pool, loop->ds);
   return *condition != NULL;
 }
 
@@ -235,8 +232,7 @@ parse_index_clause (struct dataset *ds, struct lexer *lexer,
   if (!lex_force_match (lexer, T_EQUALS))
     return false;
 
-  loop->first_expr = expr_parse_pool (lexer, loop->pool,
-                                     loop->ds, EXPR_NUMBER);
+  loop->first_expr = expr_parse (lexer, loop->pool, loop->ds, VAL_NUMERIC);
   if (loop->first_expr == NULL)
     return false;
 
@@ -255,7 +251,7 @@ parse_index_clause (struct dataset *ds, struct lexer *lexer,
           lex_sbc_only_once (e == &loop->last_expr ? "TO" : "BY");
           return false;
         }
-      *e = expr_parse_pool (lexer, loop->pool, loop->ds, EXPR_NUMBER);
+      *e = expr_parse (lexer, loop->pool, loop->ds, VAL_NUMERIC);
       if (*e == NULL)
         return false;
     }