Refactor EncodeChoreography to use scopes in a smart way instead of o…

…bfuscating logic with a state machine
utwente-fmt · Mar 4, 2025 · b977a93 · b977a93
1 parent f82ebb2
commit b977a93
Show file tree

Hide file tree

Showing 3 changed files with 204 additions and 210 deletions.
diff --git a/src/col/vct/col/ast/declaration/singular/EndpointImpl.scala b/src/col/vct/col/ast/declaration/singular/EndpointImpl.scala
@@ -29,7 +29,10 @@ trait EndpointImpl[G]
     extends EndpointOps[G] with DeclarationImpl[G] with EndpointFamilyOps[G] {
   this: Endpoint[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("endpoint") <+> ctx.name(this) <+> "=" <+> init)
+    Group(
+      Text("endpoint") <+> ctx.name(this) <> range.map(_.show)
+        .getOrElse(Empty) <+> "=" <+> init <> ";"
+    )
 
   def singleType: TClass[G] = cls.decl.classType(typeArgs)
   def rangeType: TSeq[G] = TSeq(singleType)

diff --git a/src/col/vct/col/util/Scopes.scala b/src/col/vct/col/util/Scopes.scala
@@ -119,6 +119,18 @@ case class Scopes[Pre, Post, PreDecl <: Declaration[
     succeedOnly(pre, post)
   }
 
+  def get(decl: PreDecl): Option[PostDecl] = {
+    for (succ <- successors) {
+      succ.get(decl) match {
+        case Some(postDecl) => return Some(postDecl)
+        case None =>
+      }
+    }
+    None
+  }
+
+  def apply(decl: PreDecl): PostDecl = get(decl).get
+
   def dispatch(
       decl: PreDecl
   )(implicit rw: AbstractRewriter[Pre, Post]): PostDecl = {