Merge pull request #302 from boriel/bugfix/array_check_warning

Fix static array boundary check not always emitted

Author: boriel

symbols/arrayaccess.py

@@ -119,14 +119,16 @@ def make_node(cls, id_, arglist, lineno):
             btype = gl.SYMBOL_TABLE.basic_types[gl.BOUND_TYPE]
             for i, b in zip(arglist, variable.bounds):
                 lower_bound = NUMBER(b.lower, type_=btype, lineno=lineno)
+
+                if is_number(i.value) or is_const(i.value):
+                    val = i.value.value
+                    if val < b.lower or val > b.upper:
+                        warning(lineno, "Array '%s' subscript out of range" % id_)
+
                 i.value = BINARY.make_node('MINUS',
                                            TYPECAST.make_node(btype, i.value, lineno),
                                            lower_bound, lineno, func=lambda x, y: x - y,
                                            type_=btype)
-                if is_number(i.value) or is_const(i.value):
-                    val = i.value.value
-                    if val < 0 or val > b.count:
-                        warning(lineno, "Array '%s' subscript out of range" % id_)
         else:
             btype = gl.SYMBOL_TABLE.basic_types[gl.BOUND_TYPE]
             for arg in arglist:

tests/functional/array_check_warn.asm

@@ -0,0 +1,64 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+	ld a, (_aux.__DATA__ + 4)
+	ld (_c), a
+	ld a, (_aux1.__DATA__ + -1)
+	ld (_c), a
+	ld (0), a
+	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
+ZXBASIC_USER_DATA:
+_c:
+	DEFB 00
+_aux:
+	DEFW __LABEL0
+_aux.__DATA__.__PTR__:
+	DEFW _aux.__DATA__
+_aux.__DATA__:
+	DEFB 00h
+	DEFB 00h
+	DEFB 00h
+	DEFB 00h
+__LABEL0:
+	DEFW 0000h
+	DEFB 01h
+_aux1:
+	DEFW __LABEL1
+_aux1.__DATA__.__PTR__:
+	DEFW _aux1.__DATA__
+_aux1.__DATA__:
+	DEFB 00h
+	DEFB 00h
+	DEFB 00h
+__LABEL1:
+	DEFW 0000h
+	DEFB 01h
+; Defines DATA END --> HEAP size is 0
+ZXBASIC_USER_DATA_END:
+	; Defines USER DATA Length in bytes
+ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
+	END

tests/functional/array_check_warn.bas

@@ -0,0 +1,8 @@
+dim c as Ubyte
+dim aux (0 TO 3) as ubyte
+let c = aux(4)
+
+dim aux1(1 TO 3) as ubyte
+let c = aux1(0)
+poke 0, c ' Use c to avoid warning
+

tests/functional/test_errmsg.txt

@@ -145,4 +145,6 @@ array_err.bas:2: Mismatched vector size. Expected 11 elements, got 1.
 pararray2.bas:8: Array q type does not match parameter type
 >>> process_file('pararray4.bas')
 pararray4.bas:8: Array q type does not match parameter type
-
+>>> process_file('array_check_warn.bas')
+array_check_warn.bas:3: warning: Array 'aux' subscript out of range
+array_check_warn.bas:6: warning: Array 'aux1' subscript out of range