diff --git a/info/labs/lab03/material/scallion-playground/project/build.properties b/info/labs/lab03/material/scallion-playground/project/build.properties index 10fd9eee04ac574059d24caf1482e72ebf2d40b3..73df629ac1a71e9f7a1c2a1b576bfa037a6142bd 100755 --- a/info/labs/lab03/material/scallion-playground/project/build.properties +++ b/info/labs/lab03/material/scallion-playground/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.5 +sbt.version=1.10.7 diff --git a/info/labs/lab03/material/scallion-playground/src/main/scala/calculator/Calculator.scala b/info/labs/lab03/material/scallion-playground/src/main/scala/calculator/Calculator.scala index d1164f6b10da34080432a3e8091940e17ec9e9d6..fd6eb928557761cfe0e0dc89a59d4daa8c57abf8 100644 --- a/info/labs/lab03/material/scallion-playground/src/main/scala/calculator/Calculator.scala +++ b/info/labs/lab03/material/scallion-playground/src/main/scala/calculator/Calculator.scala @@ -15,8 +15,8 @@ package calculator -import silex._ -import scallion._ +import scallion.* +import silex.* sealed trait Token case class NumberToken(value: Int) extends Token @@ -148,8 +148,8 @@ object CalcParser extends Parsers { // // lazy val expr: Syntax[Expr] = recursive { // operators(factor)( - // times | div is LeftAssociative, - // plus | minus is LeftAssociative + // (times | div).is(LeftAssociative), + // (plus | minus).is(LeftAssociative) // ) { // case (l, op, r) => BinaryExpr(op, l, r) // }