Merge pull request #348 from boriel/bugfix/data_label

Bugfix/data label

Author: boriel

api/global_.py

@@ -146,6 +146,7 @@
 # DATA blocks
 # ----------------------------------------------------------------------
 DATAS = []
+DATA_LABELS_REQUIRED = set()  # DATA labels used by RESTORE that must be emitted
 DATA_LABELS = {}  # Maps declared labels to current data ptr
 DATA_PTR_CURRENT = None
 DATA_IS_USED = False

api/utils.py

@@ -3,6 +3,7 @@
 
 import os
 import shelve
+from typing import NamedTuple, List, Any
 
 from . import constants
 from . import global_
@@ -21,6 +22,11 @@
 SHELVE = shelve.open(SHELVE_PATH)
 
 
+class DataRef(NamedTuple):
+    label: str
+    datas: List[Any]
+
+
 def read_txt_file(fname):
     """Reads a txt file, regardless of its encoding
     """

arch/zx48k/translator.py

@@ -424,6 +424,7 @@ 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]
+        gl.DATA_LABELS_REQUIRED.add(lbl)
         self.ic_fparam(node.args[0].type_, '#' + lbl)
         self.ic_call('__RESTORE', 0)
         backend.REQUIRES.add('read_restore.asm')

arch/zx48k/translatorvisitor.py

@@ -141,6 +141,10 @@ def emit_data_blocks(self):
 
         if not gl.DATAS:  # The above loop was not executed, because there's no data
             self.ic_label('__DATA__0')
+        else:
+            missing_data_labels = set(gl.DATA_LABELS_REQUIRED).difference([x.label.name for x in gl.DATAS])
+            for data_label in missing_data_labels:
+                self.ic_label(data_label)  # A label reference by a RESTORE beyond the last DATA line
 
         self.ic_vard('__DATA__END', ['00'])