Skip to content
Snippets Groups Projects
Commit 6bf5ecc2 authored by Samuel Chassot's avatar Samuel Chassot
Browse files

Merge branch 'fix/scallion-playground' into 'main'

Fix scallion playground

See merge request lara/cs320!10
parents 25ecfbb9 c462b9e9
No related branches found
No related tags found
No related merge requests found
sbt.version=1.5.5 sbt.version=1.10.7
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
package calculator package calculator
import silex._ import scallion.*
import scallion._ import silex.*
sealed trait Token sealed trait Token
case class NumberToken(value: Int) extends Token case class NumberToken(value: Int) extends Token
...@@ -148,8 +148,8 @@ object CalcParser extends Parsers { ...@@ -148,8 +148,8 @@ object CalcParser extends Parsers {
// //
// lazy val expr: Syntax[Expr] = recursive { // lazy val expr: Syntax[Expr] = recursive {
// operators(factor)( // operators(factor)(
// times | div is LeftAssociative, // (times | div).is(LeftAssociative),
// plus | minus is LeftAssociative // (plus | minus).is(LeftAssociative)
// ) { // ) {
// case (l, op, r) => BinaryExpr(op, l, r) // case (l, op, r) => BinaryExpr(op, l, r)
// } // }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment