grammar: Make apply statements have block bodies

Signed-off-by: Will Hawkins <hawkinsw@obs.cr>

tree-sitter-p4/grammar.js

@@ -84,7 +84,7 @@ export default grammar({
 
         // Control declarations
         control_declaration: $ => seq($.control, $.identifier, $.parameters, '{', repeat(choice($.table_declaration, $.action_declaration)), $.apply_statement, '}'),
-        action_declaration: $ => seq($.action, $.identifier, $.parameters, $.statement),
+        action_declaration: $ => seq($.action, $.identifier, $.parameters, $.blockStatement),
         table_declaration: $ => seq($.table, $.identifier, '{', optional($.table_property_list), '}'),
 
         // Table property list
@@ -107,7 +107,7 @@ export default grammar({
         assignmentStatement: $=> seq($.expression, $.assignment, $.expression, $._semicolon),
         return_statement: $=> seq($._return, $.expression, $._semicolon),
         exit_statement: $=> seq($._exit, $._semicolon),
-        apply_statement: $=> seq($.apply, $.statement),
+        apply_statement: $=> seq($.apply, $.blockStatement),
 
         // Parser statements
         parserStatements: $ => repeat1($.parserStatement),

tree-sitter-p4/test/corpus/control.txt

@@ -24,10 +24,8 @@ control simple() {
     (action)
     (identifier)
     (parameters)
-    (statement
     (blockStatement)
    )
-   )
    (table_declaration
     (table)
     (identifier)
@@ -51,11 +49,9 @@ control simple() {
    )
    (apply_statement
     (apply)
-    (statement
     (blockStatement)
    )
   )
  )
 )
-)
 

tree-sitter-p4/test/corpus/statements.txt

@@ -15,7 +15,6 @@ control T() {
    (parameters)
    (apply_statement
     (apply)
-    (statement
     (blockStatement
      (statements
       (statement
@@ -27,7 +26,6 @@ control T() {
   )
  )
 )
-)
 =========================
 Return Statement
 =========================