Merge pull request #393 from boriel/bugfix/bad_arrangement

Bugfix/bad arrangement

Author: boriel

api/optimize.py

@@ -21,6 +21,7 @@ class ToVisit(object):
     """ Used just to signal an object to be
     traversed.
     """
+
     def __init__(self, obj):
         self.obj = obj
 
@@ -155,7 +156,14 @@ def visit_FUNCTION(self, node):
     def visit_LET(self, node):
         if self.O_LEVEL > 1 and not node.children[0].accessed:
             warning_not_used(node.children[0].lineno, node.children[0].name)
-            yield symbols.BLOCK(*list(self.filter_inorder(node.children[1], lambda x: isinstance(x, symbols.CALL))))
+            block = symbols.BLOCK(*[
+                symbols.CALL(x.entry, x.args, x.lineno) for x in self.filter_inorder(
+                    node.children[1],
+                    lambda x: isinstance(x, symbols.FUNCCALL),
+                    lambda x: not isinstance(x, symbols.FUNCTION)
+                )
+            ])
+            yield block
         else:
             yield (yield self.generic_visit(node))
 

ast_/ast.py

@@ -54,8 +54,12 @@ def _visit(self, node):
     def generic_visit(node: Ast):
         raise RuntimeError("No {}() method defined".format('visit_' + node.token))
 
-    def filter_inorder(self, node, filter_func: Callable[[Any], bool]):
-        """ Visit the tree inorder, but only those that return true for filter
+    def filter_inorder(self,
+                       node,
+                       filter_func: Callable[[Any], bool],
+                       child_selector: Callable[[Ast], bool] = lambda x: True):
+        """ Visit the tree inorder, but only those that return true for filter_func and visiting children which
+        return true for child_selector.
         """
         visited = set()
         stack = [node]
@@ -66,5 +70,5 @@ def filter_inorder(self, node, filter_func: Callable[[Any], bool]):
             visited.add(node)
             if filter_func(node):
                 yield self.visit(node)
-            elif isinstance(node, Ast):
+            if isinstance(node, Ast) and child_selector(node):
                 stack.extend(node.children[::-1])

symbols/call.py

@@ -9,6 +9,8 @@
 #                    the GNU General License
 # ----------------------------------------------------------------------
 
+from typing import Iterable
+
 import api.global_ as gl
 from api.check import check_call_arguments
 from api.constants import CLASS
@@ -33,7 +35,7 @@ class SymbolCALL(Symbol):
         lineno: source code line where this call was made
     """
 
-    def __init__(self, entry: SymbolFUNCTION, arglist, lineno):
+    def __init__(self, entry: SymbolFUNCTION, arglist: Iterable[SymbolARGUMENT], lineno: int):
         super(SymbolCALL, self).__init__()
         assert isinstance(lineno, int)
         assert all(isinstance(x, SymbolARGUMENT) for x in arglist)

tests/functional/opt2_recurse_filter2.asm

@@ -0,0 +1,81 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+	jp __MAIN_PROGRAM__
+ZXBASIC_USER_DATA:
+	; Defines USER DATA Length in bytes
+ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
+	.__LABEL__.ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_LEN
+	.__LABEL__.ZXBASIC_USER_DATA EQU ZXBASIC_USER_DATA
+ZXBASIC_USER_DATA_END:
+__MAIN_PROGRAM__:
+	ld hl, 0
+	ld b, h
+	ld c, l
+__END_PROGRAM:
+	di
+	ld hl, (__CALL_BACK__)
+	ld sp, hl
+	exx
+	pop hl
+	pop iy
+	pop ix
+	exx
+	ei
+	ret
+__CALL_BACK__:
+	DEFW 0
+	ld hl, 0
+	ld b, h
+	ld c, l
+	jp __END_PROGRAM
+_MultiKeys:
+	push ix
+	ld ix, 0
+	add ix, sp
+	ld a, (ix+5)
+_MultiKeys__leave:
+	ld sp, ix
+	pop ix
+	exx
+	pop hl
+	ex (sp), hl
+	exx
+	ret
+_mainRoom:
+	xor a
+	push af
+	call _MultiKeys
+	or a
+	jp z, __LABEL1
+	ld a, 1
+	ld (0), a
+__LABEL1:
+	ld a, 1
+	push af
+	call _MultiKeys
+	or a
+	jp z, __LABEL3
+	xor a
+	ld (1), a
+__LABEL3:
+	ld a, 2
+	push af
+	call _MultiKeys
+	or a
+	jp z, __LABEL5
+	xor a
+	ld (2), a
+__LABEL5:
+_mainRoom__leave:
+	ret
+	END

tests/functional/opt2_recurse_filter2.bas

@@ -0,0 +1,25 @@
+
+function MultiKeys(x as Ubyte) as Ubyte
+    return x
+end function
+
+
+sub fastcall mainRoom()
+	IF MultiKeys(0) then
+		poke 0,1
+	end if
+
+	IF MultiKeys(1) then
+		poke 1,0
+	end if
+
+	if MultiKeys(2) then
+		poke 2,0
+	end if
+
+end sub
+
+end
+
+DIM dummy as Uinteger
+dummy=@mainRoom

tests/functional/opt2_unused_var.asm

@@ -63,17 +63,11 @@ _Check:
 	ld a, 5
 	push af
 	call _TestPrint
-	push bc
-	push de
-	push af
 	ld a, 11
 	push af
 	ld a, 6
 	push af
 	call _TestPrint
-	push bc
-	push de
-	push af
 _Check__leave:
 	ld sp, ix
 	pop ix
@@ -84,5 +78,5 @@ __PAUSE:
 		ld b, h
 	    ld c, l
 	    jp 1F3Dh  ; PAUSE_1
-#line 62 "opt2_unused_var.bas"
+#line 56 "opt2_unused_var.bas"
 	END

tests/functional/recurse_filter.asm

@@ -0,0 +1,65 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+	jp __MAIN_PROGRAM__
+ZXBASIC_USER_DATA:
+	; Defines USER DATA Length in bytes
+ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
+	.__LABEL__.ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_LEN
+	.__LABEL__.ZXBASIC_USER_DATA EQU ZXBASIC_USER_DATA
+_a:
+	DEFB 00
+ZXBASIC_USER_DATA_END:
+__MAIN_PROGRAM__:
+	xor a
+	push af
+	call _test
+	ld (_a), a
+	ld hl, 0
+	ld b, h
+	ld c, l
+__END_PROGRAM:
+	di
+	ld hl, (__CALL_BACK__)
+	ld sp, hl
+	exx
+	pop hl
+	exx
+	pop iy
+	pop ix
+	ei
+	ret
+__CALL_BACK__:
+	DEFW 0
+_test:
+	push ix
+	ld ix, 0
+	add ix, sp
+	ld a, (ix+5)
+	push af
+	ld h, 10
+	pop af
+	cp h
+	jp nc, __LABEL1
+	ld a, (ix+5)
+	jp _test__leave
+__LABEL1:
+	ld a, (ix+5)
+_test__leave:
+	ld sp, ix
+	pop ix
+	exx
+	pop hl
+	ex (sp), hl
+	exx
+	ret
+	END

tests/functional/recurse_filter.bas

@@ -0,0 +1,10 @@
+DIM a as UByte
+FUNCTION test(a as UByte) as UByte
+  IF a < 10 THEN
+     RETURN a
+  END IF
+  RETURN a
+END FUNCTION
+
+LET a = test(0)
+