diff options
| author | Li Haoyi <haoyi@dropbox.com> | 2014-11-28 05:39:55 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi@dropbox.com> | 2014-11-28 05:39:55 -0800 |
| commit | c2b5d4125f2b868399828281fb8e53e35be6e0f6 (patch) | |
| tree | f5d27a832b244ee0e10a1d93e3667968a63d2b1f | |
| parent | 3dc34955b3f8287178339a28f7ba3772a27ae08a (diff) | |
| download | hands-on-scala-js-c2b5d4125f2b868399828281fb8e53e35be6e0f6.tar.gz hands-on-scala-js-c2b5d4125f2b868399828281fb8e53e35be6e0f6.tar.bz2 hands-on-scala-js-c2b5d4125f2b868399828281fb8e53e35be6e0f6.zip | |
"omg" goes down to java.net.URI for reals
| -rw-r--r-- | scalaParser/src/main/scala/scalaParser/ScalaSyntax.scala | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scalaParser/src/main/scala/scalaParser/ScalaSyntax.scala b/scalaParser/src/main/scala/scalaParser/ScalaSyntax.scala index c2a6ce1..9909e8f 100644 --- a/scalaParser/src/main/scala/scalaParser/ScalaSyntax.scala +++ b/scalaParser/src/main/scala/scalaParser/ScalaSyntax.scala @@ -133,7 +133,7 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif def TypePat = rule { CompoundType } def Ascription = rule { - ":" ~ ("_" ~ "*" | InfixType | oneOrMore(Annotation)) + ":" ~ ("_" ~ "*" | InfixType | oneOrMore(Annotation)) } def ParamType = rule { K.O("=>") ~ Type | Type ~ "*" | Type } @@ -147,7 +147,7 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif ( Bindings | optional(K.W("implicit")) ~ Id ~ optional(Ascription) | - K.W("_") ~ optional(Ascription) + "_" ~ optional(Ascription) ) ~ K.O("=>") } @@ -218,13 +218,13 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif BlockExpr | Literal | Path | - NotNewline ~ K.W("_") | + K.W("_") | '(' ~ optional(Exprs) ~ ")" } rule { SimpleExpr1 ~ zeroOrMore('.' ~ Id | TypeArgs | ArgumentExprs) ~ - optional(K.W("_")) + optional( "_") } } @@ -304,7 +304,8 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif def VariantTypeParam: R0 = rule { zeroOrMore(Annotation) ~ optional(anyOf("+-")) ~ TypeParam } rule { '[' ~ oneOrMore(VariantTypeParam).separatedBy(',') ~ ']' } } - def FunTypeParamClause: R0 = rule { '[' ~ oneOrMore(zeroOrMore(Annotation) ~ TypeParam).separatedBy(',') ~ ']' } + def FunTypeParamClause: R0 = rule { + '[' ~ oneOrMore(zeroOrMore(Annotation) ~ TypeParam).separatedBy(',') ~ ']' } def TypeBounds: R0 = rule{ optional(K.O(">:") ~ Type) ~ optional(K.O("<:") ~ Type) |