summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-04-05 17:55:41 -0700
committerPaul Phillips <paulp@improving.org>2013-04-05 17:55:41 -0700
commitf09aaa3b311d3fc78aa9611f1213e6616df65e64 (patch)
tree37da8adad4259d1bfccba8e15c79293083f59f4f /test
parentd301a86488f944ae3a1a14ba578ac8c87e64f01d (diff)
parentdfdbfa73d0cca44109b907b644f1b41120ab4c24 (diff)
downloadscala-f09aaa3b311d3fc78aa9611f1213e6616df65e64.tar.gz
scala-f09aaa3b311d3fc78aa9611f1213e6616df65e64.tar.bz2
scala-f09aaa3b311d3fc78aa9611f1213e6616df65e64.zip
Merge pull request #2355 from sschaef/si-7300
SI-7300 single line comment in multi line comment
Diffstat (limited to 'test')
-rw-r--r--test/files/run/t7300.check2
-rw-r--r--test/files/run/t7300.scala11
2 files changed, 13 insertions, 0 deletions
diff --git a/test/files/run/t7300.check b/test/files/run/t7300.check
new file mode 100644
index 0000000000..51993f072d
--- /dev/null
+++ b/test/files/run/t7300.check
@@ -0,0 +1,2 @@
+2
+2
diff --git a/test/files/run/t7300.scala b/test/files/run/t7300.scala
new file mode 100644
index 0000000000..ec841690df
--- /dev/null
+++ b/test/files/run/t7300.scala
@@ -0,0 +1,11 @@
+object Test extends App {
+ // single line comment in multi line comment
+ /*//*/ val x = 1 */*/
+ val x = 2
+ println(x)
+
+ // single line comment in nested multi line comment
+ /*/*//*/ val y = 1 */*/*/
+ val y = 2
+ println(y)
+}