From ff588714c1184fb24d7a4325006240bb7e89b26d Mon Sep 17 00:00:00 2001 From: Rob Rose Date: Tue, 27 Mar 2018 15:56:39 -0400 Subject: [PATCH] Changed Lark standalone file extension - Reasoning addressed in Issue #116 - Renamed example and grammars file to use new extension. - Changed `.g` to new extension of `.lrk` in places where it is referenced. --- MANIFEST.in | 2 +- examples/{python2.g => python2.lrk} | 0 examples/{python3.g => python3.lrk} | 0 examples/python_parser.py | 4 ++-- examples/standalone/create_standalone.sh | 2 +- examples/standalone/{json.g => json.lrk} | 0 lark/grammars/{common.g => common.lrk} | 0 lark/load_grammar.py | 2 +- setup.py | 2 +- 9 files changed, 6 insertions(+), 6 deletions(-) rename examples/{python2.g => python2.lrk} (100%) rename examples/{python3.g => python3.lrk} (100%) rename examples/standalone/{json.g => json.lrk} (100%) rename lark/grammars/{common.g => common.lrk} (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 5ee4903..8288fd6 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1 @@ -include README.md LICENSE docs/* examples/*.py examples/*.png examples/*.g tests/*.py tests/test_nearley/*.py tests/test_nearley/grammars/* +include README.md LICENSE docs/* examples/*.py examples/*.png examples/*.lrk tests/*.py tests/test_nearley/*.py tests/test_nearley/grammars/* diff --git a/examples/python2.g b/examples/python2.lrk similarity index 100% rename from examples/python2.g rename to examples/python2.lrk diff --git a/examples/python3.g b/examples/python3.lrk similarity index 100% rename from examples/python3.g rename to examples/python3.lrk diff --git a/examples/python_parser.py b/examples/python_parser.py index d953a79..d14dacc 100644 --- a/examples/python_parser.py +++ b/examples/python_parser.py @@ -21,8 +21,8 @@ class PythonIndenter(Indenter): tab_len = 8 -grammar2_filename = os.path.join(__path__, 'python2.g') -grammar3_filename = os.path.join(__path__, 'python3.g') +grammar2_filename = os.path.join(__path__, 'python2.lrk') +grammar3_filename = os.path.join(__path__, 'python3.lrk') with open(grammar2_filename) as f: python_parser2 = Lark(f, parser='lalr', postlex=PythonIndenter(), start='file_input') with open(grammar3_filename) as f: diff --git a/examples/standalone/create_standalone.sh b/examples/standalone/create_standalone.sh index 1eba3a4..f5001fe 100755 --- a/examples/standalone/create_standalone.sh +++ b/examples/standalone/create_standalone.sh @@ -1 +1 @@ -python -m lark.tools.standalone json.g > json_parser.py +python -m lark.tools.standalone json.lrk > json_parser.py diff --git a/examples/standalone/json.g b/examples/standalone/json.lrk similarity index 100% rename from examples/standalone/json.g rename to examples/standalone/json.lrk diff --git a/lark/grammars/common.g b/lark/grammars/common.lrk similarity index 100% rename from lark/grammars/common.g rename to lark/grammars/common.lrk diff --git a/lark/load_grammar.py b/lark/load_grammar.py index 1637514..cf74199 100644 --- a/lark/load_grammar.py +++ b/lark/load_grammar.py @@ -625,7 +625,7 @@ class GrammarLoader: elif stmt.data == 'import': dotted_path = stmt.children[0].children name = stmt.children[1] if len(stmt.children)>1 else dotted_path[-1] - grammar_path = os.path.join(*dotted_path[:-1]) + '.g' + grammar_path = os.path.join(*dotted_path[:-1]) + '.lrk' g = import_grammar(grammar_path) token_options = dict(g.token_defs)[dotted_path[-1]] assert isinstance(token_options, tuple) and len(token_options)==2 diff --git a/setup.py b/setup.py index 430ae5c..978b370 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ setup( requires = [], install_requires = [], - package_data = { '': ['*.md', '*.g'] }, + package_data = { '': ['*.md', '*.lrk'] }, test_suite = 'tests.__main__',