diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/javac/JavaParsers.scala | 2 | ||||
| -rw-r--r-- | test/files/jvm/t3415/Hello.java | 3 | ||||
| -rw-r--r-- | test/files/jvm/t3415/HelloWorld.scala | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala index 92dbc97965..fe46e22654 100644 --- a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala +++ b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala @@ -541,7 +541,7 @@ trait JavaParsers extends JavaScanners { if (parentToken == AT && in.token == DEFAULT) { val annot = atPos(pos) { - New(rootId(nme.AnnotationDefaultATTR.toTypeName), List(List())) + New(Select(scalaDot(newTermName("runtime")), nme.AnnotationDefaultATTR.toTypeName), List(List())) } mods1 = Modifiers(mods1.flags, mods1.privateWithin, annot :: mods1.annotations, mods1.positions) skipTo(SEMI) diff --git a/test/files/jvm/t3415/Hello.java b/test/files/jvm/t3415/Hello.java new file mode 100644 index 0000000000..ae7206453b --- /dev/null +++ b/test/files/jvm/t3415/Hello.java @@ -0,0 +1,3 @@ +public @interface Hello { + String msg() default "hoi"; +} diff --git a/test/files/jvm/t3415/HelloWorld.scala b/test/files/jvm/t3415/HelloWorld.scala new file mode 100644 index 0000000000..53bf55e444 --- /dev/null +++ b/test/files/jvm/t3415/HelloWorld.scala @@ -0,0 +1,4 @@ +object Test extends Application { + @Hello + def foo() { } +} |