azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete AsmUtil.fqNameByAsmTypeUnsafe, refactor KotlinToJavaTypesMap

Browse Source
This commit is contained in:
Alexander Udalov
2013-10-03 19:19:50 +04:00
parent 044a47905e
commit fa4f568437
6 changed files with 57 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java
+4 -3
View File
@@ -67,7 +67,7 @@ import java.net.URLClassLoader;
import java.util.Collections;
import java.util.List;
import static org.jetbrains.jet.codegen.AsmUtil.fqNameByAsmTypeUnsafe;
import static org.jetbrains.jet.codegen.AsmUtil.asmTypeByFqNameWithoutInnerClasses;
public class ReplInterpreter {
@@ -184,7 +184,8 @@ public class ReplInterpreter {
public LineResult eval(@NotNull String line) {
++lineNumber;
Type scriptClassType = Type.getObjectType("Line" + lineNumber);
FqName scriptFqName = new FqName("Line" + lineNumber);
Type scriptClassType = asmTypeByFqNameWithoutInnerClasses(scriptFqName);
StringBuilder fullText = new StringBuilder();
for (String prevLine : previousIncompleteLines) {
@@ -239,7 +240,7 @@ public class ReplInterpreter {
}
try {
Class<?> scriptClass = classLoader.loadClass(fqNameByAsmTypeUnsafe(scriptClassType).asString());
Class<?> scriptClass = classLoader.loadClass(scriptFqName.asString());
Class<?>[] constructorParams = new Class<?>[earlierLines.size()];
Object[] constructorArgs = new Object[earlierLines.size()];