From 8df395e7015d68518f125c71cabaf5666ff9a573 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Mon, 18 Jan 2021 14:52:33 -0800 Subject: [PATCH] Fixed some grammar bugs --- grammars/bp.bp | 4 ++-- grammars/python.bp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/grammars/bp.bp b/grammars/bp.bp index 7379dfe..0b222ca 100644 --- a/grammars/bp.bp +++ b/grammars/bp.bp @@ -24,8 +24,8 @@ suffixed-pat: ( / Not-eq-pat ) -Eq-pat: @first=pat__"=="__@second=pat -Not-eq-pat: @first=pat__"!="__@second=pat +Eq-pat: @first=(suffixed-pat / simple-pat)__"=="__@second=pat +Not-eq-pat: @first=(suffixed-pat / simple-pat)__"!="__@second=pat Dot: `. !`. String: ( diff --git a/grammars/python.bp b/grammars/python.bp index 938b53e..d6391bf 100644 --- a/grammars/python.bp +++ b/grammars/python.bp @@ -17,4 +17,4 @@ class: class-def +(\N ..$) class-def: ^_|"class"|_id[_parens]_`: function: function-def +(\N ..$) function-def: ^_|"def"|_id parens `: -import: ^_["from"| ..>(|"import"|)] (|"import"|)%parens ..$%parens +import: ^_["from"| ..>(|"import"|)%parens] |"import"| ..$%parens