From c462b9e9b7be7db59449fb88a446e713248ca3a4 Mon Sep 17 00:00:00 2001
From: shilangyu <xmarcinmarcin@gmail.com>
Date: Wed, 19 Mar 2025 14:46:51 +0100
Subject: [PATCH] Fix scallion playground
---
.../material/scallion-playground/project/build.properties | 2 +-
.../src/main/scala/calculator/Calculator.scala | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/info/labs/lab03/material/scallion-playground/project/build.properties b/info/labs/lab03/material/scallion-playground/project/build.properties
index 10fd9ee..73df629 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 d1164f6..fd6eb92 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)
// }
--
GitLab