projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Had to get last call to multipass_split_output() inside
[pspp]
/
src
/
loop.c
diff --git
a/src/loop.c
b/src/loop.c
index b0c836bcc784fe832c19bc35306d3158fec258d2..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"
@@
-166,8
+166,6
@@
internal_cmd_loop (void)
/* Name of indexing variable if applicable. */
char name[9];
/* Name of indexing variable if applicable. */
char name[9];
- lex_match_id ("LOOP");
-
/* Create and initialize transformations to facilitate
error-handling. */
two = xmalloc (sizeof *two);
/* Create and initialize transformations to facilitate
error-handling. */
two = xmalloc (sizeof *two);
@@
-200,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;
@@
-209,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);
@@
-218,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;
}
@@
-231,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;
}
@@
-315,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;
}
@@
-418,7
+416,7
@@
loop_2_trns_proc (struct trns_header * trns, struct ccase * c,
if (two->flags == 0)
{
two->pass++;
if (two->flags == 0)
{
two->pass++;
- if (two->pass >
set_mxloops
)
+ if (two->pass >
get_mxloops()
)
return two->loop_term;
}
return two->loop_term;
}
@@
-502,8
+500,6
@@
cmd_break (void)
/* New transformation. */
struct break_trns *t;
/* New transformation. */
struct break_trns *t;
- lex_match_id ("BREAK");
-
for (loop = ctl_stack; loop; loop = loop->down)
if (loop->type == CST_LOOP)
break;
for (loop = ctl_stack; loop; loop = loop->down)
if (loop->type == CST_LOOP)
break;