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

micro cleanup

Browse Source
This commit is contained in:
Alex Tkachman
2012-08-30 15:50:57 +03:00
parent 59724296d6
commit d26b3e04e4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+4 -4
View File
@@ -255,7 +255,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
assert descriptor != null; assert descriptor != null;
JvmClassName className = JvmClassName className =
classNameForAnonymousClass(state.getBindingContext(), declaration); classNameForAnonymousClass(bindingContext, declaration);
ClassBuilder classBuilder = state.getFactory().newVisitor(className.getInternalName() + ".class"); ClassBuilder classBuilder = state.getFactory().newVisitor(className.getInternalName() + ".class");
final CodegenContext objectContext = context.intoAnonymousClass(descriptor, this); final CodegenContext objectContext = context.intoAnonymousClass(descriptor, this);
@@ -1928,14 +1928,14 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
ScriptContext scriptContext = (ScriptContext) cur; ScriptContext scriptContext = (ScriptContext) cur;
JvmClassName currentScriptClassName = JvmClassName currentScriptClassName =
classNameForScriptDescriptor(state.getBindingContext(), classNameForScriptDescriptor(bindingContext,
scriptContext.getScriptDescriptor()); scriptContext.getScriptDescriptor());
if (scriptContext.getScriptDescriptor() == receiver.getDeclarationDescriptor()) { if (scriptContext.getScriptDescriptor() == receiver.getDeclarationDescriptor()) {
result.put(currentScriptClassName.getAsmType(), v); result.put(currentScriptClassName.getAsmType(), v);
} }
else { else {
JvmClassName className = JvmClassName className =
classNameForScriptDescriptor(state.getBindingContext(), classNameForScriptDescriptor(bindingContext,
receiver.getDeclarationDescriptor()); receiver.getDeclarationDescriptor());
String fieldName = state.getScriptCodegen().getScriptFieldName(receiver.getDeclarationDescriptor()); String fieldName = state.getScriptCodegen().getScriptFieldName(receiver.getDeclarationDescriptor());
result.put(currentScriptClassName.getAsmType(), v); result.put(currentScriptClassName.getAsmType(), v);
@@ -2852,7 +2852,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
generateInitializer.fun(variableDescriptor); generateInitializer.fun(variableDescriptor);
JetScript scriptPsi = JetPsiUtil.getScript(variableDeclaration); JetScript scriptPsi = JetPsiUtil.getScript(variableDeclaration);
assert scriptPsi != null; assert scriptPsi != null;
JvmClassName scriptClassName = classNameForScriptPsi(state.getBindingContext(), scriptPsi); JvmClassName scriptClassName = classNameForScriptPsi(bindingContext, scriptPsi);
v.putfield(scriptClassName.getInternalName(), variableDeclaration.getName(), varType.getDescriptor()); v.putfield(scriptClassName.getInternalName(), variableDeclaration.getName(), varType.getDescriptor());
} }
else if (sharedVarType == null) { else if (sharedVarType == null) {