Browse Source

Applied pep8.

Taddeus Kroes 14 years ago
parent
commit
a6dfda544f
2 changed files with 18 additions and 22 deletions
  1. 2 1
      src/statement.py
  2. 16 21
      tests/test_statement.py

+ 2 - 1
src/statement.py

@@ -107,6 +107,7 @@ class Statement:
         return self.is_command() \
                and re.match('^l(w|a|b|bu|\.d|\.s)|dlw$', \
                             self.name)
+
     def is_logical(self):
         """Check if the statement is a logical operator."""
         return self.is_command() and re.match('^(xor|or|and)i?$', self.name)
@@ -194,7 +195,7 @@ class Statement:
         if self.is_double_arithmetic() or self.is_set_if_less() \
                 or self.is_logical() \
                 or self.is_command(*['addu', 'subu']):
-            if not isinstance(self[2] , int):
+            if not isinstance(self[2], int):
                     use.append(self[2])
 
         return use

+ 16 - 21
tests/test_statement.py

@@ -93,25 +93,20 @@ class TestStatement(unittest.TestCase):
         self.assertTrue(S('command', 'addu', '$1', '$2', '$3').is_arith())
         self.assertFalse(S('command', 'foo').is_arith())
         self.assertFalse(S('label', 'addu').is_arith())
-        
+
     def test_get_def(self):
-        self.assertEqual(S('command', 'move', '$1', '$2').get_def(), ['$1'])
-        self.assertEqual(S('command', 'subu', '$1', '$2').get_def(), ['$1'])
-        self.assertEqual(S('command', 'addu','$1','$2','$3').get_def(), ['$1'])
-        self.assertEqual(S('command', 'sll','$1','$2','$3').get_def(), ['$1'])
-        self.assertEqual(S('command', 'srl','$1','$2','$3').get_def(), ['$1'])
-        self.assertEqual(S('command', 'la', '$1','16($fp)').get_def(), ['$1'])
-        self.assertEqual(S('command', 'li', '$1','16($fp)').get_def(), ['$1'])
-        self.assertEqual(S('command','add.d', '$1','$2','$3').get_def(),['$1'])
-        self.assertEqual(S('command','neg.d', '$1','$2').get_def(),['$1'])
-        self.assertEqual(S('command','sub.d','$1','$2', '$3').get_def(),['$1'])
-        self.assertEqual(S('command','slt', '$1','$2').get_def(),['$1'])
-        self.assertEqual(S('command','xori', '$1','$2', '0x0000').get_def(), \
-                                                                     ['$1']) 
-        self.assertEqual(S('command','mov.d', '$1','$2').get_def(), ['$1'])
-        self.assertEqual(S('command','dmfc1', '$1','$f0').get_def(), ['$1'])
-        
-        
-        
-        
-        
+        self.assertEqual(S('command', 'move', 'a', 'b').get_def(), ['a'])
+        self.assertEqual(S('command', 'subu', 'a', 'b').get_def(), ['a'])
+        self.assertEqual(S('command', 'addu', 'a', 'b', 'c').get_def(), ['a'])
+        self.assertEqual(S('command', 'sll', 'a', 'b', 'c').get_def(), ['a'])
+        self.assertEqual(S('command', 'srl', 'a', 'b', 'c').get_def(), ['a'])
+        self.assertEqual(S('command', 'lb', 'a', '16($fp)').get_def(), ['a'])
+        self.assertEqual(S('command', 'li', 'a', '16($fp)').get_def(), ['a'])
+        self.assertEqual(S('command', 'add.d', 'a', 'b', 'c').get_def(), ['a'])
+        self.assertEqual(S('command', 'neg.d', 'a', 'b').get_def(), ['a'])
+        self.assertEqual(S('command', 'sub.d', 'a', 'b', 'c').get_def(), ['a'])
+        self.assertEqual(S('command', 'slt', 'a', 'b').get_def(), ['a'])
+        self.assertEqual(S('command', 'xori', 'a', 'b', '0x0000').get_def(),
+                         ['a'])
+        self.assertEqual(S('command', 'mov.d', 'a', 'b').get_def(), ['a'])
+        self.assertEqual(S('command', 'dmfc1', 'a', '$f0').get_def(), ['a'])