Fix let local array const index

Author: boriel

src/arch/zx48k/backend/__init__.py

@@ -794,7 +794,7 @@ def _store8(ins):
     if immediate:
         op = op[1:]
 
-    if is_int(op) or op[0] == '_':
+    if is_int(op) or op[0] in '_.':
         if is_int(op):
             op = str(int(op) & 0xFFFF)
 
@@ -837,9 +837,10 @@ def _store16(ins):
     """
     output = _16bit_oper(ins.quad[2])
 
+    value = ins.quad[1]
+    indirect = False
+
     try:
-        value = ins.quad[1]
-        indirect = False
         if value[0] == '*':
             indirect = True
             value = value[1:]
@@ -854,7 +855,7 @@ def _store16(ins):
         else:
             output.append('ld (%s), hl' % str(value))
     except ValueError:
-        if value[0] == '_':
+        if value[0] in '_.':
             if indirect:
                 output.append('ex de, hl')
                 output.append('ld hl, (%s)' % str(value))
@@ -905,7 +906,7 @@ def _store32(ins):
     if immediate:
         op = op[1:]
 
-    if is_int(op) or op[0] == '_' or immediate:
+    if is_int(op) or op[0] in '_.' or immediate:
         output = _32bit_oper(ins.quad[2], preserveHL=indirect)
 
         if is_int(op):
@@ -963,7 +964,7 @@ def _storef(ins):
     if immediate:
         op = op[1:]
 
-    if is_int(op) or op[0] == '_':
+    if is_int(op) or op[0] in '_.':
         if is_int(op):
             op = str(int(op) & 0xFFFF)
 

src/arch/zx48k/backend/__parray.py

@@ -168,7 +168,7 @@ def _pastore16(ins):
         indirect = False
 
     try:
-        value = int(ins.quad[2]) & 0xFFFF
+        value = int(value) & 0xFFFF
         output.append('ld de, %i' % value)
         if indirect:
             output.append(runtime_call(RuntimeLabel.LOAD_DE_DE))

src/arch/zx48k/translator.py

@@ -282,11 +282,11 @@ def visit_LETARRAY(self, node):
         if self.O_LEVEL > 1 and not node.children[0].entry.accessed:
             return
 
-        yield node.children[1]  # Right expression
         arr = node.children[0]  # Array access
         scope = arr.scope
 
         if arr.offset is None:
+            yield node.children[1]  # Right expression
             yield arr
 
             if scope == SCOPE.global_:
@@ -299,14 +299,17 @@ def visit_LETARRAY(self, node):
         else:
             name = arr.entry.data_label
             if scope == SCOPE.global_:
+                yield node.children[1]  # Right expression
                 self.ic_store(arr.type_, '%s + %i' % (name, arr.offset), node.children[1].t)
             elif scope == SCOPE.local:
                 t1 = optemps.new_t()
                 t2 = optemps.new_t()
                 self.ic_pload(gl.PTR_TYPE, t1, -(arr.entry.offset - self.TYPE(gl.PTR_TYPE).size))
                 self.ic_add(gl.PTR_TYPE, t2, t1, arr.offset)
+                yield node.children[1]  # Right expression
+
                 if arr.type_ == Type.string:
-                    self.ic_store(arr.type_, '*{}'.format(t2), node.children[1].t)
+                    self.ic_store(arr.type_, f'*{t2}', node.children[1].t)
                 else:
                     self.ic_store(arr.type_, t2, node.children[1].t)
             else: