Rooba
/
lark
mirror of https://github.com/lark-parser/lark.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix nearley multi includes

This commit is contained in:
Kaspar Emanuel 2017-10-06 17:21:25 +01:00
parent 15c0ef1570
commit 3ea0b35c9f
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lark/tools/nearley.py
View File

@ -101,7 +101,10 @@ class NearleyToLark(InlineTransformer):
def start(self, *rules): def start(self, *rules):
return '\n'.join(filter(None, rules)) return '\n'.join(filter(None, rules))
def _nearley_to_lark(g, builtin_path, n2l, js_code, folder_path): def _nearley_to_lark(g, builtin_path, n2l, js_code, folder_path, includes=None):
if includes is None:
includes = []
rule_defs = [] rule_defs = []
tree = nearley_grammar_parser.parse(g) tree = nearley_grammar_parser.parse(g)
@ -110,14 +113,22 @@ def _nearley_to_lark(g, builtin_path, n2l, js_code, folder_path):
directive, arg = statement.children directive, arg = statement.children
if directive == 'builtin': if directive == 'builtin':
path = os.path.join(builtin_path, arg[1:-1]) path = os.path.join(builtin_path, arg[1:-1])
if path not in includes:
includes.append(path)
with open(path) as f: with open(path) as f:
text = f.read() text = f.read()
rule_defs += _nearley_to_lark(text, builtin_path, n2l, js_code, os.path.abspath(os.path.dirname(path))) [included_rule_defs, included_includes] = _nearley_to_lark(text, builtin_path, n2l, js_code, os.path.abspath(os.path.dirname(path)), includes)
rule_defs += included_rule_defs
includes += included_includes
elif directive == 'include': elif directive == 'include':
path = os.path.join(folder_path, arg[1:-1]) path = os.path.join(folder_path, arg[1:-1])
if path not in includes:
includes.append(path)
with open(path) as f: with open(path) as f:
text = f.read() text = f.read()
rule_defs += _nearley_to_lark(text, builtin_path, n2l, js_code, os.path.abspath(os.path.dirname(path))) [included_rule_defs, included_includes] = _nearley_to_lark(text, builtin_path, n2l, js_code, os.path.abspath(os.path.dirname(path)), includes)
rule_defs += included_rule_defs
includes += included_includes
else: else:
assert False, directive assert False, directive
elif statement.data == 'js_code': elif statement.data == 'js_code':
@ -131,7 +142,7 @@ def _nearley_to_lark(g, builtin_path, n2l, js_code, folder_path):
else: else:
raise Exception("Unknown statement: %s" % statement) raise Exception("Unknown statement: %s" % statement)
return rule_defs return [rule_defs, includes]
def create_code_for_nearley_grammar(g, start, builtin_path, folder_path): def create_code_for_nearley_grammar(g, start, builtin_path, folder_path):
@ -145,7 +156,8 @@ def create_code_for_nearley_grammar(g, start, builtin_path, folder_path):
js_code = ['function id(x) {return x[0];}'] js_code = ['function id(x) {return x[0];}']
n2l = NearleyToLark() n2l = NearleyToLark()
lark_g = '\n'.join(_nearley_to_lark(g, builtin_path, n2l, js_code, folder_path)) [rule_defs, _] = _nearley_to_lark(g, builtin_path, n2l, js_code, folder_path)
lark_g = '\n'.join(rule_defs)
lark_g += '\n'+'\n'.join('!%s: %s' % item for item in n2l.extra_rules.items()) lark_g += '\n'+'\n'.join('!%s: %s' % item for item in n2l.extra_rules.items())
emit('from lark import Lark, Transformer') emit('from lark import Lark, Transformer')