Merge pull request #435 from mkilgore/replace-const-element

Redo CONST evaluation and use the element string directly.

Author: mkilgore

source/global/constants.bas

@@ -60,3 +60,6 @@ CONST KEY_TAB = 9
 DIM SHARED CHR_QUOTE AS STRING: CHR_QUOTE = CHR$(34)
 DIM SHARED CHR_TAB AS STRING: CHR_TAB = CHR$(9)
 DIM SHARED CRLF AS STRING: CRLF = CHR$(13) + CHR$(10) 'carriage return+line feed
+
+DIM SHARED OS_BITS AS LONG
+OS_BITS = 64: IF INSTR(_OS$, "[32BIT]") THEN OS_BITS = 32

source/ide/ide_methods.bas

@@ -5461,8 +5461,9 @@ FUNCTION ide2 (ignore)
                     retval$ = ideinputbox$("Math Evaluator", "#Enter expression", mathEvalExpr$, "", 60, 0, 0)
                     result = 0
                     IF LEN(retval$) THEN
+                        Dim num As ParseNum
                         mathEvalExpr$ = retval$
-                        ev0$ = Evaluate_Expression$(retval$)
+                        ev0$ = Evaluate_Expression$(retval$, num)
                         ev$ = ev0$
                         mathEvalError%% = INSTR(ev$, "ERROR") > 0
                         IF mathEvalError%% = 0 AND mathEvalHEX%% THEN ev$ = "&H" + HEX$(VAL(ev$))