summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorschnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac>2005-07-16 12:22:05 +0000
committerschnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac>2005-07-16 12:22:05 +0000
commit3926cda5c1e76d707b1e8bdcf2818e12646f7904 (patch)
tree7933a0fb0c2e4bf5e5bcdc7f807c8273a99b4942 /src/util
parent88b939f83794b1de2e68478724cdf28f23691bdb (diff)
Remove spurious (but harmless) break statement from PUSHTOK macro.
Make RESIZE_STACK macro semicolon-safe. git-svn-id: http://svn.cactuscode.org/flesh/trunk@4090 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src/util')
-rw-r--r--src/util/Expression.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/util/Expression.c b/src/util/Expression.c
index a9728878..19573d63 100644
--- a/src/util/Expression.c
+++ b/src/util/Expression.c
@@ -615,22 +615,24 @@ static pToken *Tokenise(const char *expression)
@@*/
#define RESIZE_STACK(stack) \
+{ \
(stack)->ntokens++; \
(stack)->tokens = (uExpressionToken *)realloc((stack)->tokens, \
(stack)->ntokens*sizeof(uExpressionToken));\
+} while(0)
#define PUSHOP(stack, xtype, value) do \
{ \
- RESIZE_STACK(stack) \
+ RESIZE_STACK(stack); \
(stack)->tokens[(stack)->ntokens-1].type = xtype; \
(stack)->tokens[(stack)->ntokens-1].token.opcode = value; \
} while(0)
#define PUSHTOK(stack, xtype, value) do \
{ \
- RESIZE_STACK(stack) \
+ RESIZE_STACK(stack); \
(stack)->tokens[(stack)->ntokens-1].type = xtype; \
- (stack)->tokens[(stack)->ntokens-1].token.varnum = value; break; \
+ (stack)->tokens[(stack)->ntokens-1].token.varnum = value; \
} while(0)
static int RPParse(pToken **current, uExpressionInternals *buffer)