Adjust grammar for stricter term export behavior in lezer-generator

marijnh · marijnh · commit 935bfb7021f5 · 2021-05-14T15:40:34.000+02:00
diff --git a/src/python.grammar b/src/python.grammar
@@ -128,15 +128,15 @@ expression[@isGroup=Expression] {
   BinaryExpression |
   UnaryExpression { !prefix (ArithOp{"+" | "-"} | BitOp{"~"}) expression } |
   AwaitExpression { kw<"await"> expression } |
-  ParenthesizedExpression { "(" (testNamed | "*" expression | YieldExpression) ")" } |
-  TupleExpression { "(" (testNamed | "*" expression) (("," (testNamed | "*" expression))+ ","? | ",") ")" } |
-  ComprehensionExpression { "(" (testNamed | "*" expression) compFor ")" } |
-  ArrayExpression { "[" commaSep<testNamed | "*" expression>? "]" } |
-  ArrayComprehensionExpression { "[" (testNamed | "*" expression) compFor "]" } |
-  DictionaryExpression { "{" commaSep<test ":" test | "**" expression>? "}" } |
-  DictionaryComprehensionExpression { "{" (test ":" test | "**" expression) compFor "}" } |
-  SetExpression { "{" commaSep<test | "*" expression> "}" } |
-  SetComprehensionExpression { "{" (test | "*" expression) compFor "}" } |
+  ParenthesizedExpression |
+  TupleExpression |
+  ComprehensionExpression |
+  ArrayExpression |
+  ArrayComprehensionExpression |
+  DictionaryExpression |
+  DictionaryComprehensionExpression |
+  SetExpression |
+  SetComprehensionExpression |
   CallExpression { expression !trail ArgList } |
   MemberExpression { expression !trail ("[" commaSep<test | test? ":" test? (":" test?)?> "]" | "." PropertyName) } |
   VariableName |
@@ -148,6 +148,20 @@ expression[@isGroup=Expression] {
   @specialize[@name=Boolean]<identifier, "True" | "False">
 }
 
+ParenthesizedExpression { "(" (testNamed | "*" expression | YieldExpression) ")" }
+
+TupleExpression { "(" (testNamed | "*" expression) (("," (testNamed | "*" expression))+ ","? | ",") ")" }
+ComprehensionExpression { "(" (testNamed | "*" expression) compFor ")" }
+
+ArrayExpression { "[" commaSep<testNamed | "*" expression>? "]" }
+ArrayComprehensionExpression { "[" (testNamed | "*" expression) compFor "]" }
+
+DictionaryExpression { "{" commaSep<test ":" test | "**" expression>? "}" }
+DictionaryComprehensionExpression { "{" (test ":" test | "**" expression) compFor "}" }
+
+SetExpression { "{" commaSep<test | "*" expression> "}" }
+SetComprehensionExpression { "{" (test | "*" expression) compFor "}" }
+
 yield { kw<"yield"> (kw<"from"> test | commaSep<test | "*" expression>) }
 
 YieldExpression { yield }
diff --git a/test/statement.txt b/test/statement.txt
@@ -318,3 +318,15 @@ self = True
 ==>
 
 Script(AssignStatement(VariableName,AssignOp,Boolean))
+
+# Notices when the first line is indented
+
+# comment
+  def foo():
+    pass
+  def bar():
+    pass
+
+==>
+
+Script(Comment,⚠,FunctionDefinition(def,VariableName,ParamList("(",")"),Body(":",PassStatement(pass))))
