Name parts of a block

diff --git a/tatsu_grammar.txt b/tatsu_grammar.txt
index cf0b6360246493cfb6e99ed8509a74abd035a79d..a62fc695d95bb45d92e6971190b6764ed526f8b0 100644 (file)
--- a/tatsu_grammar.txt
+++ b/tatsu_grammar.txt
@@ -39,18 +39,18 @@ raw_block_end
 \r
 block_expression\r
     =\r
-    | ( block_start expressions block_end )\r
-    | block_start\r
+    | ( start:block_start contents:expressions end:block_end )\r
+    | block:block_start\r
     ;\r
 \r
 block_start\r
     =\r
-    block_open type:`blockstart` !("end") name:IDENTIFIER {SP}* parameters:[ block_parameters ] {SP}* block_close\r
+    block_open !("end") name:IDENTIFIER {SP}* parameters:[ block_parameters ] {SP}* block_close\r
     ;\r
 \r
 block_end\r
     =\r
-    block_open type:`blockend` "end" name:IDENTIFIER block_close\r
+    block_open "end" name:IDENTIFIER block_close\r
     ;\r
 \r
 block_open\r
@@ -64,18 +64,18 @@ block_close
 \r
 line_block_expression\r
     =\r
-    | ( line_block_start expressions line_block_end )\r
-    | line_block_start\r
+    | ( start:line_block_start contents:expressions end:line_block_end )\r
+    | block:line_block_start\r
     ;\r
 \r
 line_block_start\r
     =\r
-    line_block_open type:`blockstart` !("end") name:IDENTIFIER {SP}* parameters:[ line_block_parameters ] { !"\n" SP }* [ ":" { !"\n" SP }* ] "\n"\r
+    line_block_open !("end") name:IDENTIFIER {SP}* parameters:[ line_block_parameters ] { !"\n" SP }* [ ":" { !"\n" SP }* ] "\n"\r
     ;\r
 \r
 line_block_end\r
     =\r
-    line_block_open type:`blockend` "end" name:IDENTIFIER "\n"\r
+    line_block_open "end" name:IDENTIFIER "\n"\r
     ;\r
 \r
 line_block_open\r