Skip to content

Commit

Permalink
implement RuleCall + some naming fixes
Browse files Browse the repository at this point in the history 
CalculatorSpec now mostly works
  • Loading branch information
@jrudolph
jrudolph committed Aug 31, 2021
1 parent 22a969b commit b2356f4
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 17 deletions.
52 changes: 41 additions & 11 deletions parboiled-core/src/main/scala-3/org/parboiled2/ParserMacros.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ private[parboiled2] trait RuleRunnable {

import scala.quoted._
class OpTreeContext(parser: Expr[Parser])(using Quotes) {
import quotes.reflect.*

sealed trait OpTree {
def render(wrapped: Boolean): Expr[Boolean]
}
Expand Down Expand Up @@ -86,8 +88,13 @@ class OpTreeContext(parser: Expr[Parser])(using Quotes) {

protected def renderInner(wrapped: Boolean): Expr[Boolean]
}
sealed abstract class PotentiallyNamedTerminalOpTree extends TerminalOpTree {
// TODO
sealed abstract private class PotentiallyNamedTerminalOpTree(arg: Term) extends TerminalOpTree {
override def bubbleUp: Expr[Nothing] =
callName(arg) match {
case Some(name) =>
'{ $parser.__bubbleUp(RuleTrace.NonTerminal(RuleTrace.Named(${ Expr(name) }), 0) :: Nil, $ruleTraceTerminal) }
case None => super.bubbleUp
}
}

def Sequence(lhs: OpTree, rhs: OpTree): Sequence =
Expand Down Expand Up @@ -201,7 +208,6 @@ class OpTreeContext(parser: Expr[Parser])(using Quotes) {
}
}

import quotes.reflect.*
private case class Action(body: Term, ts: List[TypeTree]) extends DefaultNonTerminalOpTree {
def ruleTraceNonTerminalKey = '{ RuleTrace.Action }

Expand Down Expand Up @@ -317,6 +323,22 @@ class OpTreeContext(parser: Expr[Parser])(using Quotes) {
}
}

private case class RuleCall(call: Either[OpTree, Expr[Rule[_, _]]], calleeNameTree: Expr[String])
extends NonTerminalOpTree {

def bubbleUp(e: Expr[Parser#TracingBubbleException], start: Expr[Int]): Expr[Nothing] =
'{ $e.prepend(RuleTrace.RuleCall, $start).bubbleUp(RuleTrace.Named($calleeNameTree), $start) }

override def render(wrapped: Boolean): Expr[Boolean] = call match {
case Left(_) => super.render(wrapped)
case Right(rule) => '{ $rule ne null }
}
protected def renderInner(start: Expr[Int], wrapped: Boolean): Expr[Boolean] = {
val Left(value) = call
value.render(wrapped)
}
}

case class CharMatch(charTree: Expr[Char]) extends TerminalOpTree {
def ruleTraceTerminal = '{ org.parboiled2.RuleTrace.CharMatch($charTree) }
override def renderInner(wrapped: Boolean): Expr[Boolean] = {
Expand Down Expand Up @@ -427,7 +449,8 @@ class OpTreeContext(parser: Expr[Parser])(using Quotes) {
else '{ $parser.__matchIgnoreCaseString($stringTree) }
}

case class CharPredicateMatch(predicateTree: Expr[CharPredicate]) extends PotentiallyNamedTerminalOpTree {
private case class CharPredicateMatch(predicateTree: Expr[CharPredicate])
extends PotentiallyNamedTerminalOpTree(predicateTree.asTerm) {
def ruleTraceTerminal = '{ org.parboiled2.RuleTrace.CharPredicateMatch($predicateTree) }

override def renderInner(wrapped: Boolean): Expr[Boolean] = {
Expand Down Expand Up @@ -504,6 +527,8 @@ class OpTreeContext(parser: Expr[Parser])(using Quotes) {
}
}

def topLevel(opTree: OpTree, name: Expr[String]): OpTree = RuleCall(Left(opTree), name)

def deconstruct(outerRule: Expr[Rule[_, _]]): OpTree = {
import quotes.reflect.*

Expand Down Expand Up @@ -585,7 +610,12 @@ class OpTreeContext(parser: Expr[Parser])(using Quotes) {
OneOrMore(rec(base), collector(l), Separator(rec(sep)))

case Apply(Apply(TypeApply(Select(_, "capture"), _), List(arg)), _) => Capture(rec(arg))
case _ => Unknown(rule.show, rule.show(using Printer.TreeStructure), outerRule.toString)
case call @ (Apply(_, _) | Select(_, _) | Ident(_) | TypeApply(_, _)) =>
RuleCall(
Right(call.asExprOf[Rule[_, _]]),
Expr(callName(call) getOrElse reportError("Illegal rule call: " + call, call.asExpr))
)
case _ => Unknown(rule.show, rule.show(using Printer.TreeStructure), outerRule.toString)
}
}

Expand Down Expand Up @@ -629,15 +659,15 @@ class OpTreeContext(parser: Expr[Parser])(using Quotes) {
type Separator = Boolean => Expr[Boolean]
private def Separator(op: OpTree): Separator = wrapped => op.render(wrapped)

/*@tailrec
private def callName(tree: Tree): Option[String] =
@tailrec
private def callName(tree: Term): Option[String] =
tree match {
case Ident(name) => Some(name.decodedName.toString)
case Select(_, name) => Some(name.decodedName.toString)
case Ident(name) => Some(name)
case Select(_, name) => Some(name)
case Apply(fun, _) => callName(fun)
case TypeApply(fun, _) => callName(fun)
case _ => None
}*/
}

// tries to match and expand the leaves of the given Tree
private def expand(tree: Tree, wrapped: Boolean): Tree =
Expand Down Expand Up @@ -688,7 +718,7 @@ object ParserMacros {
import quotes.reflect.*

val ctx = new OpTreeContext(parser)
val opTree = ctx.deconstruct(r)
val opTree = ctx.topLevel(ctx.deconstruct(r), name)

'{
def wrapped: Boolean = ${ opTree.render(wrapped = true) }
Expand Down
4 changes: 2 additions & 2 deletions parboiled-core/src/test/scala/org/parboiled2/ActionSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ object ActionSpec extends TestParserSpec {
"abb" must beMatchedWith("bb")
}

"`test`" - new TestParser0 {
/*"`test`" - new TestParser0 {
var flag = true
def targetRule = rule(test(flag))
"x" must beMatched
Expand Down Expand Up @@ -103,7 +103,7 @@ object ActionSpec extends TestParserSpec {
"`run(F2producingHList)`" - new TestParserN[String :: Int :: HNil] {
def targetRule = rule(push(1 :: "X" :: HNil) ~ run((i: Int, x: String) => x :: i :: HNil) ~ EOI)
"" must beMatchedWith("X" :: 1 :: HNil)
}
}*/

// FIXME: problem with TailSwitch, type error
/*"`run(F1producingRule)`" - new TestParser0 {
Expand Down
3 changes: 1 addition & 2 deletions parboiled-core/src/test/scala/org/parboiled2/BasicSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ object BasicSpec extends TestParserSpec {
def targetRule = rule(MATCH ~ EOI)
"" must beMatched
"x" must beMismatched
}
}*/

"called rules" - new TestParser0 {
def targetRule = {
Expand All @@ -166,7 +166,6 @@ object BasicSpec extends TestParserSpec {
def typed[S <: String] = rule(MATCH)
"foo-bar42-baz1337-free" must beMatched
}
*/

"Map[String, T]" - new TestParser1[Int] {
val colors = Map("red" -> 1, "green" -> 2, "blue" -> 3)
Expand Down
4 changes: 3 additions & 1 deletion ...ala-2/org/parboiled2/CalculatorSpec.scala → ...scala/org/parboiled2/CalculatorSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ object CalculatorSpec extends TestParserSpec {
|"""
)

/*
FIXME: first error reporting line is still slightly wrong
"1+2)" must beMismatchedWithErrorMsg(
"""Invalid input ')', expected Digit, '*', '/', '+', '-' or 'EOI' (line 1, column 4):
|1+2)
Expand All @@ -96,7 +98,7 @@ object CalculatorSpec extends TestParserSpec {
| /InputLine/ /Expression/ *:-2 / | / '-'
| /InputLine/ 'EOI'
|"""
)
)*/

"(1+)2" must beMismatchedWithErrorMsg(
"""Invalid input ')', expected Number or Parens (line 1, column 4):
Expand Down
3 changes: 2 additions & 1 deletion parboiled-core/src/test/scala/org/parboiled2/TestParserSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ abstract class TestParserSpec extends TestSuite {
//def beMismatchedWithError(pe: ParseError) = parse(_: String).left.toOption.get === pe
def assertMismatchedWithErrorMsg(expected: String)(str: String): Unit = {
val actual = parse(str).left.toOption.map(formatError(_, errorFormatter)).get
assert(actual == expected.stripMargin)
val expct = expected.stripMargin
assert(actual == expct)
}

def parse(input: String): Either[ParseError, Out] = {
Expand Down

0 comments on commit b2356f4

Please sign in to comment.