Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'

* origin/topic/bbannier/bump-spicy:
  Bump auxil/spicy to latest development snapshot
This commit is contained in:
Tim Wojtulewicz 2024-07-16 10:16:02 -07:00
commit 9ba7c2ddaf
6 changed files with 14 additions and 5 deletions

View file

@ -1,3 +1,12 @@
7.1.0-dev.12 | 2024-07-16 10:16:02 -0700
* Bump auxil/spicy to latest development snapshot (Benjamin Bannier, Corelight)
This patch bump Spicy to the latest development snapshot. This
introduces a backwards-incompatible change in that it removes support
for a never officially supported syntax to specify unit fields (so I
would argue: not strictly a breaking change).
7.1.0-dev.10 | 2024-07-12 16:02:22 -0700 7.1.0-dev.10 | 2024-07-12 16:02:22 -0700
* CI: Set FETCH_CONTENT_FULLY_DISCONNECTED flag for configure (Tim Wojtulewicz, Corelight) * CI: Set FETCH_CONTENT_FULLY_DISCONNECTED flag for configure (Tim Wojtulewicz, Corelight)

View file

@ -1 +1 @@
7.1.0-dev.10 7.1.0-dev.12

@ -1 +1 @@
Subproject commit 6581b1855a5ea8cc102c66b4ac6a431fc67484a0 Subproject commit 4a1b43ef07d1305a7e88a4f0866068dc49de9d06

View file

@ -15,7 +15,7 @@ public type Request = unit {
switch { switch {
-> : /\/W/ { self.whois = True; } -> : /\/W/ { self.whois = True; }
-> void; -> : void;
}; };
: OptionalWhiteSpace; : OptionalWhiteSpace;

View file

@ -7,7 +7,7 @@ import spicy;
public type Message = unit { public type Message = unit {
switch { switch {
-> prio: Priority; -> prio: Priority;
-> void; -> : void;
}; };
msg: bytes &eod; msg: bytes &eod;

View file

@ -1375,7 +1375,7 @@ bool GlueCompiler::CreateSpicyHook(glue::Event* ev) {
auto attrs = builder()->attributeSet({builder()->attribute("&priority", builder()->integer(ev->priority))}); auto attrs = builder()->attributeSet({builder()->attribute("&priority", builder()->integer(ev->priority))});
auto parameters = hilti::util::transform(ev->parameters, [](const auto& p) { return p.get(); }); auto parameters = hilti::util::transform(ev->parameters, [](const auto& p) { return p.get(); });
auto unit_hook = builder()->declarationHook(parameters, body.block(), ::spicy::Engine::All, attrs, meta); auto unit_hook = builder()->declarationHook(parameters, body.block(), attrs, meta);
auto hook_decl = builder()->declarationUnitHook(ev->hook, unit_hook, meta); auto hook_decl = builder()->declarationUnitHook(ev->hook, unit_hook, meta);
ev->spicy_module->spicy_module->add(context(), hook_decl); ev->spicy_module->spicy_module->add(context(), hook_decl);