diff options
| author | allisonhb <allisonhb@gmx.com> | 2016-12-07 21:45:30 -0500 |
|---|---|---|
| committer | allisonhb <allisonhb@gmx.com> | 2016-12-14 14:13:01 -0500 |
| commit | fab1db5a3854ae737e1d749eb08be9baf41199f5 (patch) | |
| tree | 9db8b4320157afbac06bfb3a832f3682e64bf625 /test | |
| parent | 8badcadbe51f4a02e495f462f5f2666a24d79cb0 (diff) | |
| download | scala-fab1db5a3854ae737e1d749eb08be9baf41199f5.tar.gz scala-fab1db5a3854ae737e1d749eb08be9baf41199f5.tar.bz2 scala-fab1db5a3854ae737e1d749eb08be9baf41199f5.zip | |
SI-4700 Make infix notation default for symbolic types.
Add ability to disable this via the @showAsInfix annotation.
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/run/t4700.check | 27 | ||||
| -rw-r--r-- | test/files/run/t4700.scala | 11 |
2 files changed, 17 insertions, 21 deletions
diff --git a/test/files/run/t4700.check b/test/files/run/t4700.check index 40caf0fd36..ae854b959d 100644 --- a/test/files/run/t4700.check +++ b/test/files/run/t4700.check @@ -6,16 +6,7 @@ scala> class &&[T,U] defined class $amp$amp scala> def foo: Int && Boolean = ??? -foo: &&[Int,Boolean] - -scala> @showAsInfix class ||[T,U] -defined class $bar$bar - -scala> def foo: Int || Boolean = ??? -foo: Int || Boolean - -scala> @showAsInfix class &&[T, U] -defined class $amp$amp +foo: Int && Boolean scala> def foo: Int && Boolean && String = ??? foo: Int && Boolean && String @@ -29,7 +20,13 @@ defined type alias Mappy scala> def foo: Int Mappy (Boolean && String) = ??? foo: Int Mappy (Boolean && String) -scala> @showAsInfix class &:[L, R] +scala> @showAsInfix(false) class ||[T,U] +defined class $bar$bar + +scala> def foo: Int || Boolean = ??? +foo: ||[Int,Boolean] + +scala> class &:[L, R] defined class $amp$colon scala> def foo: Int &: String = ??? @@ -38,10 +35,10 @@ foo: Int &: String scala> def foo: Int &: Boolean &: String = ??? foo: Int &: Boolean &: String -scala> def foo: (Int || String) &: Boolean = ??? -foo: (Int || String) &: Boolean +scala> def foo: (Int && String) &: Boolean = ??? +foo: (Int && String) &: Boolean -scala> def foo: Int || (Boolean &: String) = ??? -foo: Int || (Boolean &: String) +scala> def foo: Int && (Boolean &: String) = ??? +foo: Int && (Boolean &: String) scala> :quit diff --git a/test/files/run/t4700.scala b/test/files/run/t4700.scala index 77f0de3d38..7c02676e89 100644 --- a/test/files/run/t4700.scala +++ b/test/files/run/t4700.scala @@ -6,18 +6,17 @@ object Test extends ReplTest { |import scala.annotation.showAsInfix |class &&[T,U] |def foo: Int && Boolean = ??? - |@showAsInfix class ||[T,U] - |def foo: Int || Boolean = ??? - |@showAsInfix class &&[T, U] |def foo: Int && Boolean && String = ??? |def foo: Int && (Boolean && String) = ??? |@showAsInfix type Mappy[T, U] = Map[T, U] |def foo: Int Mappy (Boolean && String) = ??? - |@showAsInfix class &:[L, R] + |@showAsInfix(false) class ||[T,U] + |def foo: Int || Boolean = ??? + |class &:[L, R] |def foo: Int &: String = ??? |def foo: Int &: Boolean &: String = ??? - |def foo: (Int || String) &: Boolean = ??? - |def foo: Int || (Boolean &: String) = ??? + |def foo: (Int && String) &: Boolean = ??? + |def foo: Int && (Boolean &: String) = ??? |""".stripMargin } |