Imperial-MEng/WACC_37
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use GOps to avoid scala error

Browse Source
This commit is contained in:
Gleb Koval
2025-03-13 13:37:17 +00:00
parent 6904aa37e4
commit 0497dd34a0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/wacc/frontend/parser.scala
View File

@@ -5,7 +5,7 @@ import parsley.Result
import parsley.Parsley import parsley.Parsley
import parsley.Parsley.{atomic, many, notFollowedBy, pure, unit} import parsley.Parsley.{atomic, many, notFollowedBy, pure, unit}
import parsley.combinator.{countSome, sepBy, option} import parsley.combinator.{countSome, sepBy, option}
import parsley.expr.{precedence, SOps, InfixL, InfixN, /*InfixR,*/ Prefix, Atoms} import parsley.expr.{precedence, SOps, InfixL, InfixN, InfixR, Prefix, Atoms}
import parsley.errors.combinator._ import parsley.errors.combinator._
import parsley.errors.patterns.VerifiedErrors import parsley.errors.patterns.VerifiedErrors
import parsley.syntax.zipped._ import parsley.syntax.zipped._
@@ -14,6 +14,7 @@ import cats.data.NonEmptyList
import parsley.errors.DefaultErrorBuilder import parsley.errors.DefaultErrorBuilder
import parsley.errors.ErrorBuilder import parsley.errors.ErrorBuilder
import parsley.errors.tokenextractors.LexToken import parsley.errors.tokenextractors.LexToken
import parsley.expr.GOps
object parser { object parser {
import lexer.implicits.implicitSymbol import lexer.implicits.implicitSymbol
@@ -75,9 +76,9 @@ object parser {
// Expressions // Expressions
private lazy val `<expr>`: FParsley[Expr] = precedence { private lazy val `<expr>`: FParsley[Expr] = precedence {
// SOps(InfixR)(Or from "||") +: GOps(InfixR)(Or from "||") +:
// SOps(InfixR)(And from "&&") +: GOps(InfixR)(And from "&&") +:
SOps(InfixN)(Eq from "==", Neq from "!=") +: SOps(InfixN)(Eq from "==", Neq from "!=") +:
SOps(InfixN)( SOps(InfixN)(
Less from "<", Less from "<",
LessEq from "<=", LessEq from "<=",