[fixes] updates based on tesing on Oxide p4 programs

README.md

@@ -1,3 +1,27 @@
-# tree-sitter-p4
+# tree-sitter-p4: P4 grammar for tree-sitter
 
 P4 grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter).
+
+## Setup
+
+To build the parser, you need to have `tree-sitter` installed. You can install
+it using most OS package managers, from source, or through `npm`:
+
+```sh
+npm install tree-sitter-cli
+```
+
+or with `cargo`:
+
+```sh
+cargo install tree-sitter-cli
+```
+
+## Contributing
+
+This project is still in its early stages, so there are many things that can be
+improved, as we aim toward capturing more of the [`P4_16` specification][p4-16-spec].
+
+To contribute, just open a pull request!
+
+[p4-16-spec]: https://p4.org/p4-spec/docs/P4-16-v1.0.0-spec.html

examples/action-toplevel.p4

@@ -0,0 +1,13 @@
+action multicast_inbound() {
+    hdr.sidecar.sc_code = 4;
+    hdr.sidecar.sc_ingress = (bit<16>) meta.in_port;
+    hdr.sidecar.sc_egress = (bit<16>) ig_tm_md.ucast_egress_port;
+    hdr.sidecar.sc_ether_type = hdr.ethernet.ether_type;
+    hdr.sidecar.sc_payload = 0;
+    hdr.sidecar.setValid();
+    hdr.ethernet.ether_type = ETHERTYPE_SIDECAR;
+    meta.routed = false;
+    meta.service_routed = true;
+    ig_tm_md.ucast_egress_port = USER_SPACE_SERVICE_PORT;
+    meta.multicast = true;
+}

examples/control_counters.p4

@@ -0,0 +1,8 @@
+control Services(
+	inout sidecar_headers_t hdr,
+	inout sidecar_ingress_meta_t meta,
+	inout ingress_intrinsic_metadata_for_deparser_t ig_dprsr_md,
+	inout ingress_intrinsic_metadata_for_tm_t ig_tm_md)
+{
+	Counter<bit<32>, bit<8>>(SVC_COUNTER_MAX, CounterType_t.PACKETS) service_ctr;
+}

examples/list.p4

@@ -43,5 +43,4 @@ control ingress(inout headers_t hdr) {
             hdr.udp,
         });
     }
-
 }

examples/parser_checksums.p4

@@ -0,0 +1,10 @@
+parser IngressParser(
+    packet_in pkt,
+	out sidecar_headers_t hdr,
+	out sidecar_ingress_meta_t meta,
+	out ingress_intrinsic_metadata_t ig_intr_md)
+{
+	Checksum() ipv4_checksum;
+	Checksum() icmp_checksum;
+	Checksum() nat_checksum;
+}

grammar.js

@@ -18,6 +18,8 @@ module.exports = grammar({
         $.parser_definition,
         $.control_definition,
         $.package,
+        $.action,
+        $.table,
       ),
 
     package: ($) =>
@@ -117,7 +119,10 @@ module.exports = grammar({
         seq(
           repeat($.annotation),
           "parser",
-          $.method_identifier,
+          choice(
+            seq($.method_identifier, "<", $.type_identifier, ">"),
+            $.method_identifier,
+          ),
           "(",
           repeat($.parameter),
           ")",
@@ -212,7 +217,11 @@ module.exports = grammar({
 
     key_type: (_) => choice("range", "exact", "ternary", "lpm", "optional"),
 
-    state: ($) => seq("state", $.method_identifier, "{", repeat($.stmt), "}"),
+    state: ($) =>
+      choice(
+        seq($.method_identifier, "()", $.type_identifier, ";"),
+        seq("state", $.method_identifier, "{", repeat($.stmt), "}"),
+      ),
 
     stmt: ($) =>
       choice(
@@ -221,19 +230,19 @@ module.exports = grammar({
         $.var_decl,
         seq($.transition, ";"),
         seq($.call, ";"),
-        seq($.expr, ";"),
         seq("return", ";"),
       ),
 
     var_decl: ($) =>
-      prec(
-        1,
-        seq(
-          optional(choice($._type, $.type_identifier)),
-          $.identifier,
-          optional(seq("=", $.expr)),
-          ";",
+      seq(
+        optional(choice($._type, $.type_identifier)),
+        $.lval,
+        "=",
+        choice(
+          seq("(", choice($._type, $.type_identifier), ")", $.expr),
+          $.expr,
         ),
+        ";",
       ),
 
     action: ($) =>
@@ -308,20 +317,32 @@ module.exports = grammar({
 
     _else: ($) => seq("else", "{", repeat($.stmt), "}"),
 
+    _elseif: ($) => seq("else if", "(", $.expr, ")", "{", repeat($.stmt), "}"),
+
     control_var: ($) =>
-      seq($.type_identifier, "(", repeat($.expr), ")", $.identifier, ";"),
+      choice(
+        seq(
+          $.type_identifier,
+          optional(seq("<", $.type_argument_list, ">")),
+          "(",
+          repeat(seq($.expr, optional(","))),
+          ")",
+          $.identifier,
+          ";",
+        ),
+        seq(choice($._type, $.type_identifier), $.identifier, ";"),
+      ),
 
     lval: ($) => seq($.identifier, repeat(seq(".", $.identifier))),
+
     fval: ($) =>
-      seq(
-        choice(
-          seq(
-            $.identifier,
-            repeat(seq(".", $.identifier)),
-            seq(".", $.method_identifier),
-          ),
-          $.method_identifier,
+      choice(
+        seq(
+          $.identifier,
+          repeat(seq(".", $.identifier)),
+          seq(".", $.method_identifier),
         ),
+        $.method_identifier,
       ),
 
     method: ($) =>
@@ -362,7 +383,6 @@ module.exports = grammar({
           $.method_identifier,
           seq($.method_identifier, "<", $.type_identifier, ">"),
         ),
-
         $.identifier,
         ",",
       ),
@@ -383,7 +403,11 @@ module.exports = grammar({
     varbit_type: ($) => seq("varbit", "<", $.number, ">"),
     tuple_type: ($) => seq("tuple", "<", $.type_argument_list, ">"),
 
-    type_argument_list: ($) => seq($._type, repeat(seq(",", $._type))),
+    type_argument_list: ($) =>
+      seq(
+        choice($._type, $.type_identifier),
+        repeat(seq(",", choice($._type, $.type_identifier))),
+      ),
 
     type_identifier: ($) => $.identifier,
 
@@ -438,7 +462,7 @@ module.exports = grammar({
       choice(
         seq(
           "#define",
-          choice($.identifier_preproc, $.identifier),
+          $.identifier,
           choice(
             $.number,
             seq("{", optional($.line_continuation), repeat($.field), "}"),