Skip to content

added andAlso as a conjunctive syntax combinator #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gnush wants to merge 3 commits into
base: master
Choose a base branch
from
Open

added andAlso as a conjunctive syntax combinator #3

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
227b6a4
added andAlso as a conjunctive syntax combinator
May 2, 2015
5e78c02
Merge branch 'master' of github.com:seba--/incremental
May 20, 2015
840bc02
Merge remote-tracking branch 'upstream/master'
Nov 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions typecheck/src/main/scala/incremental/Node.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ object SyntaxChecking {

class SyntaxCheckOps(f: NodeKind => SyntaxChecker) {
def orElse(g: NodeKind => SyntaxChecker) = (k: NodeKind) => new AlternativeSyntax(k, f, g)
def andAlso(g: NodeKind => SyntaxChecker) = (k: NodeKind) => new ConjunctiveSyntax(k, f, g)
}

class IgnoreSyntax(k: NodeKind) extends SyntaxChecker(k) {
Expand Down Expand Up @@ -203,4 +204,26 @@ object SyntaxChecking {
}
}

case class ConjunctiveSyntax(k: NodeKind, f: NodeKind => SyntaxChecker, g: NodeKind => SyntaxChecker) extends SyntaxChecker(k) {
def check[T](lits: Seq[Lit], kids: Seq[Node_[T]]): Unit = {
try {
f(k).check(lits, kids)
} catch {
case e1: SyntaxError => {
try {
g(k).check(lits, kids)
} catch {
case e2: SyntaxError => error(s"Conjunctive syntax failed \n\t${e1.msg}\nand\n\t${e2.msg})")
}
error(s"Conjunctive syntax failed \n\t${e1.msg}")
}
}

try {
g(k).check(lits, kids)
} catch {
case e: SyntaxError => error(s"Conjunctive syntax failed \n\t${e.msg}")
}
}
}
}