Support skipping explicit %done in external hooks.

Assuming `Foo::X` is a unit type, these two are now equivalent: on Foo::X::%done { } on Foo::X { } Addresses #1465.
zeek · Jul 5, 2023 · cec63b6 · cec63b6
1 parent c049eab
commit cec63b6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/spicy/toolchain/src/compiler/visitors/normalizer.cc b/spicy/toolchain/src/compiler/visitors/normalizer.cc
@@ -136,8 +136,17 @@ struct Visitor : public hilti::visitor::PostOrder<void, Visitor> {
 
             auto resolved = hilti::scope::lookupID<hilti::declaration::Type>(ns, p, "unit type");
             if ( ! resolved ) {
-                p.node.addError(resolved.error());
-                return;
+                // Look up as a type directly. If found, add explicit `%done`.
+                resolved = hilti::scope::lookupID<hilti::declaration::Type>(h.id(), p, "unit type");
+                if ( resolved ) {
+                    logChange(p.node, "adding explicit %done hook");
+                    p.node.as<Hook>().setID(h.id() + ID("0x25_done"));
+                    modified = true;
+                }
+                else {
+                    p.node.addError(resolved.error());
+                    return;
+                }
             }
 
             unit_type_ref = resolved->first->as<hilti::declaration::Type>().typeRef();

diff --git a/tests/Baseline/spicy.types.unit.external-hooks-import/output b/tests/Baseline/spicy.types.unit.external-hooks-import/output
@@ -2,3 +2,5 @@
 FOO init
 FOO a, 1234
 FOO b, 567890
+FOO done 1
+FOO done 2
diff --git a/tests/spicy/types/unit/external-hooks-import.spicy b/tests/spicy/types/unit/external-hooks-import.spicy
@@ -9,6 +9,8 @@ import Mini;
 on Mini::Foo::a { print "FOO a", self.a; }
 on Mini::Foo::b { print "FOO b", self.b; }
 on Mini::Foo::%init { print "FOO init"; }
+on Mini::Foo::%done { print "FOO done 1"; }
+on Mini::Foo { print "FOO done 2"; }
 
 ### @TEST-START-FILE mini.spicy