From 7cbd8152d8600913827d319b0abe1a232ddf3a65 Mon Sep 17 00:00:00 2001
From: Christian Kreibich <christian@corelight.com>
Date: Tue, 1 Feb 2022 20:03:19 -0800
Subject: [PATCH 01/18] Add README

---
 README.md | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..ee1c48f
--- /dev/null
+++ b/README.md
@@ -0,0 +1,38 @@
+# tree-sitter-zeek
+
+[![Tests](https://github.com/ckreibich/tree-sitter-zeek/actions/workflows/test.yaml/badge.svg)](https://github.com/ckreibich/tree-sitter-zeek/actions/workflows/test.yaml)
+
+A [Zeek](https://zeek.org) grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter).
+
+## Background
+
+This grammar parses scripts written in the [Zeek scripting
+language](https://docs.zeek.org/en/master/script-reference/index.html).
+
+The goal of this grammar is to facilitate tooling around Zeek
+scripts. For that reason, its structure resembles Zeek's grammar but differs in
+a number of ways. For example, it tracks newlines explicitly and relies more
+strongly on precedence and associativity to resolve ambiguities. Like Zeek's
+parser, this one currently doesn't name symbols deeply: for example, the grammar
+features an `expr` rule that covers any kind of expression, but the choices
+aren't currently broken down into, say, `addition_expr`, `or_expr`, and
+similars.
+
+## Usage
+
+To use the generated parser directly (e.g. via any of tree-sitter's
+[language bindings](https://tree-sitter.github.io/tree-sitter/#language-bindings)),
+clone this repository recursively. We maintain a separate
+[git repository](https://github.com/ckreibich/tree-sitter-zeek-src)
+to track generated sources. You do not need the tree-sitter CLI to use
+those sources.
+
+## Building the parser
+
+* Install [tree-sitter](https://tree-sitter.github.io/tree-sitter/creating-parsers#installation) on your machine.
+* Generate the parser: run `tree-sitter generate`.
+
+## Testing
+
+There's currently no `tree-sitter test` testsuite. Instead, a test driver
+clones the Zeek repository and runs on every Zeek script in the distribution.

From ebe4dd4f796dca803654559d0b6903bae2269587 Mon Sep 17 00:00:00 2001
From: Christian Kreibich <christian@corelight.com>
Date: Tue, 1 Feb 2022 20:16:26 -0800
Subject: [PATCH 02/18] Bump generated sources

---
 src | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src b/src
index 769680c..e127f2e 160000
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 769680ca25fe763b4c05a22f0674f10964a684a6
+Subproject commit e127f2e3490ad61fad2e8806a7220720ea6dbfc3

From a5a8a53023beb7c3836e4af78b09c45e907d210a Mon Sep 17 00:00:00 2001
From: Christian Kreibich <christian@corelight.com>
Date: Tue, 1 Feb 2022 20:24:27 -0800
Subject: [PATCH 03/18] Adjust paths to point to github.com/zeek repos

---
 .gitmodules | 2 +-
 README.md   | 4 ++--
 src         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 53461fb..848f81a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src"]
 	path = src
-	url = https://github.com/ckreibich/tree-sitter-zeek-src
+	url = https://github.com/zeek/tree-sitter-zeek-src
diff --git a/README.md b/README.md
index ee1c48f..1bf98fc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # tree-sitter-zeek
 
-[![Tests](https://github.com/ckreibich/tree-sitter-zeek/actions/workflows/test.yaml/badge.svg)](https://github.com/ckreibich/tree-sitter-zeek/actions/workflows/test.yaml)
+[![Tests](https://github.com/zeek/tree-sitter-zeek/actions/workflows/test.yaml/badge.svg)](https://github.com/zeek/tree-sitter-zeek/actions/workflows/test.yaml)
 
 A [Zeek](https://zeek.org) grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter).
 
@@ -23,7 +23,7 @@ similars.
 To use the generated parser directly (e.g. via any of tree-sitter's
 [language bindings](https://tree-sitter.github.io/tree-sitter/#language-bindings)),
 clone this repository recursively. We maintain a separate
-[git repository](https://github.com/ckreibich/tree-sitter-zeek-src)
+[git repository](https://github.com/zeek/tree-sitter-zeek-src)
 to track generated sources. You do not need the tree-sitter CLI to use
 those sources.
 
diff --git a/src b/src
index e127f2e..7a1531d 160000
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit e127f2e3490ad61fad2e8806a7220720ea6dbfc3
+Subproject commit 7a1531db78b4849c991512fe5467bc6b53502dfc

From 1fef7dd765c9190c3fce029d8cec6d082eb9f2e2 Mon Sep 17 00:00:00 2001
From: Christian Kreibich <christian@corelight.com>
Date: Tue, 1 Feb 2022 20:44:08 -0800
Subject: [PATCH 04/18] More README tweaks

---
 README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1bf98fc..a06104c 100644
--- a/README.md
+++ b/README.md
@@ -24,8 +24,11 @@ To use the generated parser directly (e.g. via any of tree-sitter's
 [language bindings](https://tree-sitter.github.io/tree-sitter/#language-bindings)),
 clone this repository recursively. We maintain a separate
 [git repository](https://github.com/zeek/tree-sitter-zeek-src)
-to track generated sources. You do not need the tree-sitter CLI to use
-those sources.
+to track generated sources. You do not need the tree-sitter CLI
+to use those sources in your tooling, but you'll likely want it
+anyway to explore the parser. For example, `tree-sitter parse <script>`
+produces the script's syntax tree, and `tree-sitter highlight <script>`
+shows syntax-highlighted sources.
 
 ## Building the parser
 

From fd649ccffd3638f536ea1027dd56f054dcfbcc39 Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <bbannier@gmail.com>
Date: Fri, 14 Jan 2022 01:53:01 +0100
Subject: [PATCH 05/18] Model function-like decls as top-level decls

The grammar previously treated func, event and hook differently than
other decls. While all other decls where self-contained, these types
leaked an extra header type into the parse tree, and also never had an
id accessible under the decl.

We now introduce dedicated decls for each of these types.
---
 grammar.js             | 12 ++++++------
 queries/highlights.scm |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/grammar.js b/grammar.js
index a3ccbed..b69a353 100644
--- a/grammar.js
+++ b/grammar.js
@@ -37,6 +37,8 @@ module.exports = grammar({
             $.redef_record_decl,
             $.type_decl,
             $.func_decl,
+            $.hook_decl,
+            $.event_decl,
             $.preproc,
         ),
 
@@ -54,7 +56,6 @@ module.exports = grammar({
         redef_enum_decl: $ => seq('redef', 'enum', $.id, '+=', '{', $.enum_body, '}', ';'),
         redef_record_decl: $ => seq('redef', 'record', $.id, '+=', '{', repeat($.type_spec), '}', optional($.attr_list), ';'),
         type_decl: $ => seq('type', $.id, ':', $.type, optional($.attr_list), ';'),
-        func_decl: $ => seq($.func_hdr, repeat($.preproc), $.func_body),
 
         stmt: $ => choice(
             // TODO: @no-test support
@@ -277,13 +278,12 @@ module.exports = grammar({
             prec(-10, $.integer),
         ),
 
-        func_hdr: $ => choice($.func, $.hook, $.event),
-
         // Precedences here are to avoid ambiguity with related expressions
-        func: $ => prec(1, seq('function', $.id, $.func_params, optional($.attr_list))),
-        hook: $ => prec(1, seq('hook', $.id, $.func_params, optional($.attr_list))),
-        event: $ => seq(optional('redef'), 'event', $.id, $.func_params, optional($.attr_list)),
+        func_decl: $ => prec(1, seq('function', $.id, $.func_params, optional($.attr_list), $._func_body)),
+        hook_decl: $ => prec(1, seq('hook', $.id, $.func_params, optional($.attr_list), $._func_body)),
+        event_decl: $ => seq(optional('redef'), 'event', $.id, $.func_params, optional($.attr_list), $._func_body),
 
+        _func_body: $ => seq(repeat($.preproc), $.func_body),
         func_body: $ => seq('{', optional($.stmt_list), '}'),
 
         // Precedence here is to disambiguate other interpretations of the colon
diff --git a/queries/highlights.scm b/queries/highlights.scm
index 29a601b..7483c03 100644
--- a/queries/highlights.scm
+++ b/queries/highlights.scm
@@ -1,9 +1,9 @@
 ;; Language features
 ;; -----------------
 
-(event (id) @function)
-(hook (id) @function)
-(func (id) @function)
+(event_decl (id) @function)
+(hook_decl (id) @function)
+(func_decl (id) @function)
 (type) @type
 (attr) @attribute
 

From 69d17563619c2bbb2e2807ba8e5e3f03fb7df55d Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <bbannier@gmail.com>
Date: Fri, 14 Jan 2022 16:23:49 +0100
Subject: [PATCH 06/18] Hide artifical decl node

This node introduces no new data and serves more as a tool for parser
writers. Consumers of the parser on the other hand need to always unwrap
it at each use.

This patch hides the node from consumers.
---
 grammar.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/grammar.js b/grammar.js
index b69a353..2c0e97f 100644
--- a/grammar.js
+++ b/grammar.js
@@ -22,11 +22,11 @@ module.exports = grammar({
 
     rules: {
         source_file: $ => seq(
-            repeat($.decl),
+            repeat($._decl),
             repeat($.stmt),
         ),
 
-        decl: $ => choice(
+        _decl: $ => choice(
             $.module_decl,
             $.export_decl,
             $.global_decl,
@@ -43,7 +43,7 @@ module.exports = grammar({
         ),
 
         module_decl: $ => seq('module', $.id, ';'),
-        export_decl: $ => seq('export', '{', repeat($.decl), '}'),
+        export_decl: $ => seq('export', '{', repeat($._decl), '}'),
 
         // A change here over Zeek's parser: we make the combo of init class
         // and initializer jointly optional, instead of individually. Helps

From 59e76e06da681dcc1204e0e6dcceedc903d8e72b Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <bbannier@gmail.com>
Date: Thu, 27 Jan 2022 21:03:24 +0100
Subject: [PATCH 07/18] Use `decl` for scoped `local` or `const` declarations

The grammar previously treated scope-local `local` and `const`
declarations differently than `global` or module-level `const`
declarations. This introduced correct constrains on where these
constructs could appear, but also lead to ambiguities which needed to be
worked around by using different matchers for global and local
declarations; these differences made especially local declarations hard
to work with.

This patch completely removes the notion of global decls; instead we now
allow declarations everywhere. This makes matching source-level
declarations anywhere straightforward, but now also allows to parse
invalid inputs (e.g., inputs containing type declarations at function
scope). Such inputs should if needed be instead rejected by a dedicated
validator pass since the grammar allows them.
---
 grammar.js | 54 ++++++++++++++++++++++++------------------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/grammar.js b/grammar.js
index 2c0e97f..7e2a51d 100644
--- a/grammar.js
+++ b/grammar.js
@@ -22,33 +22,16 @@ module.exports = grammar({
 
     rules: {
         source_file: $ => seq(
-            repeat($._decl),
-            repeat($.stmt),
-        ),
-
-        _decl: $ => choice(
-            $.module_decl,
-            $.export_decl,
-            $.global_decl,
-            $.option_decl,
-            $.const_decl,
-            $.redef_decl,
-            $.redef_enum_decl,
-            $.redef_record_decl,
-            $.type_decl,
-            $.func_decl,
-            $.hook_decl,
-            $.event_decl,
-            $.preproc,
+            repeat($._stmt),
         ),
 
         module_decl: $ => seq('module', $.id, ';'),
-        export_decl: $ => seq('export', '{', repeat($._decl), '}'),
+        export_decl: $ => seq('export', '{', repeat($._stmt), '}'),
 
         // A change here over Zeek's parser: we make the combo of init class
         // and initializer jointly optional, instead of individually. Helps
         // avoid ambiguity.
-        global_decl: $ => seq('global', $.id, optional(seq(':', $.type)), optional($.initializer), optional($.attr_list), ';'),
+        var_decl: $ => seq(choice('global', 'local'), $.id, optional(seq(':', $.type)), optional($.initializer), optional($.attr_list), ';'),
         option_decl: $ => seq('option', $.id, optional(seq(':', $.type)), optional($.initializer), optional($.attr_list), ';'),
         const_decl: $ => seq('const', $.id, optional(seq(':', $.type)), optional($.initializer), optional($.attr_list), ';'),
         redef_decl: $ => seq('redef', $.id, optional(seq(':', $.type)), optional($.initializer), optional($.attr_list), ';'),
@@ -57,26 +40,37 @@ module.exports = grammar({
         redef_record_decl: $ => seq('redef', 'record', $.id, '+=', '{', repeat($.type_spec), '}', optional($.attr_list), ';'),
         type_decl: $ => seq('type', $.id, ':', $.type, optional($.attr_list), ';'),
 
-        stmt: $ => choice(
+        _stmt: $ => choice(
+            $.module_decl,
+            $.export_decl,
+            $.option_decl,
+            $.redef_decl,
+            $.redef_enum_decl,
+            $.redef_record_decl,
+            $.type_decl,
+            $.func_decl,
+            $.hook_decl,
+            $.event_decl,
+            $.preproc,
             // TODO: @no-test support
             seq('{', optional($.stmt_list), '}'),
             seq('print', $.expr_list, ';'),
             seq('event', $.event_hdr, ';'),
-            prec_r(seq('if', '(', $.expr, ')', $.stmt, optional(seq('else', $.stmt)))),
+            prec_r(seq('if', '(', $.expr, ')', $._stmt, optional(seq('else', $._stmt)))),
             seq('switch', $.expr, '{', optional($.case_list), '}'),
-            seq('for', '(', $.id, optional(seq(',', $.id)), 'in', $.expr, ')', $.stmt),
-            seq('for', '(', '[', list1($.id, ','), ']', optional(seq(',', $.id)), 'in', $.expr, ')', $.stmt),
-            seq('while', '(', $.expr, ')', $.stmt),
+            seq('for', '(', $.id, optional(seq(',', $.id)), 'in', $.expr, ')', $._stmt),
+            seq('for', '(', '[', list1($.id, ','), ']', optional(seq(',', $.id)), 'in', $.expr, ')', $._stmt),
+            seq('while', '(', $.expr, ')', $._stmt),
             seq(choice('next', 'break', 'fallthrough'), ';'),
             seq('return', optional($.expr), ';'),
             seq(choice('add', 'delete'), $.expr, ';'),
-            seq('local', $.id, optional(seq(':', $.type)), optional($.initializer), optional($.attr_list), ';'),
-            // Precedence here works around ambiguity with similar global declaration:
-            prec(-1, seq('const', $.id, optional(seq(':', $.type)), optional($.initializer), optional($.attr_list), ';')),
+            // List these here instead of with the other decls since they can also appear on stmt block scope.
+            $.var_decl,
+            $.const_decl,
             // Associativity here works around theoretical ambiguity if "when" nested:
             prec_r(seq(
                 optional('return'),
-                'when', optional($.capture_list), '(', $.expr, ')', $.stmt,
+                'when', optional($.capture_list), '(', $.expr, ')', $._stmt,
                 optional(seq('timeout', $.expr, '{', optional($.stmt_list), '}')),
             )),
             seq($.index_slice, '=', $.expr, ';'),
@@ -86,7 +80,7 @@ module.exports = grammar({
             ';',
         ),
 
-        stmt_list: $ => repeat1($.stmt),
+        stmt_list: $ => repeat1($._stmt),
 
         case_list: $ => repeat1(
             choice(

From b52e2145224a56011317e2c55ca8a08da3af1c55 Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <bbannier@users.noreply.github.com>
Date: Wed, 2 Feb 2022 10:41:50 +0100
Subject: [PATCH 08/18] fixup! Use `decl` for scoped `local` or `const`
 declarations

---
 grammar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grammar.js b/grammar.js
index 7e2a51d..62fd211 100644
--- a/grammar.js
+++ b/grammar.js
@@ -246,7 +246,7 @@ module.exports = grammar({
 
             seq('(', $.expr, ')'),
             seq('copy', '(', $.expr, ')'),
-            prec_r(seq('hook', $.expr)),
+            prec_r(seq('hook', $.id, '(', optional(list1($.expr, ',')), ')')),
             seq($.expr, '?$', $.id),
             seq('schedule', $.expr, '{', $.event_hdr, '}'),
             seq('function', $.begin_lambda, $.func_body),

From 9939d22aaf0b2757b68da57923514eff7beb97bc Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <bbannier@gmail.com>
Date: Sat, 29 Jan 2022 23:35:39 +0100
Subject: [PATCH 09/18] Surface field access and check

In order for users to match nodes of the form

    r$field
    r?$field

they should be named.

This patch introduces them as nodes named `field_access` and
`field_check`.
---
 grammar.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/grammar.js b/grammar.js
index 62fd211..0099976 100644
--- a/grammar.js
+++ b/grammar.js
@@ -190,7 +190,7 @@ module.exports = grammar({
         expr: $ => choice(
             prec_l(7, seq($.expr, '[', $.expr_list, ']')),
             prec_l(7, seq($.expr, $.index_slice)),
-            prec_l(7, seq($.expr, '$', $.id)),
+            prec_l(7, $.field_access),
 
             prec_r(6, seq('|', $.expr, '|')),
             prec_r(6, seq('++', $.expr)),
@@ -247,7 +247,7 @@ module.exports = grammar({
             seq('(', $.expr, ')'),
             seq('copy', '(', $.expr, ')'),
             prec_r(seq('hook', $.id, '(', optional(list1($.expr, ',')), ')')),
-            seq($.expr, '?$', $.id),
+            $.field_check,
             seq('schedule', $.expr, '{', $.event_hdr, '}'),
             seq('function', $.begin_lambda, $.func_body),
 
@@ -255,6 +255,9 @@ module.exports = grammar({
             prec_r(-1, seq('local', $.id, '=', $.expr)),
         ),
 
+        field_access: $ => prec_l(seq($.expr, '$', $.id)),
+        field_check: $ => prec_l(seq($.expr, '?$', $.id)),
+
         expr_list: $ => list1($.expr, ','),
 
         constant: $ => choice(

From e8f5db8e27a172be48b6af0ccb3a5fe6146cf8ab Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <bbannier@users.noreply.github.com>
Date: Tue, 15 Feb 2022 10:46:33 +0100
Subject: [PATCH 10/18] Expose for loops as node

---
 grammar.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/grammar.js b/grammar.js
index 0099976..0fad4b9 100644
--- a/grammar.js
+++ b/grammar.js
@@ -58,8 +58,7 @@ module.exports = grammar({
             seq('event', $.event_hdr, ';'),
             prec_r(seq('if', '(', $.expr, ')', $._stmt, optional(seq('else', $._stmt)))),
             seq('switch', $.expr, '{', optional($.case_list), '}'),
-            seq('for', '(', $.id, optional(seq(',', $.id)), 'in', $.expr, ')', $._stmt),
-            seq('for', '(', '[', list1($.id, ','), ']', optional(seq(',', $.id)), 'in', $.expr, ')', $._stmt),
+            $.for,
             seq('while', '(', $.expr, ')', $._stmt),
             seq(choice('next', 'break', 'fallthrough'), ';'),
             seq('return', optional($.expr), ';'),
@@ -80,6 +79,11 @@ module.exports = grammar({
             ';',
         ),
 
+        for: $ => choice(
+            seq('for', '(', $.id, optional(seq(',', $.id)), 'in', $.expr, ')', $._stmt),
+            seq('for', '(', '[', list1($.id, ','), ']', optional(seq(',', $.id)), 'in', $.expr, ')', $._stmt)
+        ),
+
         stmt_list: $ => repeat1($._stmt),
 
         case_list: $ => repeat1(

From e99bf351009dab3be09ce009e66b1e6578c2f0db Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <benjamin.bannier@corelight.com>
Date: Thu, 30 Mar 2023 11:47:38 +0200
Subject: [PATCH 11/18] Fix extraction of enum value doc strings

This is a workaround for zeek/tree-sitter-zeek#15.
---
 grammar.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/grammar.js b/grammar.js
index 0fad4b9..066304a 100644
--- a/grammar.js
+++ b/grammar.js
@@ -36,7 +36,7 @@ module.exports = grammar({
         const_decl: $ => seq('const', $.id, optional(seq(':', $.type)), optional($.initializer), optional($.attr_list), ';'),
         redef_decl: $ => seq('redef', $.id, optional(seq(':', $.type)), optional($.initializer), optional($.attr_list), ';'),
 
-        redef_enum_decl: $ => seq('redef', 'enum', $.id, '+=', '{', $.enum_body, '}', ';'),
+        redef_enum_decl: $ => seq('redef', 'enum', $.id, '+=', '{', $._enum_body, '}', ';'),
         redef_record_decl: $ => seq('redef', 'record', $.id, '+=', '{', repeat($.type_spec), '}', optional($.attr_list), ';'),
         type_decl: $ => seq('type', $.id, ':', $.type, optional($.attr_list), ';'),
 
@@ -115,7 +115,7 @@ module.exports = grammar({
             'timer',
             seq('record', '{', repeat($.type_spec), '}'),
             seq('union', '{', list1($.type, ','), '}'),
-            seq('enum', '{', $.enum_body, '}'),
+            seq('enum', '{', $._enum_body, '}'),
             'list',
             seq('list', 'of', $.type),
             seq('vector', 'of', $.type),
@@ -128,7 +128,7 @@ module.exports = grammar({
             $.id,
         ),
 
-        enum_body: $ => list1($.enum_body_elem, ',', true),
+        _enum_body: $ => list1($.enum_body_elem, ',', true),
 
         enum_body_elem: $ => choice(
             seq($.id, '=', $.constant, optional($.deprecated)),

From d7e485bf34a51fd16702d66d7566a2ff44052914 Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <benjamin.bannier@corelight.com>
Date: Fri, 25 Aug 2023 09:28:32 +0200
Subject: [PATCH 12/18] Backport 41494c8dc13930754a3ab8b72520bf6562fa29c7

---
 grammar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grammar.js b/grammar.js
index 066304a..aac2c27 100644
--- a/grammar.js
+++ b/grammar.js
@@ -165,7 +165,7 @@ module.exports = grammar({
         attr_list: $ => prec_l(repeat1($.attr)),
 
         attr: $ => prec_l(choice(
-            '&broker_store_allow_complex_type',
+            '&broker_allow_complex_type',
             '&deprecated',
             '&error_handler',
             '&is_assigned',

From 01d9a6ff6742bbd08a89af8c7f5503b5dc761d65 Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <benjamin.bannier@corelight.com>
Date: Sat, 16 Dec 2023 11:37:38 +0100
Subject: [PATCH 13/18] Add proper parsing for function calls

This works around the issue reported in zeek/zeekscript#69.
---
 grammar.js              |  1 +
 test/corpus/expressions | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 test/corpus/expressions

diff --git a/grammar.js b/grammar.js
index aac2c27..05a7e14 100644
--- a/grammar.js
+++ b/grammar.js
@@ -242,6 +242,7 @@ module.exports = grammar({
             prec_l(1, seq('table', '(', optional($.expr_list), ')', optional($.attr_list))),
             prec_l(1, seq('set', '(', optional($.expr_list), ')', optional($.attr_list))),
             prec_l(1, seq('vector', '(', optional($.expr_list), ')')),
+            prec_l(1, seq($.id, '(', optional($.expr_list), ')')),
             prec_l(1, seq($.expr, '(', optional($.expr_list), ')')),
 
             $.id,
diff --git a/test/corpus/expressions b/test/corpus/expressions
new file mode 100644
index 0000000..ee81ae6
--- /dev/null
+++ b/test/corpus/expressions
@@ -0,0 +1,37 @@
+================================================================================
+Function call
+================================================================================
+
+1;
+f(1);
+f(1) + f(1);
+
+--------------------------------------------------------------------------------
+
+(source_file
+  (nl)
+  (expr
+    (constant
+      (integer)))
+  (nl)
+  (expr
+    (id)
+    (expr_list
+      (expr
+        (constant
+          (integer)))))
+  (nl)
+  (expr
+    (expr
+      (id)
+      (expr_list
+        (expr
+          (constant
+            (integer)))))
+    (expr
+      (id)
+      (expr_list
+        (expr
+          (constant
+            (integer))))))
+  (nl))

From a004d85d502e769e43444423b30445d6f67f9106 Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Mon, 21 Nov 2022 10:46:16 +0100
Subject: [PATCH 14/18] Add &group attribute to grammar

(cherry picked from commit e694eba7c1732fc8a9e14030b42359e9598870ca)
---
 grammar.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/grammar.js b/grammar.js
index 05a7e14..49f9d97 100644
--- a/grammar.js
+++ b/grammar.js
@@ -182,6 +182,7 @@ module.exports = grammar({
             seq('&deprecated', '=', $.string),
             seq('&delete_func', '=', $.expr),
             seq('&expire_func', '=', $.expr),
+            seq('&group', '=', $.expr),
             seq('&on_change', '=', $.expr),
             seq('&priority', '=', $.expr),
             seq('&read_expire', '=', $.expr),

From e422b04ebea473d85bfc2a0b73a7d31d27caa43a Mon Sep 17 00:00:00 2001
From: Christian Kreibich <christian@corelight.com>
Date: Wed, 25 Jan 2023 23:12:38 -0800
Subject: [PATCH 15/18] Fix parsing of "minor" comments

Their pattern accidentally allowed newline characters to slip in if they
followed right after the "#", i.e., empty comments could accidentally be parsed
by swallowing the subsequent line.

(cherry picked from commit b49261434343f54f394e083ebe9bd1a5b53221f7)
---
 grammar.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/grammar.js b/grammar.js
index 49f9d97..9fdfa0c 100644
--- a/grammar.js
+++ b/grammar.js
@@ -350,8 +350,6 @@ module.exports = grammar({
         // Plain string characters or escape sequences, wrapped in double-quotes.
         string: $ => /"([^\\\r\n\"]|\\([^\r\n]|[0-7]+|x[0-9a-fA-F]+))*"/,
         
-        minor_comment: $ => /#[^#][^\r\n]*/,
-
         // Zeekygen comments come in three flavors: a head one at the beginning
         // of a script (##!), one that refers to the previous node (##<), and
         // ones that refer to the subsequent one. Note that we skip the final
@@ -360,6 +358,8 @@ module.exports = grammar({
         zeekygen_prev_comment: $ => /##<[^\r\n]*/,
         zeekygen_next_comment: $ => /##[^\r\n]*/,
 
+        minor_comment: $ => /#[^\r\n]*/,
+
         // We track newlines explicitly -- this gives us the ability to honor
         // existing formatting in select places.
         nl: $ => /\r?\n/,
@@ -368,9 +368,9 @@ module.exports = grammar({
     'extras': $ => [
         /[ \t]+/,
         $.nl,
-        $.minor_comment,
         $.zeekygen_head_comment,
         $.zeekygen_prev_comment,
         $.zeekygen_next_comment,
+        $.minor_comment,
     ],
 });

From 94b946e866991e290fd07a1e2edaa9b77873258d Mon Sep 17 00:00:00 2001
From: Christian Kreibich <christian@corelight.com>
Date: Thu, 16 Mar 2023 18:52:02 -0700
Subject: [PATCH 16/18] Fix "{}"-initializers in expressions, and support
 trailing commas

This adds support for "{ ... }-style table/set initializers in assignment
expressions (as opposed to declarations, where they already existed), as well as
the recently introduced trailing commas.

This removes the `init` token since it's now fully covered by expressions.

(cherry picked from commit e5ca3ffaa3e3cbb2ba8ec8179a8e5b96e04d9e06)
---
 grammar.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/grammar.js b/grammar.js
index 9fdfa0c..8f190e1 100644
--- a/grammar.js
+++ b/grammar.js
@@ -151,17 +151,11 @@ module.exports = grammar({
 
         initializer: $ => seq(
             optional($.init_class),
-            $.init,
+            $.expr,
         ),
 
         init_class: $ => prec_r(choice('=', '+=', '-=')),
 
-        init: $ => choice(
-            seq('{', '}'),
-            seq('{', repeat(seq($.expr, ',')), $.expr, '}'),
-            $.expr,
-        ),
-
         attr_list: $ => prec_l(repeat1($.attr)),
 
         attr: $ => prec_l(choice(
@@ -239,6 +233,7 @@ module.exports = grammar({
             prec(2, seq('$', $.id, $.begin_lambda, '=', $.func_body)),
 
             prec_l(1, seq('[', optional($.expr_list), ']')),
+            prec_l(1, seq('{', optional($.expr_list), '}')),
             prec_l(1, seq('record', '(', $.expr_list, ')')),
             prec_l(1, seq('table', '(', optional($.expr_list), ')', optional($.attr_list))),
             prec_l(1, seq('set', '(', optional($.expr_list), ')', optional($.attr_list))),
@@ -264,7 +259,7 @@ module.exports = grammar({
         field_access: $ => prec_l(seq($.expr, '$', $.id)),
         field_check: $ => prec_l(seq($.expr, '?$', $.id)),
 
-        expr_list: $ => list1($.expr, ','),
+        expr_list: $ => list1($.expr, ',', true),
 
         constant: $ => choice(
             // Associativity here resolves ambiguity with division

From a0fd27eaf8c7182fb9a53bd52ee7661dc726082e Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <bbannier@gmail.com>
Date: Mon, 4 Mar 2024 09:29:05 +0100
Subject: [PATCH 17/18] Add GH dependabot setup

---
 .github/CODEOWNERS     |  1 +
 .github/dependabot.yml | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 .github/CODEOWNERS
 create mode 100644 .github/dependabot.yml

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000..b0a45b0
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @bbannier
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..6d5c932
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,14 @@
+version: 2
+updates:
+  - package-ecosystem: "cargo" # See documentation for possible values
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/vscode"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/"
+    schedule:
+      interval: "weekly"

From 0695ab8aae9a450c779bb860fec6ff251b3de37f Mon Sep 17 00:00:00 2001
From: Benjamin Bannier <bbannier@gmail.com>
Date: Mon, 5 Aug 2024 19:03:15 +0200
Subject: [PATCH 18/18] Fix parsing of globals in >=zeek-7

---
 grammar.js              |  2 +-
 test/corpus/expressions | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/grammar.js b/grammar.js
index 8f190e1..618ba4c 100644
--- a/grammar.js
+++ b/grammar.js
@@ -313,7 +313,7 @@ module.exports = grammar({
 
         event_hdr: $ => seq($.id, '(', optional($.expr_list), ')'),
 
-        id: $ => /[A-Za-z_][A-Za-z_0-9]*(::[A-Za-z_][A-Za-z_0-9]*)*/,
+        id: () => /(([A-Za-z_][A-Za-z_0-9]*)?::)?[A-Za-z_][A-Za-z_0-9]*/,
         file: $ => /[^ \t\r\n]+/,
         pattern: $ => /\/((\\\/)?[^\r\n\/]?)*\/i?/,
 
diff --git a/test/corpus/expressions b/test/corpus/expressions
index ee81ae6..4e1a88a 100644
--- a/test/corpus/expressions
+++ b/test/corpus/expressions
@@ -35,3 +35,25 @@ f(1) + f(1);
           (constant
             (integer))))))
   (nl))
+
+================================================================================
+Global IDs
+================================================================================
+
+global x: ::X;
+global x: GLOBAL::X;
+
+---
+
+(source_file
+  (nl)
+  (var_decl
+    (id)
+    (type
+      (id)))
+  (nl)
+  (var_decl
+    (id)
+    (type
+      (id)))
+  (nl))