Allow optional globals be omitted.

tree-sitter · Jun 12, 2024 · 64e7539 · 64e7539
1 parent 1448489
commit 64e7539
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 2 deletions.
diff --git a/src/execution.rs b/src/execution.rs
@@ -68,9 +68,17 @@ impl File {
         for global in &self.globals {
             match globals.get(&global.name) {
                 None => {
-                    if let Some(default) = &global.default {
+                    let default_or_null = global
+                        .default
+                        .as_ref()
+                        .map(|default| default.to_string().into())
+                        .or_else(|| {
+                            (global.quantifier == CaptureQuantifier::ZeroOrOne)
+                                .then_some(Value::Null)
+                        });
+                    if let Some(default_or_null) = default_or_null {
                         globals
-                            .add(global.name.clone(), default.to_string().into())
+                            .add(global.name.clone(), default_or_null)
                             .map_err(|_| {
                                 ExecutionError::DuplicateVariable(format!(
                                     "global variable {} already defined",

diff --git a/tests/it/execution.rs b/tests/it/execution.rs
@@ -290,6 +290,28 @@ fn can_omit_global_variable_with_default() {
     );
 }
 
+#[test]
+fn can_omit_optional_global_variable() {
+    check_execution(
+        "pass",
+        indoc! {r#"
+          global pkgname?
+
+          (module)
+          {
+            node n
+            if (is-null pkgname) {
+              attr (n) pkgname = "none"
+            }
+          }
+        "#},
+        indoc! {r#"
+          node 0
+            pkgname: "none"
+    "#},
+    );
+}
+
 #[test]
 fn cannot_omit_global_variable() {
     fail_execution(

diff --git a/tests/it/lazy_execution.rs b/tests/it/lazy_execution.rs
@@ -291,6 +291,28 @@ fn can_omit_global_variable_with_default() {
     );
 }
 
+#[test]
+fn can_omit_optional_global_variable() {
+    check_execution(
+        "pass",
+        indoc! {r#"
+          global pkgname?
+
+          (module)
+          {
+            node n
+            if (is-null pkgname) {
+              attr (n) pkgname = "none"
+            }
+          }
+        "#},
+        indoc! {r#"
+          node 0
+            pkgname: "none"
+    "#},
+    );
+}
+
 #[test]
 fn cannot_omit_global_variable() {
     fail_execution(