Merge pull request #211 from boriel/feature/refact_symbols

Refactorize code

Author: boriel

symbols/arraydecl.py

@@ -15,7 +15,7 @@ class SymbolARRAYDECL(Symbol):
     """ Defines an Array declaration
     """
     def __init__(self, entry):
-        Symbol.__init__(self, entry)
+        super(SymbolARRAYDECL, self).__init__(entry)
 
     @property
     def name(self):

symbols/arrayload.py

@@ -13,7 +13,7 @@
 
 
 class SymbolARRAYLOAD(SymbolARRAYACCESS):
-    ''' This class is the same as SymbolARRAYACCESS, we just declare it to make
+    """ This class is the same as SymbolARRAYACCESS, we just declare it to make
     a distinction. (e.g. the Token is gotten from the class name)
-    '''
+    """
     pass

symbols/asm.py

@@ -13,9 +13,9 @@
 
 
 class SymbolASM(Symbol):
-    ''' Defines an ASM sentence
-    '''
+    """ Defines an ASM sentence
+    """
     def __init__(self, asm, lineno):
-        Symbol.__init__(self)
+        super(SymbolASM, self).__init__()
         self.asm = asm
         self.lineno = lineno

symbols/bound.py

@@ -32,7 +32,7 @@ def __init__(self, lower, upper):
         assert isinstance(upper, int)
         assert upper >= lower >= 0
 
-        Symbol.__init__(self)
+        super(SymbolBOUND, self).__init__()
         self.lower = lower
         self.upper = upper
 

symbols/boundlist.py

@@ -14,13 +14,13 @@
 
 
 class SymbolBOUNDLIST(Symbol):
-    ''' Defines a bound list for an array
-    '''
+    """ Defines a bound list for an array
+    """
     def __init__(self, *bounds):
         for bound in bounds:
             assert isinstance(bound, SymbolBOUND)
 
-        Symbol.__init__(self, *bounds)
+        super(SymbolBOUNDLIST, self).__init__(*bounds)
 
     def __len__(self):  # Number of bounds:
         return len(self.children)
@@ -33,8 +33,8 @@ def __str__(self):
 
     @classmethod
     def make_node(cls, node, *args):
-        ''' Creates an array BOUND LIST.
-        '''
+        """ Creates an array BOUND LIST.
+        """
         if node is None:
             return cls.make_node(SymbolBOUNDLIST(), *args)
 

symbols/builtin.py

@@ -23,7 +23,7 @@ class SymbolBUILTIN(Symbol):
     def __init__(self, lineno, fname, type_=None, *operands):
         assert isinstance(lineno, int)
         assert type_ is None or isinstance(type_, SymbolTYPE)
-        Symbol.__init__(self, *operands)
+        super(SymbolBUILTIN, self).__init__(*operands)
         self.lineno = lineno
         self.fname = fname
         self.type_ = type_

symbols/function.py

@@ -22,7 +22,7 @@ class SymbolFUNCTION(SymbolVAR):
     """
 
     def __init__(self, varname, lineno, offset=None, type_=None):
-        SymbolVAR.__init__(self, varname, lineno, offset, class_=CLASS.function, type_=type_)
+        super(SymbolFUNCTION, self).__init__(varname, lineno, offset, class_=CLASS.function, type_=type_)
         self.reset()
 
     def reset(self, lineno=None, offset=None, type_=None):

symbols/label.py

@@ -18,7 +18,7 @@ class SymbolLABEL(SymbolVAR):
     prefix = '__LABEL__'
 
     def __init__(self, name, lineno):
-        SymbolVAR.__init__(self, name, lineno)
+        super(SymbolLABEL, self).__init__(name, lineno)
         self.class_ = CLASS.label
         self._scope_owner = []  # list of nested functions containing this label (scope)
 

symbols/number.py

@@ -44,7 +44,7 @@ def __init__(self, value, lineno, type_=None):
 
         assert isinstance(value, numbers.Number)
 
-        super(Symbol, self).__init__()
+        super(SymbolNUMBER, self).__init__()
         self.class_ = CLASS.const
 
         if int(value) == value:

symbols/paramdecl.py

@@ -18,10 +18,10 @@
 
 
 class SymbolPARAMDECL(SymbolVAR):
-    ''' Defines a parameter declaration
-    '''
+    """ Defines a parameter declaration
+    """
     def __init__(self, varname, lineno, type_=None):
-        SymbolVAR.__init__(self, varname, lineno, type_=type_, class_=CLASS.var)
+        super(SymbolPARAMDECL, self).__init__(varname, lineno, type_=type_, class_=CLASS.var)
         self.byref = OPTIONS.byref.value  # By default all params By value (false)
         self.offset = None  # Set by PARAMLIST, contains positive offset from top of the stack
         self.scope = SCOPE.parameter