Move builtins resolution to effekt.symbols.builtins

Author: timsueberkrueb

effekt/jvm/src/test/scala/effekt/core/TestRenamer.scala

@@ -1,6 +1,7 @@
 package effekt.core
 
 import effekt.{Template, core, symbols}
+import effekt.symbols.builtins
 
 /**
  * Freshens bound names in a given term for tests.
@@ -45,7 +46,7 @@ class TestRenamer(names: Names = Names(Map.empty)) extends core.Tree.Rewrite {
   // We use a separate pass to collect all top-level ids, so that we can distinguish them from free variables.
   override def id: PartialFunction[core.Id, core.Id] = {
     case id =>
-      if (isBuiltin(id)) {
+      if (builtins.isCoreBuiltin(id)) {
         // builtin, do not rename
         id
       } else if (toplevelScope.contains(id)) {

effekt/shared/src/main/scala/effekt/core/Parser.scala

@@ -3,6 +3,7 @@ package core
 
 import effekt.core.Type.{PromptSymbol, ResumeSymbol}
 import effekt.source.{FeatureFlag, Span}
+import effekt.symbols.builtins
 import effekt.util.messages.{ErrorReporter, ParseError}
 import kiama.parsing.{NoSuccess, ParseResult, Parsers, Success}
 import kiama.util.{Position, Range, Source, StringSource}
@@ -11,7 +12,7 @@ class Names(private var knownNames: Map[String, Id]) {
   private val Suffix = """^(.*)\$(\d+)$""".r
 
   def idFor(name: String): Id =
-    builtinSymbolFromString(name).getOrElse {
+    builtins.coreBuiltinSymbolFromString(name).getOrElse {
       knownNames.getOrElse(name, {
         val id = name match {
           case Suffix(base, n) => Id(base, n.toInt)

effekt/shared/src/main/scala/effekt/core/PrettyPrinter.scala

@@ -112,7 +112,7 @@ object PrettyPrinter extends ParenPrettyPrinter {
   //def toDoc(n: Name): Doc = n.toString
 
   def toDoc(s: symbols.Symbol): Doc = {
-    builtinSymbolToString(s).getOrElse(s.name.name ++ "$" ++ s.id.toString)
+    builtins.coreBuiltinSymbolToString(s).getOrElse(s.name.name ++ "$" ++ s.id.toString)
   }
 
   def toDoc(e: Expr): Doc = e match {
@@ -323,19 +323,3 @@ object PrettyPrinter extends ParenPrettyPrinter {
     multi <> string(s) <> multi
   }
 }
-
-val builtins: Map[String, symbols.Symbol] = {
-  symbols.builtins.rootTypes
-    ++ symbols.builtins.rootCaptures
-    + ("Resume" -> ResumeSymbol)
-    + ("Prompt" -> PromptSymbol)
-    + ("Ref" -> effekt.symbols.builtins.TState.interface)
-}
-
-def isBuiltin(s: symbols.Symbol): Boolean =
-  builtins.contains(s.name.name) && builtins(s.name.name) == s
-
-def builtinSymbolToString(s: symbols.Symbol): Option[String] =
-  if isBuiltin(s) then Some(s.name.name) else None
-
-def builtinSymbolFromString(s: String): Option[symbols.Symbol] = builtins.get(s)

effekt/shared/src/main/scala/effekt/symbols/builtins.scala

@@ -3,6 +3,7 @@ package symbols
 
 import effekt.source.{Many, ModuleDecl, NoSource, Span}
 import effekt.context.Context
+import effekt.core.Type.{PromptSymbol, ResumeSymbol}
 import effekt.symbols.ErrorMessageInterpolator
 import effekt.util.messages.ErrorMessageReifier
 import kiama.util.StringSource
@@ -101,4 +102,20 @@ object builtins {
   lazy val rootBindings: Bindings =
     Bindings(Map.empty, rootTypes, rootCaptures, Map("effekt" -> Bindings(Map.empty, rootTypes, rootCaptures, Map.empty)))
 
+  // All built-in symbols that can occur in core programs
+  val coreBuiltins: Map[String, symbols.Symbol] = {
+    symbols.builtins.rootTypes
+      ++ symbols.builtins.rootCaptures
+      + ("Resume" -> ResumeSymbol)
+      + ("Prompt" -> PromptSymbol)
+      + ("Ref" -> effekt.symbols.builtins.TState.interface)
+  }
+
+  def isCoreBuiltin(s: symbols.Symbol): Boolean =
+    coreBuiltins.contains(s.name.name) && coreBuiltins(s.name.name) == s
+
+  def coreBuiltinSymbolToString(s: symbols.Symbol): Option[String] =
+    if isCoreBuiltin(s) then Some(s.name.name) else None
+
+  def coreBuiltinSymbolFromString(s: String): Option[symbols.Symbol] = coreBuiltins.get(s)
 }