Merge pull request #456 from boriel/bugfix/regression_with_is_const

Bugfix/regression with is const

Author: boriel

src/api/check.py

@@ -268,7 +268,7 @@ def is_number(*p):
     containing NUMBER or numeric CONSTANTS
     """
     try:
-        return all(i.token == 'NUMBER' or is_const(i) for i in p)
+        return all(i.token == 'NUMBER' or (i.token == 'ID' and i.class_ == CLASS.const) for i in p)
     except Exception:
         pass
 

tests/functional/for_const_crash.asm

@@ -0,0 +1,56 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+	jp __MAIN_PROGRAM__
+ZXBASIC_USER_DATA:
+	; Defines USER DATA Length in bytes
+ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
+	.__LABEL__.ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_LEN
+	.__LABEL__.ZXBASIC_USER_DATA EQU ZXBASIC_USER_DATA
+_dw1:
+	DEFB 00, 00
+ZXBASIC_USER_DATA_END:
+__MAIN_PROGRAM__:
+	ld hl, 8192
+	ld (_dw1), hl
+	jp __LABEL0
+__LABEL3:
+__LABEL4:
+	ld hl, (_dw1)
+	ld de, 32
+	add hl, de
+	ld (_dw1), hl
+__LABEL0:
+	ld hl, 8255
+	ld de, (_dw1)
+	or a
+	sbc hl, de
+	jp nc, __LABEL3
+__LABEL2:
+	ld hl, 0
+	ld b, h
+	ld c, l
+__END_PROGRAM:
+	di
+	ld hl, (__CALL_BACK__)
+	ld sp, hl
+	exx
+	pop hl
+	exx
+	pop iy
+	pop ix
+	ei
+	ret
+__CALL_BACK__:
+	DEFW 0
+	;; --- end of user code ---
+	END

tests/functional/for_const_crash.bas

@@ -0,0 +1,8 @@
+
+const tablaSprites as Uinteger=8192
+
+
+DIM dw1 as Uinteger
+for dw1=tablaSprites to tablaSprites+63 step 32
+next
+