Merge pull request #502 from boriel/bugfix/RESTORE_with_no_label

Fix bug in RESTORE with no label

Author: boriel

src/api/errmsg.py

@@ -295,4 +295,11 @@ def syntax_error_address_must_be_constant(lineno: int):
 def syntax_error_cannot_pass_array_by_value(lineno: int, id_: str):
     error(lineno, "Array parameter '%s' must be passed ByRef" % id_)
 
+
+# ----------------------------------------
+#  Cannot pass an array by value
+# ----------------------------------------
+def syntax_error_no_data_defined(lineno: int):
+    error(lineno, "No DATA defined")
+
 # endregion

src/api/utils.py

@@ -41,7 +41,7 @@
 
 
 class DataRef(NamedTuple):
-    label: str
+    label: symbols.LABEL
     datas: List[Any]
 
 

src/arch/zx48k/translator.py

@@ -431,9 +431,20 @@ def visit_FUNCCALL(self, node):
     def visit_RESTORE(self, node):
         if not gl.DATA_IS_USED:
             return  # If no READ is used, ignore all DATA related statements
-        lbl = gl.DATA_LABELS[node.args[0].name]
+
+        if not node.args:  # No label?
+            if not gl.DATAS:
+                src.api.errmsg.syntax_error_no_data_defined(node.lineno)
+                return
+
+            lbl = gl.DATAS[0].label.name
+            type_ = gl.PTR_TYPE
+        else:
+            lbl = gl.DATA_LABELS[node.args[0].name]
+            type_ = node.args[0].type_
+
         gl.DATA_LABELS_REQUIRED.add(lbl)
-        self.ic_fparam(node.args[0].type_, '#' + lbl)
+        self.ic_fparam(type_, '#' + lbl)
         self.runtime_call(RuntimeLabel.RESTORE, 0)
 
     def visit_READ(self, node):

src/zxbc/zxbparser.py

@@ -1736,11 +1736,10 @@ def p_restore(p):
                   | RESTORE NUMBER
     """
     if len(p) == 2:
-        id_ = '__DATA__{0}'.format(len(gl.DATAS))
+        lbl = None
     else:
-        id_ = p[2]
+        lbl = check_and_make_label(p[2], p.lineno(1))
 
-    lbl = check_and_make_label(id_, p.lineno(1))
     p[0] = make_sentence(p.lineno(1), 'RESTORE', lbl)
 
 

tests/functional/restore0.asm

@@ -0,0 +1,38 @@
+	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__
+__CALL_BACK__:
+	DEFW 0
+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
+ZXBASIC_USER_DATA_END:
+__MAIN_PROGRAM__:
+	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
+	;; --- end of user code ---
+	END

tests/functional/restore0.bas

@@ -0,0 +1,3 @@
+REM should be ignored since there's no READ sentence
+restore
+

tests/functional/restore2.asm

@@ -0,0 +1,38 @@
+	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__
+__CALL_BACK__:
+	DEFW 0
+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
+ZXBASIC_USER_DATA_END:
+__MAIN_PROGRAM__:
+	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
+	;; --- end of user code ---
+	END

tests/functional/restore2.bas

@@ -0,0 +1,4 @@
+REM should be ignored since there's no READ sentence
+DATA 10
+
+restore