diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-06-24 15:19:05 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-06-24 18:10:42 +1000 |
| commit | 1f7417c763fb199cacc6afedc6e54796916fd673 (patch) | |
| tree | bd00d7e0e47be310172f01c758c01ca5430063c4 /test/files/run/t8918-unary-ids.scala | |
| parent | 73f40564a6b19e8b15f0908c3e24f1a8fe405605 (diff) | |
| parent | 1b09e12ef3b3fea1cab56bac893295f74de23b8b (diff) | |
| download | scala-1f7417c763fb199cacc6afedc6e54796916fd673.tar.gz scala-1f7417c763fb199cacc6afedc6e54796916fd673.tar.bz2 scala-1f7417c763fb199cacc6afedc6e54796916fd673.zip | |
Merge branch '2.11.x' into merge/2.11.x-to-2.12.x-20150624
Diffstat (limited to 'test/files/run/t8918-unary-ids.scala')
| -rw-r--r-- | test/files/run/t8918-unary-ids.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/files/run/t8918-unary-ids.scala b/test/files/run/t8918-unary-ids.scala index 1f29abe464..3aa990f72c 100644 --- a/test/files/run/t8918-unary-ids.scala +++ b/test/files/run/t8918-unary-ids.scala @@ -19,13 +19,13 @@ res0: Int = -42 scala> - if (true) 1 else 2 <console>:1: error: illegal start of simple expression - - if (true) 1 else 2 - ^ +- if (true) 1 else 2 + ^ scala> - - 1 <console>:1: error: ';' expected but integer literal found. - - - 1 - ^ +- - 1 + ^ scala> -.-(1) res1: Int = 41 |