update and fix locally scala-parser-combinators (#10)

Author: ilya-klyuchnikov

build.sbt

@@ -4,5 +4,5 @@ name := "tapl-scala"
 
 scalacOptions ++= Seq("-deprecation", "-feature")
 
-libraryDependencies += ("org.scala-lang.modules" %% "scala-parser-combinators" % "1.2.0-M2").withDottyCompat(scalaVersion.value)
+libraryDependencies += ("org.scala-lang.modules" %% "scala-parser-combinators" % "1.2.0-M2")
 libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.5" % "test"

src/main/scala/tapl/arith/parser.scala

@@ -40,7 +40,8 @@ object ArithParsers extends StandardTokenParsers with ImplicitConversions {
       case _ => TmSucc(num(x - 1))
     }
 
-  private def eof: Parser[String] = elem("<eof>", _ == lexical.EOF) ^^ { _.chars }
+  private def eof: Parser[String] =
+    elem("<eof>", _ == lexical.EOF) ^^ { _.chars }
 
   def input(s: String): List[Command] =
     phrase(topLevel)(new lexical.Scanner(s)) match {

src/main/scala/tapl/bot/parser.scala

@@ -1,71 +1,31 @@
 package tapl.bot
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 
 object BotParsers extends StandardTokenParsers with PackratParsers with ImplicitConversions {
   import Binding._
   import Command._
   import Term._
   import Ty._
 
-  lexical.reserved ++= Seq(
-    "lambda",
-    "Bool",
-    "true",
-    "false",
-    "if",
-    "then",
-    "else",
-    "Nat",
-    "String",
-    "Unit",
-    "Float",
-    "unit",
-    "case",
-    "let",
-    "in",
-    "succ",
-    "pred",
-    "as",
-    "of",
-    "fix",
-    "iszero",
-    "letrec",
-    "_",
-    "Top",
-    "Bot",
-  )
-  lexical.delimiters ++= Seq(
-    "(",
-    ")",
-    ";",
-    "/",
-    ".",
-    ":",
-    "->",
-    "=",
-    "<",
-    ">",
-    "{",
-    "}",
-    "=>",
-    "==>",
-    ",",
-    "|",
-  )
+  lexical.reserved ++=
+    Seq("lambda", "Top", "Bot")
+  lexical.delimiters ++=
+    Seq("(", ")", ";", ".", ":", "->")
 
-  // lower-case identifier
-  lazy val lcid: PackratParser[String] = ident ^? { case id if id.charAt(0).isLower => id }
-  // upper-case identifier
-  lazy val ucid: PackratParser[String] = ident ^? { case id if id.charAt(0).isUpper => id }
-  lazy val eof: PackratParser[String] = elem("<eof>", _ == lexical.EOF) ^^ { _.chars }
+  private lazy val lcid: PackratParser[String] =
+    ident ^? { case id if id.charAt(0).isLower => id }
+  private lazy val ucid: PackratParser[String] =
+    ident ^? { case id if id.charAt(0).isUpper => id }
+  private lazy val eof: PackratParser[String] =
+    elem("<eof>", _ == lexical.EOF) ^^ { _.chars }
 
   type Res[A] = Context => A
   type Res1[A] = Context => (A, Context)
 
-  lazy val topLevel: PackratParser[Res1[List[Command]]] =
+  private lazy val topLevel: PackratParser[Res1[List[Command]]] =
     ((command <~ ";") ~ topLevel) ^^ {
       case f ~ g =>
         (ctx: Context) =>
@@ -74,57 +34,48 @@ object BotParsers extends StandardTokenParsers with PackratParsers with Implicit
           (cmd1 :: cmds, ctx2)
     } | success { (ctx: Context) => (List(), ctx) }
 
-  lazy val command: PackratParser[Res1[Command]] =
+  private lazy val command: PackratParser[Res1[Command]] =
     lcid ~ binder ^^ { case id ~ bind => (ctx: Context) => (Bind(id, bind(ctx)), ctx.addName(id)) } |
       term ^^ { t => (ctx: Context) =>
         val t1 = t(ctx); (Eval(t1), ctx)
       }
 
-  lazy val binder: Parser[Context => Binding] =
+  private lazy val binder: PackratParser[Res[Binding]] =
     ":" ~> typ ^^ { t => (ctx: Context) => VarBind(t(ctx)) }
 
-  lazy val typ: PackratParser[Res[Ty]] = arrowType
-  lazy val aType: PackratParser[Res[Ty]] =
+  private lazy val typ: PackratParser[Res[Ty]] =
+    arrowType
+  private lazy val aType: PackratParser[Res[Ty]] =
     "(" ~> typ <~ ")" |
       "Bot" ^^ { _ => (ctx: Context) => TyBot } |
       "Top" ^^ { _ => (ctx: Context) => TyTop }
 
-  lazy val fieldTypes: PackratParser[Res[List[(String, Ty)]]] =
-    repsep(fieldType, ",") ^^ { fs => (ctx: Context) =>
-      fs.zipWithIndex.map { case (ft, i) => ft(ctx, i + 1) }
-    }
-
-  lazy val fieldType: PackratParser[(Context, Int) => (String, Ty)] =
-    lcid ~ (":" ~> typ) ^^ { case id ~ ty => (ctx: Context, i: Int) => (id, ty(ctx)) } |
-      typ ^^ { ty => (ctx: Context, i: Int) => (i.toString, ty(ctx)) }
-
-  lazy val arrowType: PackratParser[Res[Ty]] =
+  private lazy val arrowType: PackratParser[Res[Ty]] =
     (aType <~ "->") ~ arrowType ^^ { case t1 ~ t2 => (ctx: Context) => TyArr(t1(ctx), t2(ctx)) } |
       aType
 
-  // TERMS
-  lazy val term: PackratParser[Res[Term]] =
+  private lazy val term: PackratParser[Res[Term]] =
     appTerm |
       ("lambda" ~> lcid) ~ (":" ~> typ) ~ ("." ~> term) ^^ {
         case v ~ ty ~ t => (ctx: Context) => TmAbs(v, ty(ctx), t(ctx.addName(v)))
       } |
       ("lambda" ~ "_") ~> (":" ~> typ) ~ ("." ~> term) ^^ {
         case ty ~ t => (ctx: Context) => TmAbs("_", ty(ctx), t(ctx.addName("_")))
       }
-  lazy val appTerm: PackratParser[Res[Term]] =
+  private lazy val appTerm: PackratParser[Res[Term]] =
     appTerm ~ aTerm ^^ { case t1 ~ t2 => (ctx: Context) => TmApp(t1(ctx), t2(ctx)) } |
       aTerm
 
-  lazy val aTerm: PackratParser[Res[Term]] =
+  private lazy val aTerm: PackratParser[Res[Term]] =
     "(" ~> term <~ ")" |
       lcid ^^ { i => (ctx: Context) => TmVar(ctx.name2index(i), ctx.length) }
 
-  lazy val phraseTopLevel: PackratParser[Res1[List[Command]]] = phrase(topLevel)
+  private lazy val phraseTopLevel: PackratParser[Res1[List[Command]]] =
+    phrase(topLevel)
 
-  def input(s: String) =
+  def input(s: String): Res1[List[Command]] =
     phraseTopLevel(new lexical.Scanner(s)) match {
       case t if t.successful => t.get
       case t                 => sys.error(t.toString)
     }
-
 }

src/main/scala/tapl/equirec/parser.scala

@@ -1,8 +1,8 @@
 package tapl.equirec
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 
 object EquirecParsers extends StandardTokenParsers with PackratParsers with ImplicitConversions {
   import Binding._

src/main/scala/tapl/fullequirec/parser.scala

@@ -1,8 +1,8 @@
 package tapl.fullequirec
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 
 object FullEquirecParsers
     extends StandardTokenParsers

src/main/scala/tapl/fullerror/parser.scala

@@ -1,8 +1,8 @@
 package tapl.fullerror
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 
 object FullErrorParsers extends StandardTokenParsers with PackratParsers with ImplicitConversions {
   import Binding._

src/main/scala/tapl/fullfomsub/parser.scala

@@ -1,8 +1,8 @@
 package tapl.fullfomsub
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 
 import Syntax._
 

src/main/scala/tapl/fullfomsubref/parser.scala

@@ -1,8 +1,8 @@
 package tapl.fullfomsubref
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 import Syntax._
 
 object FullFomSubRefParsers

src/main/scala/tapl/fullfsub/parser.scala

@@ -1,8 +1,8 @@
 package tapl.fullfsub
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 
 object FullFSubParsers extends StandardTokenParsers with PackratParsers with ImplicitConversions {
   import Binding._

src/main/scala/tapl/fullisorec/parser.scala

@@ -1,8 +1,8 @@
 package tapl.fullisorec
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 
 object FullIsorecParsers extends StandardTokenParsers with PackratParsers with ImplicitConversions {
   import Binding._

src/main/scala/tapl/fullomega/parser.scala

@@ -1,8 +1,8 @@
 package tapl.fullomega
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 
 object FullOmegaParsers extends StandardTokenParsers with PackratParsers with ImplicitConversions {
   import Binding._

src/main/scala/tapl/fullpoly/parser.scala

@@ -1,8 +1,8 @@
 package tapl.fullpoly
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 
 object FullPolyParsers extends StandardTokenParsers with PackratParsers with ImplicitConversions {
   import Binding._

src/main/scala/tapl/fullrecon/parser.scala

@@ -1,8 +1,8 @@
 package tapl.fullrecon
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 
 object FullReconParsers extends StandardTokenParsers with PackratParsers with ImplicitConversions {
   import Binding._

src/main/scala/tapl/fullref/parser.scala

@@ -1,8 +1,8 @@
 package tapl.fullref
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 
 object FullRefParsers extends StandardTokenParsers with PackratParsers with ImplicitConversions {
   import Binding._

src/main/scala/tapl/fullsimple/parser.scala

@@ -1,8 +1,8 @@
 package tapl.fullsimple
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 
 object FullSimpleParsers extends StandardTokenParsers with PackratParsers with ImplicitConversions {
   import Binding._

src/main/scala/tapl/fullsub/parser.scala

@@ -1,8 +1,8 @@
 package tapl.fullsub
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 
 object FullSubParsers extends StandardTokenParsers with PackratParsers with ImplicitConversions {
   import Binding._

src/main/scala/tapl/fulluntyped/parser.scala

@@ -1,8 +1,8 @@
 package tapl.fulluntyped
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 
 object FullUntypedParsers
     extends StandardTokenParsers

src/main/scala/tapl/rcdsubbot/parser.scala

@@ -1,8 +1,8 @@
 package tapl.rcdsubbot
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 
 object RcdSubBotParsers extends StandardTokenParsers with PackratParsers with ImplicitConversions {
   import Binding._

src/main/scala/tapl/recon/parser.scala

@@ -1,8 +1,8 @@
 package tapl.recon
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 
 object ReconParsers extends StandardTokenParsers with PackratParsers with ImplicitConversions {
   import Binding._

src/main/scala/tapl/simplebool/parser.scala

@@ -1,8 +1,8 @@
 package tapl.simplebool
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 
 object SimpleBoolParsers extends StandardTokenParsers with PackratParsers with ImplicitConversions {
   import Binding._

src/main/scala/tapl/untyped/parser.scala

@@ -1,8 +1,8 @@
 package tapl.untyped
 
 import scala.util.parsing.combinator.ImplicitConversions
-import scala.util.parsing.combinator.PackratParsers
 import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+import util.PackratParsers
 
 // This parser is done exactly in the same way as in TAPL.
 // The oddity of this parser (elementary parsers return functions) is driven by the desire