From ec67938933d087b048da196981e1f0c19080bae9 Mon Sep 17 00:00:00 2001 From: MegaIng Date: Sun, 19 Jan 2020 21:01:53 +0100 Subject: [PATCH 1/2] Small correction in lark.lark Added multi-name-imports to the lark.lark grammar. --- examples/lark.lark | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/lark.lark b/examples/lark.lark index f1f42f6..a561361 100644 --- a/examples/lark.lark +++ b/examples/lark.lark @@ -13,7 +13,8 @@ statement: "%ignore" expansions _NL -> ignore | "%import" import_args ["->" name] _NL -> import | "%declare" name+ -> declare -import_args: "."? name ("." name)* +import_args: import_path ["(" name ("," name)* ")"] +import_path: "."? name ("." name)* ?expansions: alias (_VBAR alias)* From 9552f001b2749e833db9e00c225323937245d632 Mon Sep 17 00:00:00 2001 From: MegaIng Date: Sun, 19 Jan 2020 21:11:09 +0100 Subject: [PATCH 2/2] Update lark.lark --- examples/lark.lark | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/lark.lark b/examples/lark.lark index a561361..c99d528 100644 --- a/examples/lark.lark +++ b/examples/lark.lark @@ -10,11 +10,12 @@ token: TOKEN priority? ":" expansions _NL priority: "." NUMBER statement: "%ignore" expansions _NL -> ignore - | "%import" import_args ["->" name] _NL -> import + | "%import" import_path ["->" name] _NL -> import + | "%import" import_path name_list _NL -> multi_import | "%declare" name+ -> declare -import_args: import_path ["(" name ("," name)* ")"] -import_path: "."? name ("." name)* +!import_path: "."? name ("." name)* +name_list: "(" name ("," name)* ")" ?expansions: alias (_VBAR alias)*