From: johanknol <johanknol@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Mon, 24 Dec 2001 10:16:33 +0000 (+0000)
Subject: disabled constExprTree the proper way
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=1ac0e8aa6d4988e4f762d4ce0d7d6ed13d719afd;p=fw%2Fsdcc

disabled constExprTree the proper way


git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@1735 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/src/SDCCglue.c b/src/SDCCglue.c
index 7f8f3d70..b1c6751e 100644
--- a/src/SDCCglue.c
+++ b/src/SDCCglue.c
@@ -260,22 +260,28 @@ emitRegularMap (memmap * map, bool addPublics, bool arFlag)
 	  }
 	  codeOutFile = statsg->oFile;
 
+#if 1
+	  if (ival) {
+	    // set ival's lineno to where the symbol was defined
+	    lineno=ival->lineno=sym->lineDef;
+	    allocInfo = 0;
+	    eBBlockFromiCode (iCodeFromAst (ival));
+	    allocInfo = 1;
+	  }
+#else
 	  if (ival) {
 	    // set ival's lineno to where the symbol was defined
 	    lineno=ival->lineno=sym->lineDef;
-#if 0	    
 	    // check if this is a constant expression
 	    if (constExprTree(ival->right)) {
 	      allocInfo = 0;
-#endif
 	      eBBlockFromiCode (iCodeFromAst (ival));
 	      allocInfo = 1;
-#if 0
 	    } else {
 	      werror (E_CONST_EXPECTED, "found expression");
 	    }
-#endif
 	  }
+#endif
 	}	  
 
 	/* if the ival is a symbol assigned to an aggregate,