Merge pull request #205 from boriel/feature/ensure_sort_opts

Feature/ensure sort opts

Author: boriel

arch/zx48k/backend/__init__.py

@@ -2179,7 +2179,7 @@ def convertToBool():
     return result
 
 
-def emit_end(MEMORY=None):
+def emit_end():
     """ This special ending autoinitializes required inits
     (mainly alloc.asm) and changes the MEMORY initial address if it is
     ORG XXXX to ORG XXXX + heap size

arch/zx48k/peephole/engine.py

@@ -84,7 +84,8 @@ def read_opts(folder_path, result=None):
 
         result.append(pattern_)
 
-    return sorted(result, key=lambda x: x.flag)
+    result[:] = sorted(result, key=lambda x: x.flag)
+    return result
 
 
 def apply_match(asm_list, patterns_list, index=0):

zxb.py

@@ -328,7 +328,7 @@ def main(args=None):
     tmp = [x for x in backend.emit(backend.MEMORY, optimize=False) if x.strip()[0] != '#']
     asm_output += tmp
     asm_output = backend.emit_start() + asm_output
-    asm_output += backend.emit_end(asm_output)
+    asm_output += backend.emit_end()
 
     if options.asm:  # Only output assembler file
         with open_file(OPTIONS.outputFileName.value, 'wt', 'utf-8') as output_file: