From 65c29cafa08337467007001738446ceb1b3c43ce Mon Sep 17 00:00:00 2001
From: Arkshine <hv.contact@gmail.com>
Date: Fri, 15 Aug 2014 18:40:07 +0200
Subject: [PATCH] Compiler: Fix #elseif handling not working as expected.
Improted from Pawn 3.1.3636.
-- Example
#define VAR 1
#if VAR == 1
// code
#elseif VAR == 2
// code
#endif
--
Returns error(38).
---
compiler/libpc300/sc2.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/compiler/libpc300/sc2.c b/compiler/libpc300/sc2.c
index 283a25f1..a5bf8039 100755
--- a/compiler/libpc300/sc2.c
+++ b/compiler/libpc300/sc2.c
@@ -911,11 +911,27 @@ static int command(void)
if ((ifstack[iflevel-1] & PARSEMODE)==PARSEMODE) {
/* there has been a parse mode already on this level, so skip the rest */
ifstack[iflevel-1] |= (char)SKIPMODE;
+ /* if we were already skipping this section, allow expressions with
+ * undefined symbols; otherwise check the expression to catch errors
+ */
+ if (tok==tpELSEIF) {
+ if (skiplevel==iflevel)
+ preproc_expr(&val,NULL); /* get, but ignore the expression */
+ else
+ lptr=strchr(lptr,'\0');
+ } /* if */
} else {
/* previous conditions were all FALSE */
if (tok==tpELSEIF) {
- /* get new expression */
- preproc_expr(&val,NULL); /* get value (or 0 on error) */
+ /* if we were already skipping this section, allow expressions with
+ * undefined symbols; otherwise check the expression to catch errors
+ */
+ if (skiplevel==iflevel) {
+ preproc_expr(&val,NULL); /* get value (or 0 on error) */
+ } else {
+ lptr=strchr(lptr,'\0');
+ val=0;
+ } /* if */
ifstack[iflevel-1]=(char)(val ? PARSEMODE : SKIPMODE);
} else {
/* a simple #else, clear skip mode */