Bugfix: correctly compute labels for JR

Relative jumps (JR, DJNZ) were computer wrongly when being
using in a line with several instructions. Fixed.

The syntax is now extended, so a LABEL does not need to use colon, and
can also be declared in between instructions. So:

LOOP
  ...

is valid, but also:

ld a, 0 : LOOP : nop : jp LOOP

Author: boriel

asmlex.py

@@ -16,7 +16,7 @@
 from api.config import OPTIONS
 from api.errmsg import syntax_error
 
-_tokens = ('STRING', 'NEWLINE', 'LABEL', 'CO',
+_tokens = ('STRING', 'NEWLINE', 'CO',
            'ID', 'COMMA', 'PLUS', 'MINUS', 'LP', 'RP', 'LPP', 'RPP', 'MUL', 'DIV', 'POW', 'MOD',
            'UMINUS', 'APO', 'INTEGER', 'ADDR',
            'LSHIFT', 'RSHIFT', 'BAND', 'BOR', 'BXOR'
@@ -251,18 +251,8 @@ def t_INITIAL_preproc_INTEGER(self, t):
         return t
 
     def t_INITIAL_ID(self, t):
-        r'[._a-zA-Z][._a-zA-Z0-9]*([ \t]*[:])?'  # Any identifier
+        r'[._a-zA-Z][._a-zA-Z0-9]*'  # Any identifier
         tmp = t.value  # Saves original value
-        if tmp[-1] == ':':
-            c = self.find_column(t)
-            tmp = t.value = t.value[:-1].strip()  # remove the colon ':'
-
-            if not self.input_data[t.lexpos - c + 1: t.lexpos].strip() and tmp.lower() not in keywords:
-                t.type = 'LABEL'
-                t.value = tmp
-                return t
-
-            t.lexer.lexpos -= 1
 
         t.value = tmp.upper()  # Convert it to uppercase, since our internal tables uses uppercase
         id_ = tmp.lower()

asmparse.py

@@ -601,15 +601,11 @@ def p_program_endline2(p):
 def p_program(p):
     """ program : line
     """
-    if p[1] is not None:
-        [MEMORY.add_instruction(x) for x in p[1] if isinstance(x, Asm)]
 
 
 def p_program_line(p):
     """ program : program line
     """
-    if p[2] is not None:
-        [MEMORY.add_instruction(x) for x in p[2] if isinstance(x, Asm)]
 
 
 def p_def_label(p):
@@ -621,37 +617,41 @@ def p_def_label(p):
     MEMORY.declare_label(p[1], p.lineno(1), p[3])
 
 
-def p_line_label_asm(p):
-    """ line : LABEL asms NEWLINE
-    """
-    p[0] = p[2]
-    __DEBUG__("Declaring '%s%s' (value %04Xh) in %i" % (NAMESPACE, p[1], MEMORY.org, p.lineno(1)))
-    MEMORY.declare_label(p[1], p.lineno(1))
-
-
 def p_line_asm(p):
     """ line : asms NEWLINE
+             | asms CO NEWLINE
     """
-    p[0] = p[1]
 
 
 def p_asms_empty(p):
     """ asms :
     """
-    p[0] = []
+    p[0] = MEMORY.org
 
 
 def p_asms_asm(p):
     """ asms : asm
     """
-    p[0] = [p[1]]
+    p[0] = MEMORY.org
+    asm = p[1]
+    if isinstance(asm, Asm):
+        MEMORY.add_instruction(asm)
 
 
 def p_asms_asms_asm(p):
     """ asms : asms CO asm
     """
-    p[1].append(p[3])
     p[0] = p[1]
+    asm = p[3]
+    if isinstance(asm, Asm):
+        MEMORY.add_instruction(asm)
+
+
+def p_asm_label(p):
+    """ asm : ID
+    """
+    __DEBUG__("Declaring '%s%s' (value %04Xh) in %i" % (NAMESPACE, p[1], MEMORY.org, p.lineno(1)))
+    MEMORY.declare_label(p[1], p.lineno(1))
 
 
 def p_asm_ld8(p):

tests/functional/asmcolon3.asm

@@ -0,0 +1,10 @@
+
+    cp 3 : jr z,nextjump 
+    ld hl,data : jp overjump
+nextjump:
+    ld hl,0
+overjump:
+    ld a,(hl)
+
+data:
+

tests/functional/asmcolon3.bin

@@ -0,0 +1,2 @@
+ld a, 0 : LOOP : nop : jp LOOP
+