Merge pull request #377 from boriel/bugfix/dim_at_const

Fix bug with DIM at @Label

Author: boriel

arch/zx48k/translator.py

@@ -1072,7 +1072,8 @@ def visit_VARDECL(self, node):
                 return
 
         if entry.addr is not None:
-            self.ic_deflabel(entry.mangled, entry.addr)
+            addr = self.traverse_const(entry.addr) if isinstance(entry.addr, symbols.SYMBOL) else entry.addr
+            self.ic_deflabel(entry.mangled, addr)
             for entry in entry.aliased_by:
                 self.ic_deflabel(entry.mangled, entry.addr)
         elif entry.alias is None:

libzxbc/zxbparser.py

@@ -672,7 +672,7 @@ def p_var_decl_at(p):
     if p[5].token == 'CONST':
         tmp = p[5].expr
         if tmp.token == 'UNARY' and tmp.operator == 'ADDRESS':  # Must be an ID
-            if tmp.operand.token == 'VAR':
+            if tmp.operand.token in ('VAR', 'LABEL'):
                 entry.make_alias(tmp.operand)
             elif tmp.operand.token == 'ARRAYACCESS':
                 if tmp.operand.offset is None:
@@ -684,6 +684,8 @@ def p_var_decl_at(p):
             else:
                 error(p.lineno(4), 'Only address of identifiers are allowed')
                 return
+        else:
+            entry.addr = tmp
 
     elif not is_number(p[5]):
         api.errmsg.syntax_error_address_must_be_constant(p.lineno(4))

tests/functional/dim_at_label0.asm

@@ -0,0 +1,36 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+__LABEL__somelabel:
+_x:
+	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:
+; 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/dim_at_label0.bas

@@ -0,0 +1,5 @@
+
+
+somelabel:
+
+DIM x as UInteger at @somelabel

tests/functional/dim_at_label1.asm

@@ -0,0 +1,36 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+__LABEL__somelabel:
+	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:
+	_x EQU (__LABEL__somelabel) + (1)
+; 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/dim_at_label1.bas

@@ -0,0 +1,6 @@
+
+
+somelabel:
+
+DIM x as UInteger at @somelabel + 1
+

tests/functional/dim_at_label2.asm

@@ -0,0 +1,36 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+__LABEL__somelabel:
+	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:
+	_x EQU (__LABEL__somelabel) + (1)
+; 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/dim_at_label2.bas

@@ -0,0 +1,8 @@
+
+
+
+
+DIM x as UInteger at @somelabel + 1
+
+somelabel:
+

tests/functional/dim_at_label3.asm

@@ -0,0 +1,36 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+__LABEL__somelabel:
+_x:
+	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:
+; 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/dim_at_label3.bas

@@ -0,0 +1,8 @@
+
+
+
+
+DIM x as UInteger at @somelabel
+
+somelabel:
+