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

get rid of JdkNames

Browse Source
This commit is contained in:
Alexander Udalov
2012-08-27 20:04:01 +04:00
parent d99ffbd120
commit 6af6f2827d
4 changed files with 10 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+1 -2
View File
@@ -39,7 +39,6 @@ import org.jetbrains.jet.lang.resolve.BindingContextUtils;
import org.jetbrains.jet.lang.resolve.OverridingUtil;
import org.jetbrains.jet.lang.resolve.calls.ResolvedCall;
import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
import org.jetbrains.jet.lang.resolve.java.JdkNames;
import org.jetbrains.jet.lang.resolve.java.JvmAbi;
import org.jetbrains.jet.lang.resolve.java.JvmClassName;
import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
@@ -99,7 +98,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
isAbstract = true;
isInterface = true;
isAnnotation = true;
signature.getInterfaces().add(JdkNames.JLA_ANNOTATION.getInternalName());
signature.getInterfaces().add("java/lang/annotation/Annotation");
}
else if (jetClass.hasModifier(JetTokens.ENUM_KEYWORD)) {
isEnum = true;
compiler/backend/src/org/jetbrains/jet/codegen/ScriptCodegen.java
+2 -3
View File
@@ -34,7 +34,6 @@ import org.jetbrains.jet.lang.psi.JetScript;
import org.jetbrains.jet.lang.psi.JetTypeParameterListOwner;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.ScriptNameUtil;
import org.jetbrains.jet.lang.resolve.java.JdkNames;
import org.jetbrains.jet.lang.resolve.java.JvmClassName;
import javax.inject.Inject;
@@ -113,7 +112,7 @@ public class ScriptCodegen {
Opcodes.ACC_PUBLIC,
className.getInternalName(),
null,
JdkNames.JL_OBJECT.getInternalName(),
"java/lang/Object",
new String[0]);
genMembers(scriptDeclaration, context, classBuilder);
@@ -154,7 +153,7 @@ public class ScriptCodegen {
JvmClassName className = codegenAnnotator.classNameForClassDescriptor(classDescriptorForScript);
instructionAdapter.load(0, className.getAsmType());
instructionAdapter.invokespecial(JdkNames.JL_OBJECT.getInternalName(), "<init>", "()V");
instructionAdapter.invokespecial("java/lang/Object", "<init>", "()V");
instructionAdapter.load(0, className.getAsmType());