diff --git a/lark/parse_tree_builder.py b/lark/parse_tree_builder.py index 24f15e8..e81ca1b 100644 --- a/lark/parse_tree_builder.py +++ b/lark/parse_tree_builder.py @@ -106,7 +106,7 @@ class Callback(object): pass -def inline_args(func): +def ptb_inline_args(func): @wraps(func) def f(children): return func(*children) @@ -154,7 +154,7 @@ class ParseTreeBuilder: assert not getattr(f, 'meta', False), "Meta args not supported for internal transformer" # XXX InlineTransformer is deprecated! if getattr(f, 'inline', False) or isinstance(transformer, InlineTransformer): - f = inline_args(f) + f = ptb_inline_args(f) except AttributeError: f = partial(self.tree_class, user_callback_name) diff --git a/lark/tools/standalone.py b/lark/tools/standalone.py index 43b1879..94c629c 100644 --- a/lark/tools/standalone.py +++ b/lark/tools/standalone.py @@ -56,6 +56,7 @@ EXTRACT_STANDALONE_FILES = [ 'utils.py', 'common.py', 'tree.py', + 'visitors.py', 'indenter.py', 'lexer.py', 'parse_tree_builder.py', @@ -161,7 +162,7 @@ class TreeBuilderAtoms: self.ptb = lark._parse_tree_builder def print_python(self): - print('class InlineTransformer: pass') + # print('class InlineTransformer: pass') print('RULES = {') for i, r in enumerate(self.rules): rule_ids[r] = i diff --git a/lark/utils.py b/lark/utils.py index 6a7fdb5..8dba8c2 100644 --- a/lark/utils.py +++ b/lark/utils.py @@ -73,6 +73,7 @@ def smart_decorator(f, create_decorator): return create_decorator(f.__func__.__call__, True) +###} try: @@ -93,7 +94,6 @@ except ImportError: except excs: pass -###} diff --git a/lark/visitors.py b/lark/visitors.py index ec9bde6..4bc3866 100644 --- a/lark/visitors.py +++ b/lark/visitors.py @@ -1,13 +1,14 @@ -from inspect import getmembers, getmro from functools import wraps from .utils import smart_decorator from .tree import Tree +###{standalone +from inspect import getmembers, getmro + class Discard(Exception): pass - # Transformers class Transformer: @@ -250,3 +251,4 @@ def v_args(inline=False, meta=False, tree=False): return _visitor_args_dec +###}