Operator refactoring.

jedi/parser/pytree.py

@@ -44,11 +44,12 @@ python_grammar_no_print_statement = python_grammar.copy()
 del python_grammar_no_print_statement.keywords["print"]
 
 
-from jedi.parser.representation import ExprStmt, Class, Function
+from jedi.parser import representation as er
 _ast_mapping = {
     #'simple_stmt': ExprStmt,
-    'classdef': Class,
-    'funcdef': Function,
+    'classdef': er.Class,
+    'funcdef': er.Function,
+    'file_input': er.SubModule,
 }
 
 ast_mapping = dict((getattr(python_symbols, k), v) for k, v in _ast_mapping.items())
@@ -220,6 +221,7 @@ def convert(grammar, raw_node):
         if len(children) == 1:
             return children[0]
         print(raw_node, type_repr(type))
+        #import pdb; pdb.set_trace()
         try:
             return ast_mapping[type](children)
         except KeyError:

jedi/parser/representation.py

@@ -421,7 +421,7 @@ class SubModule(Scope, Module):
     __slots__ = ('path', 'global_vars', 'used_names', 'temp_used_names',
                  'line_offset', 'use_as_parent')
 
-    def __init__(self, path, start_pos=(1, 0), top_module=None):
+    def __init__(self, children):
         """
         Initialize :class:`SubModule`.
 
@@ -430,14 +430,15 @@ class SubModule(Scope, Module):
 
         .. todo:: Document `top_module`.
         """
-        super(SubModule, self).__init__(self, start_pos)
-        self.path = path
+        super(SubModule, self).__init__(children)
+        self.path = None  # Set later.
         self.global_vars = []
         self.used_names = {}
         self.temp_used_names = []
         # this may be changed depending on fast_parser
         self.line_offset = 0
 
+        if 0:
             self.use_as_parent = top_module or self
 
     def add_global(self, name):
@@ -1582,20 +1583,21 @@ class ListComprehension(ForFlow):
         return "%s for %s in %s" % tuple(code)
 
 
-class Operator(Simple):
-    __slots__ = ('string',)
-
-    def __init__(self, module, string, parent, start_pos):
-        end_pos = start_pos[0], start_pos[1] + len(string)
-        super(Operator, self).__init__(module, start_pos, end_pos, parent)
-        self.string = string
+class _Leaf(Base):
+    __slots__ = ('value', 'parent', 'start_pos', 'prefix')
+    def __init__(self, value, start_pos, prefix):
+        self.value = value
+        self.start_pos = start_pos
+        self.prefix = prefix
 
     def get_code(self):
-        return self.string
+        return self.prefix + self.value
 
     def __repr__(self):
-        return "<%s: `%s`>" % (type(self).__name__, self.string)
+        return "<%s: `%s`>" % (type(self).__name__, self.value)
 
+
+class Operator(_Leaf):
     def __str__(self):
         return self.get_code()
 
@@ -1607,11 +1609,11 @@ class Operator(Simple):
         if isinstance(other, Operator):
             return self is other
         else:
-            return self.string == other
+            return self.value == other
 
     def __ne__(self, other):
         """Python 2 compatibility."""
-        return self.string != other
+        return self.value != other
 
     def __hash__(self):
-        return hash(self.string)
+        return hash(self.value)