summaryrefslogtreecommitdiff
path: root/test/files/pos/t7532b
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-05-30 09:26:46 +0200
committerJason Zaugg <jzaugg@gmail.com>2013-05-30 09:35:13 +0200
commit75251f76001d3c781b0630c2061603ebb250a787 (patch)
treeb65e14f6868fc416b6b34eb807d8b318e6c00b4e /test/files/pos/t7532b
parent810a6de757a44d7d481e0ee1bd9c2fb8abe6043d (diff)
downloadscala-75251f76001d3c781b0630c2061603ebb250a787.tar.gz
scala-75251f76001d3c781b0630c2061603ebb250a787.tar.bz2
scala-75251f76001d3c781b0630c2061603ebb250a787.zip
SI-7532 Fix regression in Java inner classfile reader
395e90a modified the detection of top-level classes in ClassfileParser in two ways: 1. used `Name#containsChar` rather than `toString.indexOf ...` (good!) 2. decoded the name before doing this check (bad!) That code is actually only run for non-Scala classfiles, whose names don't need decoding. Attempting to do so converted `R$attr` to `R@tr`, which no longer contains a '$', and was wrongly treated as a top level class. This commit reverts the use of `decodedName`, and inlines the method to its only call site for clarity.
Diffstat (limited to 'test/files/pos/t7532b')
-rw-r--r--test/files/pos/t7532b/A_1.scala7
-rw-r--r--test/files/pos/t7532b/B_2.scala8
2 files changed, 15 insertions, 0 deletions
diff --git a/test/files/pos/t7532b/A_1.scala b/test/files/pos/t7532b/A_1.scala
new file mode 100644
index 0000000000..e8f9540609
--- /dev/null
+++ b/test/files/pos/t7532b/A_1.scala
@@ -0,0 +1,7 @@
+package pack
+class R {
+ class attr // Will have the bytecode name `R$attr`, not to be confused with `R@tr`!
+ class `@`
+}
+
+class `@` \ No newline at end of file
diff --git a/test/files/pos/t7532b/B_2.scala b/test/files/pos/t7532b/B_2.scala
new file mode 100644
index 0000000000..1555a5daa7
--- /dev/null
+++ b/test/files/pos/t7532b/B_2.scala
@@ -0,0 +1,8 @@
+import pack._
+
+object Test {
+ val r = new R
+ new r.attr()
+ new r.`@`
+ new `@`
+} \ No newline at end of file