projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the expression code a little nicer and fix bugs found
[pspp]
/
src
/
loop.c
diff --git
a/src/loop.c
b/src/loop.c
index 7f8aa87559cbfacc32029715426623aa45c988c0..b2685cfa201639c87eb86e86fc679902de174363 100644
(file)
--- a/
src/loop.c
+++ b/
src/loop.c
@@
-18,7
+18,7
@@
02111-1307, USA. */
#include <config.h>
02111-1307, USA. */
#include <config.h>
-#include
<assert.h>
+#include
"error.h"
#include "alloc.h"
#include "command.h"
#include "do-ifP.h"
#include "alloc.h"
#include "command.h"
#include "do-ifP.h"
@@
-198,7
+198,7
@@
internal_cmd_loop (void)
assert (token == '=');
lex_get ();
assert (token == '=');
lex_get ();
- one->init = expr_parse (
PXP
_NUMERIC);
+ one->init = expr_parse (
EXPR
_NUMERIC);
if (!one->init)
return 0;
if (!one->init)
return 0;
@@
-207,7
+207,7
@@
internal_cmd_loop (void)
expr_free (one->init);
return 0;
}
expr_free (one->init);
return 0;
}
- one->term = expr_parse (
PXP
_NUMERIC);
+ one->term = expr_parse (
EXPR
_NUMERIC);
if (!one->term)
{
expr_free (one->init);
if (!one->term)
{
expr_free (one->init);
@@
-216,7
+216,7
@@
internal_cmd_loop (void)
if (lex_match (T_BY))
{
if (lex_match (T_BY))
{
- one->incr = expr_parse (
PXP
_NUMERIC);
+ one->incr = expr_parse (
EXPR
_NUMERIC);
if (!one->incr)
return 0;
}
if (!one->incr)
return 0;
}
@@
-229,7
+229,7
@@
internal_cmd_loop (void)
{
two->flags |= LPC_COND;
{
two->flags |= LPC_COND;
- two->cond = expr_parse (
PXP
_BOOLEAN);
+ two->cond = expr_parse (
EXPR
_BOOLEAN);
if (!two->cond)
return 0;
}
if (!two->cond)
return 0;
}
@@
-313,7
+313,7
@@
internal_cmd_end_loop (void)
/* Parse the expression if any. */
if (lex_match_id ("IF"))
{
/* Parse the expression if any. */
if (lex_match_id ("IF"))
{
- thr->cond = expr_parse (
PXP
_BOOLEAN);
+ thr->cond = expr_parse (
EXPR
_BOOLEAN);
if (!thr->cond)
return 0;
}
if (!thr->cond)
return 0;
}