Merge branch 'master' of github.com:taddeus/peephole

src/statement.py

@@ -21,6 +21,9 @@ class Statement:
         arguments."""
         return self.stype == other.stype and self.name == other.name \
                and self.args == other.args
+               
+    def __len__(self):
+        return len(self.args)
 
     def __str__(self):  # pragma: nocover
         return '<Statement type=%s name=%s args=%s>' \
@@ -115,8 +118,10 @@ class Block:
         """Replace the given range start-(start + count) with the given
         statement list, and move the pointer to the first statement after the
         replacement."""
+        if self.pointer == 0:
+            raise Exception('No statement have been read yet.')
         if start == None:
-            start = self.pointer
+            start = self.pointer - 1
 
         before = self.statements[:start]
         after = self.statements[start + count:]

tests/test_optimize.py

@@ -9,5 +9,48 @@ class TestOptimize(unittest.TestCase):
     def setUp(self):
         pass
 
-    def test_(self):
-        pass
+    def test_optimize_global_movaa(self):
+        foo = S('command', 'foo')
+        bar = S('command', 'bar')
+        block = B([foo,
+                   S('command', 'move', '$regA', '$regA'),
+                   bar])
+        optimize_global(block)
+        self.assertEquals(block.statements, [foo, bar])
+        
+    def test_optimize_global_movab(self):
+        foo = S('command', 'foo')
+        move = S('command', 'move', '$regA', '$regB')
+        bar = S('command', 'bar')
+        block = B([foo,
+                   move,
+                   bar])
+        optimize_global(block)
+        self.assertEquals(block.statements, [foo, move, bar])
+        
+    def test_optimize_global_movinst_true(self):
+        foo = S('command', 'foo')
+        bar = S('command', 'bar')
+        
+        block = B([foo,
+                   S('command', 'move', '$regA', '$regB'),
+                   S('command', 'addu', '$regA', '$regA', 2),
+                   bar])
+        optimize_global(block)
+        self.assertEquals(block.statements, [foo,                     
+                   S('command', 'addu', '$regA', '$regB', 2),      
+                   bar])
+                   
+    def test_optimize_global_movinst_false(self):
+        foo = S('command', 'foo')
+        bar = S('command', 'bar')
+        
+        block = B([foo,
+                   S('command', 'move', '$regA', '$regB'),
+                   S('command', 'addu', '$regA', '$regC', 2),
+                   bar])
+        optimize_global(block)
+        self.assertEquals(block.statements, [foo,                     
+                   S('command', 'move', '$regA', '$regB'),
+                   S('command', 'addu', '$regA', '$regC', 2),      
+                   bar])

tests/test_statement.py

@@ -67,6 +67,7 @@ class TestStatement(unittest.TestCase):
         self.assertEqual(self.block.peek(), S('comment', 'bar'))
 
     def test_replace(self):
+        self.block.read()
         self.block.replace(1, [S('command', 'foobar')])
         self.assertEqual(self.block.pointer, 1)
         self.assertEqual(self.block.statements, [S('command', 'foobar'), \