Skip to content

fix: if an exception is thrown within an alignment block, the stack will be messed up as it will not pop the token #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolasfara merged 1 commit into from
Jun 16, 2026
Merged

fix: if an exception is thrown within an alignment block, the stack will be messed up as it will not pop the token #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions scafi3-core/src/main/scala/it/unibo/scafi/utils/AlignmentManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ trait AlignmentManager:
val currentPath = Path(stack.toSeq*)
val invocationCount = trace.get(currentPath).map(_ + 1).getOrElse(0)
stack.push(InvocationCoordinate(key, invocationCount))
val result = body()
val _ = stack.pop()
trace.update(currentPath, invocationCount)
result
try body()
finally
val _ = stack.pop()
trace.update(currentPath, invocationCount)
end AlignmentManager
25 changes: 25 additions & 0 deletions scafi3-core/src/test/scala/it/unibo/scafi/utils/AlignmentManagerTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package it.unibo.scafi.utils

import it.unibo.scafi.message.Path

import org.scalatest.flatspec.AnyFlatSpecLike
import org.scalatest.matchers.should

class AlignmentManagerTest extends AnyFlatSpecLike, should.Matchers:
private class Probe extends AlignmentManager:
def path: Path = currentPath
def scope[A](key: String)(body: => A): A = alignmentScope(key)(() => body)

"AlignmentManager" should "restore the stack when an aligned body throws" in:
val probe = Probe()

assertThrows[RuntimeException]:
probe.scope("outer"):
probe.scope("inner"):
throw RuntimeException("boom")

probe.path shouldBe empty

val nextPath = probe.scope("next")(probe.path)
nextPath.map(_.key) shouldBe Seq("next")
end AlignmentManagerTest
Loading