diff options
| author | Li Haoyi <haoyi@dropbox.com> | 2014-11-28 23:20:32 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi@dropbox.com> | 2014-11-28 23:20:32 -0800 |
| commit | 1be904f49025b6ece40d73cf6949cddf9b7ccbbe (patch) | |
| tree | 82e1714587edddc8d8ee14f603f4716ce72bad63 | |
| parent | be290a9471d9e25461a197c828f85d44cf64d633 (diff) | |
| download | hands-on-scala-js-1be904f49025b6ece40d73cf6949cddf9b7ccbbe.tar.gz hands-on-scala-js-1be904f49025b6ece40d73cf6949cddf9b7ccbbe.tar.bz2 hands-on-scala-js-1be904f49025b6ece40d73cf6949cddf9b7ccbbe.zip | |
Made it to t8146.scala
| -rw-r--r-- | scalaParser/src/main/scala/scalaParser/ScalaSyntax.scala | 4 | ||||
| -rw-r--r-- | scalaParser/src/test/resources/test.scala | 4 | ||||
| -rw-r--r-- | scalaParser/src/test/scala/scalaParser/SyntaxTest.scala | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/scalaParser/src/main/scala/scalaParser/ScalaSyntax.scala b/scalaParser/src/main/scala/scalaParser/ScalaSyntax.scala index ab94372..644c545 100644 --- a/scalaParser/src/main/scala/scalaParser/ScalaSyntax.scala +++ b/scalaParser/src/main/scala/scalaParser/ScalaSyntax.scala @@ -142,7 +142,7 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif InfixType | '(' ~ optional(oneOrMore(ParamType) separatedBy ',') ~ ')' } def Ascription = rule { - ":" ~ ("_" ~ "*" | InfixType | oneOrMore(Annotation)) + ":" ~ ("_" ~ "*" | Type | oneOrMore(Annotation)) } def ParamType = rule { `=>` ~ Type | Type ~ "*" | Type } @@ -155,7 +155,7 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif rule{ ( Bindings | - optional(`implicit`) ~ Id ~ optional(Ascription) | + optional(`implicit`) ~ Id ~ optional(":" ~ CompoundType) | `_` ~ optional(Ascription) ) ~ `=>` diff --git a/scalaParser/src/test/resources/test.scala b/scalaParser/src/test/resources/test.scala index bd9f504..5ac0b8e 100644 --- a/scalaParser/src/test/resources/test.scala +++ b/scalaParser/src/test/resources/test.scala @@ -1,4 +1,4 @@ -object A { +object Sessions { + In{z: @serialized => System.out.println(z)} - A.m(1: Any => Any) }
\ No newline at end of file diff --git a/scalaParser/src/test/scala/scalaParser/SyntaxTest.scala b/scalaParser/src/test/scala/scalaParser/SyntaxTest.scala index 4bb3c6e..78103c5 100644 --- a/scalaParser/src/test/scala/scalaParser/SyntaxTest.scala +++ b/scalaParser/src/test/scala/scalaParser/SyntaxTest.scala @@ -851,7 +851,7 @@ object SyntaxTest extends TestSuite{ 'omg{ // val root = new java.io.File("book/target/clones/scala-js/") - val root = new java.io.File("../scala") + val root = new java.io.File("../scala/test/files/pos") def listFiles(s: java.io.File): Iterator[String] = { val (dirs, files) = s.listFiles().toIterator.partition(_.isDirectory) files.map(_.getPath) ++ dirs.flatMap(listFiles) |