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 7f8f3d70a4d0ad1581b794b374db04df8af23c30..b1c6751ee96f59f1dedaf2f7de917ac396062b5a 100644 (file)
--- 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,