diff options
| author | Li Haoyi <haoyi@dropbox.com> | 2014-11-16 18:55:56 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi@dropbox.com> | 2014-11-16 18:55:56 -0800 |
| commit | 50ecd448fbd32b15c78076abf305b1ac05503be3 (patch) | |
| tree | 4bd22f85cfc44c50e04985e92c1421526ccdc8aa | |
| parent | 001bc7ed3dd1f92be14802406897e7304ac1f2de (diff) | |
| download | hands-on-scala-js-50ecd448fbd32b15c78076abf305b1ac05503be3.tar.gz hands-on-scala-js-50ecd448fbd32b15c78076abf305b1ac05503be3.tar.bz2 hands-on-scala-js-50ecd448fbd32b15c78076abf305b1ac05503be3.zip | |
Removed all circular dependencies in scalatexApi
4 files changed, 7 insertions, 7 deletions
diff --git a/scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala b/scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala index 0dbb124..7538ec6 100644 --- a/scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala +++ b/scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala @@ -1,5 +1,5 @@ package torimatomeru - +import acyclic.file import language.implicitConversions import syntax._ import org.parboiled2._ @@ -193,7 +193,7 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif def CaseClause: R0 = rule { "case" ~ Pattern ~ optional(Guard) ~ "=>" ~ Block } def Guard: R0 = rule { "if" ~ PostfixExpr() } def Pattern: R0 = rule { - pr("Pattern!") ~ oneOrMore(pr("Pattern! oom") ~ Pattern1 ~ pr("Pattern! oom2") ).separatedBy('|') + oneOrMore(Pattern1 ).separatedBy('|') } def Pattern1: R0 = rule { '_' ~ ':' ~ TypePat | VarId() ~ ':' ~ TypePat | Pattern2 } def Pattern2: R0 = rule { VarId() ~ optional("@" ~ Pattern3) | Pattern3 } diff --git a/scalatexApi/src/main/scala/torimatomeru/syntax/Basic.scala b/scalatexApi/src/main/scala/torimatomeru/syntax/Basic.scala index 69c27b8..18cff91 100644 --- a/scalatexApi/src/main/scala/torimatomeru/syntax/Basic.scala +++ b/scalatexApi/src/main/scala/torimatomeru/syntax/Basic.scala @@ -1,9 +1,9 @@ package torimatomeru package syntax - +import acyclic.file import org.parboiled2._ -trait Basic { self: ScalaSyntax => +trait Basic { self: Parser => object Basic{ def UnicodeExcape = rule { "\\u" ~ 4.times(HexDigit) } diff --git a/scalatexApi/src/main/scala/torimatomeru/syntax/Identifiers.scala b/scalatexApi/src/main/scala/torimatomeru/syntax/Identifiers.scala index 2901688..4be1d4e 100644 --- a/scalatexApi/src/main/scala/torimatomeru/syntax/Identifiers.scala +++ b/scalatexApi/src/main/scala/torimatomeru/syntax/Identifiers.scala @@ -1,6 +1,6 @@ package torimatomeru package syntax - +import acyclic.file import org.parboiled2._ trait Identifiers { self: Parser with Basic => diff --git a/scalatexApi/src/main/scala/torimatomeru/syntax/Literals.scala b/scalatexApi/src/main/scala/torimatomeru/syntax/Literals.scala index bef65e6..b199c30 100644 --- a/scalatexApi/src/main/scala/torimatomeru/syntax/Literals.scala +++ b/scalatexApi/src/main/scala/torimatomeru/syntax/Literals.scala @@ -1,9 +1,9 @@ package torimatomeru package syntax - +import acyclic.file import org.parboiled2._ -trait Literals { self: ScalaSyntax => +trait Literals { self: Parser with Basic with Identifiers => object Literals{ import Basic._ def FloatingPointLiteral = rule { |