diff options
| -rw-r--r-- | src/compiler/scala/reflect/runtime/JavaToScala.scala | 2 | ||||
| -rw-r--r-- | test/files/run/code.check | 18 | ||||
| -rw-r--r-- | test/files/run/code.scala (renamed from test/disabled/run/code.scala) | 0 |
3 files changed, 19 insertions, 1 deletions
diff --git a/src/compiler/scala/reflect/runtime/JavaToScala.scala b/src/compiler/scala/reflect/runtime/JavaToScala.scala index 3d295e3ff9..f1eedbcf30 100644 --- a/src/compiler/scala/reflect/runtime/JavaToScala.scala +++ b/src/compiler/scala/reflect/runtime/JavaToScala.scala @@ -36,7 +36,7 @@ trait JavaToScala extends ConversionUtil { self: SymbolTable => * Can you check with your newly acquired classloader fu whether this implementation makes sense? */ def javaClass(path: String): jClass[_] = - jClass.forName(path, false, java.lang.ClassLoader.getSystemClassLoader) + jClass.forName(path, false, getClass.getClassLoader) /** Does `path` correspond to a Java class with that fully qualified name? */ def isJavaClass(path: String): Boolean = diff --git a/test/files/run/code.check b/test/files/run/code.check new file mode 100644 index 0000000000..4bc36424ee --- /dev/null +++ b/test/files/run/code.check @@ -0,0 +1,18 @@ +testing: ((x: Int) => x.$plus(ys.length)) +result = ((x: Int) => x.+{(x: <?>)Int}(ys.length{Int}){Int}){Int => Int} +testing: (() => { + val e: Element = new Element("someName"); + e +}) +result = (() => { + val e: Element = new Element{Element}{(name: <?>)Element}("someName"{java.lang.String("someName")}){Element}; + e{Element} +}{Element}){() => Element} +testing: (() => truc.elem = 6) +result = (() => truc.elem{Int} = 6{Int(6)}{Unit}){() => Unit} +testing: (() => truc.elem = truc.elem.$plus(6)) +result = (() => truc.elem{Int} = truc.elem.+{(x: <?>)Int}(6{Int(6)}){Int}{Unit}){() => Unit} +testing: (() => new baz.BazElement("someName")) +result = (() => new baz.BazElement{baz.BazElement}{(name: <?>)baz.BazElement}("someName"{java.lang.String("someName")}){baz.BazElement}){() => baz.BazElement} +testing: ((x: Int) => x.$plus(ys.length)) +result = ((x: Int) => x.+{(x: <?>)Int}(ys.length{Int}){Int}){Int => Int} diff --git a/test/disabled/run/code.scala b/test/files/run/code.scala index 8881c2eda8..8881c2eda8 100644 --- a/test/disabled/run/code.scala +++ b/test/files/run/code.scala |