Skip to content

Commit 457dd25

Browse files
committed
Fix eventSys open symbol normalization
1 parent 6f57fae commit 457dd25

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/necsus/compiletime/parse.nim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,11 +406,11 @@ proc getPrefixArgs(
406406
if args.len <= 0:
407407
error("Expecting at least one parameter for system", system)
408408
else:
409-
result = @[args[0]]
409+
result = @[args[0].normalize]
410410
args = args[1 ..^ 1]
411411
else:
412412
instancing.get.expectKind(nnkProcTy)
413-
result = @[instancing.get.params[1]]
413+
result = @[instancing.get.params[1].normalize]
414414
of StartupPhase, LoopPhase, TeardownPhase, SaveCallback:
415415
discard
416416

tests/t_event_open_sym.nim

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ template buildTestSystems*(systemName: untyped, T: typedesc[enum]) =
1818
proc sendTwo(trigger: Outbox[OpenSymbol[T]]) =
1919
trigger((C, 3))
2020

21-
proc systemName(values: Inbox[OpenSymbol[T]]) {.depends(sendOne, sendTwo).} =
21+
proc receive(value: OpenSymbol[T], eventSysCalled: Shared[bool]) {.eventSys.} =
22+
eventSysCalled := true
23+
24+
proc systemName(values: Inbox[OpenSymbol[T]]) {.depends(sendOne, sendTwo, receive).} =
2225
check(values.toSeq == @[(A, 1), (B, 2), (C, 3)])
2326

2427
buildTestSystems(testSystem, SomeEnum)
@@ -29,8 +32,9 @@ proc buildSend[T](): auto =
2932

3033
let externalSend = buildSend[SomeEnum]()
3134

32-
proc runner(tick: proc(): void) =
35+
proc runner(eventSysCalled: Shared[bool], tick: proc(): void) =
3336
tick()
37+
check eventSysCalled.get()
3438

3539
proc myApp() {.necsus(runner, [~externalSend, ~testSystem], newNecsusConf()).}
3640

0 commit comments

Comments
 (0)