Merged in bugfix/asm_org_label (pull request #186)

Fix error on multiple ORG

Approved-by: Jose Rodriguez <boriel@gmail.com>

Author: boriel

asmparse.py

@@ -525,7 +525,6 @@ def declare_label(self, label, lineno, value=None, local=False, namespace=None):
             self.local_labels[-1][ex_label] = Label(ex_label, lineno, value, local, namespace, is_address)
 
         self.set_memory_slot()
-        self.memory_bytes[self.org] += ('%s:' % ex_label,)
 
         return self.local_labels[-1][ex_label]
 

tests/functional/orgasm.asm

@@ -0,0 +1,15 @@
+	org 32768
+__START_PROGRAM:
+	di
+	exx
+	ld hl, 0
+
+    ;org 32768
+    halt
+    halt
+
+__END_PROGRAM:
+__END_PERA:
+    nop
+__ENDPINA:
+	END