Merge branch 'SupraSummus-refactor'

lark/lark.py

@@ -117,9 +117,6 @@ class Lark:
             self.source = grammar.name
         except AttributeError:
             self.source = '<string>'
-            cache_file = "larkcache_%s" % str(hash(grammar)%(2**32))
-        else:
-            cache_file = "larkcache_%s" % os.path.basename(self.source)
 
         # Drain file-like objects to get their contents
         try:

lark/reconstruct.py

@@ -101,10 +101,7 @@ class Reconstructor:
         for origin, rule_aliases in aliases.items():
             for alias in rule_aliases:
                 yield Rule(origin, [Terminal(alias)], alias=MakeMatchTree(origin.name, [NonTerminal(alias)]))
-            
             yield Rule(origin, [Terminal(origin.name)], alias=MakeMatchTree(origin.name, [origin]))
-        
-
 
     def _match(self, term, token):
         if isinstance(token, Tree):
@@ -128,4 +125,3 @@ class Reconstructor:
 
     def reconstruct(self, tree):
         return ''.join(self._reconstruct(tree))
-

lark/tools/standalone.py

@@ -45,9 +45,7 @@ from collections import defaultdict
 
 import lark
 from lark import Lark
-from lark.parsers.lalr_analysis import Shift, Reduce
-
-from ..grammar import Rule
+from lark.parsers.lalr_analysis import Reduce
 
 _dir = path.dirname(__file__)
 _larkdir = path.join(_dir, path.pardir)