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

Replace object$ -> OBJECT$, instance$ -> INSTANCE$ in the project

Browse Source
This commit is contained in:
Alexander Udalov
2014-07-26 00:21:05 +04:00
parent 549a38ca6f
commit de0f751207
110 changed files with 183 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java
+1 -1
View File
@@ -1235,7 +1235,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
boolean generateInitializerInOuter = isClassObjectWithBackingFieldsInOuter(descriptor);
if (generateInitializerInOuter) {
final ImplementationBodyCodegen parentCodegen = getParentBodyCodegen(this);
//generate object$
//generate OBJECT$
parentCodegen.genInitSingleton(descriptor, StackValue.singleton(descriptor, typeMapper));
generateInitializers(new Function0<ExpressionCodegen>() {
@Override
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+3 -3
View File
@@ -158,8 +158,8 @@ public class CompileEnvironmentUtil {
method.setAccessible(true);
method.invoke(null);
ArrayList<Module> answer = new ArrayList<Module>(AllModules.instance$.get());
AllModules.instance$.get().clear();
ArrayList<Module> answer = new ArrayList<Module>(AllModules.INSTANCE$.get());
AllModules.INSTANCE$.get().clear();
return answer;
}
catch (Exception e) {
@@ -303,7 +303,7 @@ public class CompileEnvironmentUtil {
}
}
}
return Unit.instance$;
return Unit.INSTANCE$;
}
});
}
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
+1 -1
View File
@@ -209,7 +209,7 @@ public class JetCoreEnvironment {
@Override
public Unit invoke(String s) {
report(ERROR, s);
return Unit.instance$;
return Unit.INSTANCE$;
}
}));
JetScriptDefinitionProvider.getInstance(project).addScriptDefinitions(
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+2 -2
View File
@@ -293,7 +293,7 @@ public class KotlinToJVMBytecodeCompiler {
BindingTrace sharedTrace = support.getTrace();
ModuleDescriptorImpl sharedModule = support.getModule();
IncrementalCacheProvider incrementalCacheProvider = IncrementalCacheProvider.object$.getInstance();
IncrementalCacheProvider incrementalCacheProvider = IncrementalCacheProvider.OBJECT$.getInstance();
File incrementalCacheBaseDir = environment.getConfiguration().get(JVMConfigurationKeys.INCREMENTAL_CACHE_BASE_DIR);
final IncrementalCache incrementalCache;
if (incrementalCacheProvider != null && incrementalCacheBaseDir != null) {
@@ -345,7 +345,7 @@ public class KotlinToJVMBytecodeCompiler {
) {
CompilerConfiguration configuration = environment.getConfiguration();
File incrementalCacheDir = configuration.get(JVMConfigurationKeys.INCREMENTAL_CACHE_BASE_DIR);
IncrementalCacheProvider incrementalCacheProvider = IncrementalCacheProvider.object$.getInstance();
IncrementalCacheProvider incrementalCacheProvider = IncrementalCacheProvider.OBJECT$.getInstance();
Collection<FqName> packagesWithRemovedFiles;
if (incrementalCacheDir == null || moduleId == null || incrementalCacheProvider == null) {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java
+1 -1
View File
@@ -119,7 +119,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {
) {
GlobalContextImpl globalContext = ContextPackage.GlobalContext();
DeclarationProviderFactory declarationProviderFactory = DeclarationProviderFactoryService.object$
DeclarationProviderFactory declarationProviderFactory = DeclarationProviderFactoryService.OBJECT$
.createDeclarationProviderFactory(project, globalContext.getStorageManager(), syntheticFiles, filesScope);
InjectorForLazyResolveWithJava resolveWithJava = new InjectorForLazyResolveWithJava(
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class JavaPropertyInitializerEvaluatorImpl implements JavaPropertyInitial
if (evaluatedExpression != null) {
return ConstantsPackage.createCompileTimeConstant(
evaluatedExpression,
ConstantExpressionEvaluator.object$.isPropertyCompileTimeConstant(descriptor),
ConstantExpressionEvaluator.OBJECT$.isPropertyCompileTimeConstant(descriptor),
false,
true,
descriptor.getType());
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java
+6 -6
View File
@@ -216,7 +216,7 @@ public class JetControlFlowProcessor {
@NotNull
private Map<PseudoValue, TypePredicate> defaultTypeMap(List<PseudoValue> values) {
return PseudocodePackage.expectedTypeFor(AllTypes.instance$, values);
return PseudocodePackage.expectedTypeFor(AllTypes.INSTANCE$, values);
}
private void mergeValues(@NotNull List<JetExpression> from, @NotNull JetExpression to) {
@@ -268,7 +268,7 @@ public class JetControlFlowProcessor {
@NotNull
private AccessTarget getResolvedCallAccessTarget(JetElement element) {
ResolvedCall<?> resolvedCall = getResolvedCall(element, trace.getBindingContext());
return resolvedCall != null ? new AccessTarget.Call(resolvedCall) : AccessTarget.BlackBox.instance$;
return resolvedCall != null ? new AccessTarget.Call(resolvedCall) : AccessTarget.BlackBox.INSTANCE$;
}
@NotNull
@@ -276,7 +276,7 @@ public class JetControlFlowProcessor {
DeclarationDescriptor descriptor = trace.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element);
return descriptor instanceof VariableDescriptor
? new AccessTarget.Declaration((VariableDescriptor) descriptor)
: AccessTarget.BlackBox.instance$;
: AccessTarget.BlackBox.INSTANCE$;
}
@Override
@@ -457,7 +457,7 @@ public class JetControlFlowProcessor {
}
Map<PseudoValue, ReceiverValue> receiverValues = SmartFMap.emptyMap();
AccessTarget accessTarget = AccessTarget.BlackBox.instance$;
AccessTarget accessTarget = AccessTarget.BlackBox.INSTANCE$;
boolean unsupported = false;
if (left instanceof JetSimpleNameExpression || left instanceof JetQualifiedExpression) {
accessTarget = getResolvedCallAccessTarget(PsiUtilPackage.getQualifiedElementSelector(left));
@@ -892,7 +892,7 @@ public class JetControlFlowProcessor {
JetMultiDeclaration multiDeclaration = expression.getMultiParameter();
JetExpression loopRange = expression.getLoopRange();
TypePredicate loopRangeTypePredicate = AllTypes.instance$;
TypePredicate loopRangeTypePredicate = AllTypes.INSTANCE$;
ResolvedCall<?> iteratorResolvedCall = trace.get(BindingContext.LOOP_RANGE_ITERATOR_RESOLVED_CALL, loopRange);
if (iteratorResolvedCall != null) {
ReceiverValue iteratorReceiver = getExplicitReceiverValue(iteratorResolvedCall);
@@ -1400,7 +1400,7 @@ public class JetControlFlowProcessor {
TypePredicate expectedTypePredicate =
PseudocodePackage.getSubtypesPredicate(trace.get(BindingContext.TYPE, specifier.getTypeReference()));
if (expectedTypePredicate == null) {
expectedTypePredicate = AllTypes.instance$;
expectedTypePredicate = AllTypes.INSTANCE$;
}
builder.magic(specifier, specifier, arguments, PseudocodePackage.expectedTypeFor(expectedTypePredicate, arguments), MagicKind.VALUE_CONSUMER);
}
compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java
+2 -2
View File
@@ -957,7 +957,7 @@ public class JetFlowInformationProvider {
@Override
public Unit invoke(Instruction instruction, D enterData, D exitData) {
execute(instruction, enterData, exitData);
return Unit.instance$;
return Unit.INSTANCE$;
}
public abstract void execute(Instruction instruction, D enterData, D exitData);
@@ -967,7 +967,7 @@ public class JetFlowInformationProvider {
@Override
public Unit invoke(P p) {
execute(p);
return Unit.instance$;
return Unit.INSTANCE$;
}
public abstract void execute(P p);
compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class PseudocodeVariablesData {
if (variableDescriptor != null) {
result.add(variableDescriptor);
}
return Unit.instance$;
return Unit.INSTANCE$;
}
});
usedVariables = Collections.unmodifiableSet(result);
compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java
+7 -7
View File
@@ -418,7 +418,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
@Override
public InstructionWithValue loadStringTemplate(@NotNull JetStringTemplateExpression expression, @NotNull List<PseudoValue> inputValues) {
if (inputValues.isEmpty()) return read(expression);
Map<PseudoValue, TypePredicate> predicate = PseudocodePackage.expectedTypeFor(AllTypes.instance$, inputValues);
Map<PseudoValue, TypePredicate> predicate = PseudocodePackage.expectedTypeFor(AllTypes.INSTANCE$, inputValues);
return magic(expression, expression, inputValues, predicate, MagicKind.STRING_TEMPLATE);
}
@@ -431,7 +431,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
@NotNull Map<PseudoValue, TypePredicate> expectedTypes,
@NotNull MagicKind kind
) {
MagicInstruction instruction = MagicInstruction.object$.create(
MagicInstruction instruction = MagicInstruction.OBJECT$.create(
instructionElement, valueElement, getCurrentScope(), inputValues, expectedTypes, kind, valueFactory
);
add(instruction);
@@ -441,7 +441,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
@NotNull
@Override
public MergeInstruction merge(@NotNull JetExpression expression, @NotNull List<PseudoValue> inputValues) {
MergeInstruction instruction = MergeInstruction.object$.create(expression, getCurrentScope(), inputValues, valueFactory);
MergeInstruction instruction = MergeInstruction.OBJECT$.create(expression, getCurrentScope(), inputValues, valueFactory);
add(instruction);
return instruction;
}
@@ -465,7 +465,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
@NotNull Map<PseudoValue, ValueParameterDescriptor> arguments
) {
JetType returnType = resolvedCall.getResultingDescriptor().getReturnType();
CallInstruction instruction = CallInstruction.object$.create(
CallInstruction instruction = CallInstruction.OBJECT$.create(
valueElement,
getCurrentScope(),
resolvedCall,
@@ -492,7 +492,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
expectedTypes = PseudocodePackage.expectedTypeFor(onlyBoolean, inputValues);
break;
case NOT_NULL_ASSERTION:
expectedTypes = PseudocodePackage.expectedTypeFor(AllTypes.instance$, inputValues);
expectedTypes = PseudocodePackage.expectedTypeFor(AllTypes.INSTANCE$, inputValues);
break;
default:
throw new IllegalArgumentException("Invalid operation: " + operation);
@@ -526,8 +526,8 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
@Nullable ResolvedCall<?> resolvedCall,
@NotNull Map<PseudoValue, ReceiverValue> receiverValues
) {
AccessTarget accessTarget = resolvedCall != null ? new AccessTarget.Call(resolvedCall) : AccessTarget.BlackBox.instance$;
ReadValueInstruction instruction = ReadValueInstruction.object$.create(
AccessTarget accessTarget = resolvedCall != null ? new AccessTarget.Call(resolvedCall) : AccessTarget.BlackBox.INSTANCE$;
ReadValueInstruction instruction = ReadValueInstruction.OBJECT$.create(
expression, getCurrentScope(), accessTarget, receiverValues, valueFactory
);
add(instruction);
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java
+4 -4
View File
@@ -54,7 +54,7 @@ public class JetDotQualifiedExpression extends JetExpressionImplStub<PsiJetPlace
return childExpressionsByStub[0];
}
}
return JetQualifiedExpressionImpl.instance$.getReceiverExpression(this);
return JetQualifiedExpressionImpl.INSTANCE$.getReceiverExpression(this);
}
@Nullable
@@ -67,7 +67,7 @@ public class JetDotQualifiedExpression extends JetExpressionImplStub<PsiJetPlace
return childExpressionsByStub[1];
}
}
return JetQualifiedExpressionImpl.instance$.getSelectorExpression(this);
return JetQualifiedExpressionImpl.INSTANCE$.getSelectorExpression(this);
}
@@ -93,12 +93,12 @@ public class JetDotQualifiedExpression extends JetExpressionImplStub<PsiJetPlace
@NotNull
@Override
public ASTNode getOperationTokenNode() {
return JetQualifiedExpressionImpl.instance$.getOperationTokenNode(this);
return JetQualifiedExpressionImpl.INSTANCE$.getOperationTokenNode(this);
}
@NotNull
@Override
public JetToken getOperationSign() {
return JetQualifiedExpressionImpl.instance$.getOperationSign(this);
return JetQualifiedExpressionImpl.INSTANCE$.getOperationSign(this);
}
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNameReferenceExpression.java
+3 -3
View File
@@ -48,13 +48,13 @@ public class JetNameReferenceExpression extends JetExpressionImplStub<PsiJetName
if (stub != null) {
return stub.getReferencedName();
}
return JetSimpleNameExpressionImpl.object$.getReferencedNameImpl(this);
return JetSimpleNameExpressionImpl.OBJECT$.getReferencedNameImpl(this);
}
@Override
@NotNull
public Name getReferencedNameAsName() {
return JetSimpleNameExpressionImpl.object$.getReferencedNameAsNameImpl(this);
return JetSimpleNameExpressionImpl.OBJECT$.getReferencedNameAsNameImpl(this);
}
@Override
@@ -76,7 +76,7 @@ public class JetNameReferenceExpression extends JetExpressionImplStub<PsiJetName
@NotNull
@Override
public IElementType getReferencedNameElementType() {
return JetSimpleNameExpressionImpl.object$.getReferencedNameElementTypeImpl(this);
return JetSimpleNameExpressionImpl.OBJECT$.getReferencedNameElementTypeImpl(this);
}
@Override
compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java
+4 -4
View File
@@ -34,24 +34,24 @@ public class JetSafeQualifiedExpression extends JetExpressionImpl implements Jet
@NotNull
@Override
public JetExpression getReceiverExpression() {
return JetQualifiedExpressionImpl.instance$.getReceiverExpression(this);
return JetQualifiedExpressionImpl.INSTANCE$.getReceiverExpression(this);
}
@Nullable
@Override
public JetExpression getSelectorExpression() {
return JetQualifiedExpressionImpl.instance$.getSelectorExpression(this);
return JetQualifiedExpressionImpl.INSTANCE$.getSelectorExpression(this);
}
@NotNull
@Override
public ASTNode getOperationTokenNode() {
return JetQualifiedExpressionImpl.instance$.getOperationTokenNode(this);
return JetQualifiedExpressionImpl.INSTANCE$.getOperationTokenNode(this);
}
@NotNull
@Override
public JetToken getOperationSign() {
return JetQualifiedExpressionImpl.instance$.getOperationSign(this);
return JetQualifiedExpressionImpl.INSTANCE$.getOperationSign(this);
}
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetClassElementType.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class JetClassElementType extends JetStubElementType<PsiJetClassStub, Jet
List<String> superNames = PsiUtilPackage.getSuperNames(psi);
return new PsiJetClassStubImpl(
getStubType(isEnumEntry), parentStub, StringRef.fromString(fqName != null ? fqName.asString() : null),
StringRef.fromString(psi.getName()), Utils.instance$.wrapStrings(superNames), psi.isTrait(), isEnumEntry,
StringRef.fromString(psi.getName()), Utils.INSTANCE$.wrapStrings(superNames), psi.isTrait(), isEnumEntry,
psi.isLocal(), psi.isTopLevel());
}
compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class JetObjectElementType extends JetStubElementType<PsiJetObjectStub, J
String name = psi.getName();
FqName fqName = ResolveSessionUtils.safeFqNameForLazyResolve(psi);
List<String> superNames = PsiUtilPackage.getSuperNames(psi);
return new PsiJetObjectStubImpl(parentStub, StringRef.fromString(name), fqName, Utils.instance$.wrapStrings(superNames),
return new PsiJetObjectStubImpl(parentStub, StringRef.fromString(name), fqName, Utils.INSTANCE$.wrapStrings(superNames),
psi.isTopLevel(), isClassObject(psi), psi.isLocal(), psi.isObjectLiteral());
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
+1 -1
View File
@@ -361,7 +361,7 @@ public class AnnotationResolver {
for (ValueArgument argument : resolvedValueArgument.getArguments()) {
JetExpression argumentExpression = argument.getArgumentExpression();
if (argumentExpression != null) {
CompileTimeConstant<?> constant = ConstantExpressionEvaluator.object$.evaluate(argumentExpression, trace, expectedType);
CompileTimeConstant<?> constant = ConstantExpressionEvaluator.OBJECT$.evaluate(argumentExpression, trace, expectedType);
if (constant instanceof IntegerValueTypeConstant) {
JetType defaultType = ((IntegerValueTypeConstant) constant).getType(expectedType);
ArgumentTypeResolver.updateNumberType(defaultType, argumentExpression, trace);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java
+1 -1
View File
@@ -129,7 +129,7 @@ public class CompileTimeConstantUtils {
) {
if (expression == null) return false;
CompileTimeConstant<?> compileTimeConstant =
ConstantExpressionEvaluator.object$.evaluate(expression, trace, KotlinBuiltIns.getInstance().getBooleanType());
ConstantExpressionEvaluator.OBJECT$.evaluate(expression, trace, KotlinBuiltIns.getInstance().getBooleanType());
if (!(compileTimeConstant instanceof BooleanValue) || compileTimeConstant.usesVariableAsConstant()) return false;
Boolean value = ((BooleanValue) compileTimeConstant).getValue();
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+1 -1
View File
@@ -1078,7 +1078,7 @@ public class DescriptorResolver {
public CompileTimeConstant<?> invoke() {
JetExpression initializer = variable.getInitializer();
JetType initializerType = expressionTypingServices.safeGetType(scope, initializer, variableType, dataFlowInfo, trace);
CompileTimeConstant<?> constant = ConstantExpressionEvaluator.object$.evaluate(initializer, trace, initializerType);
CompileTimeConstant<?> constant = ConstantExpressionEvaluator.OBJECT$.evaluate(initializer, trace, initializerType);
if (constant instanceof IntegerValueTypeConstant) {
return EvaluatePackage.createCompileTimeConstantWithType((IntegerValueTypeConstant) constant, initializerType);
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+4 -4
View File
@@ -192,7 +192,7 @@ public class OverrideResolver {
if (element instanceof JetDeclaration) {
trace.report(CANNOT_INFER_VISIBILITY.on((JetDeclaration) element, descriptor));
}
return Unit.instance$;
return Unit.INSTANCE$;
}
};
}
@@ -247,7 +247,7 @@ public class OverrideResolver {
public boolean isEqual(D d1, D d2) {
CallableDescriptor f = transform.fun(d1);
CallableDescriptor g = transform.fun(d2);
return DescriptorEquivalenceForOverrides.instance$.areEquivalent(f.getOriginal(), g.getOriginal());
return DescriptorEquivalenceForOverrides.INSTANCE$.areEquivalent(f.getOriginal(), g.getOriginal());
}
});
@@ -294,10 +294,10 @@ public class OverrideResolver {
// when B is defined in modules m1 and m2, and C (indirectly) inherits from both versions,
// we'll be getting sets of members that do not override each other, but are structurally equivalent.
// As other code relies on no equal descriptors passed here, we guard against f == g, but this may not be necessary
if (!f.equals(g) && DescriptorEquivalenceForOverrides.instance$.areEquivalent(f.getOriginal(), g.getOriginal())) return true;
if (!f.equals(g) && DescriptorEquivalenceForOverrides.INSTANCE$.areEquivalent(f.getOriginal(), g.getOriginal())) return true;
CallableDescriptor originalG = g.getOriginal();
for (D overriddenFunction : getAllOverriddenDescriptors(f)) {
if (DescriptorEquivalenceForOverrides.instance$.areEquivalent(originalG, overriddenFunction.getOriginal())) return true;
if (DescriptorEquivalenceForOverrides.INSTANCE$.areEquivalent(originalG, overriddenFunction.getOriginal())) return true;
}
return false;
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java
+1 -1
View File
@@ -290,6 +290,6 @@ public class ArgumentTypeResolver {
return;
}
ConstantExpressionEvaluator.object$.evaluate(expression, trace, numberType);
ConstantExpressionEvaluator.OBJECT$.evaluate(expression, trace, numberType);
}
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java
+1 -1
View File
@@ -467,7 +467,7 @@ public class CallExpressionResolver {
context.trace.record(BindingContext.EXPRESSION_TYPE, selectorExpression, selectorReturnType);
}
CompileTimeConstant<?> value = ConstantExpressionEvaluator.object$.evaluate(expression, context.trace, context.expectedType);
CompileTimeConstant<?> value = ConstantExpressionEvaluator.OBJECT$.evaluate(expression, context.trace, context.expectedType);
if (value instanceof IntegerValueConstant && ((IntegerValueConstant) value).isPure()) {
return BasicExpressionTypingVisitor.createCompileTimeConstantTypeInfo(value, expression, context);
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCallImpl.java
+1 -1
View File
@@ -272,7 +272,7 @@ public class ResolvedCallImpl<D extends CallableDescriptor> implements MutableRe
public ArgumentMapping getArgumentMapping(@NotNull ValueArgument valueArgument) {
ArgumentMatch argumentMatch = argumentToParameterMap.get(valueArgument);
if (argumentMatch == null) {
return ArgumentUnmapped.instance$;
return ArgumentUnmapped.INSTANCE$;
}
return argumentMatch;
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java
+1 -1
View File
@@ -515,7 +515,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
@Override
public Unit invoke(@NotNull Supertypes supertypes) {
findAndDisconnectLoopsInTypeHierarchy(supertypes);
return Unit.instance$;
return Unit.INSTANCE$;
}
}
);
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
+4 -4
View File
@@ -118,7 +118,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
@Override
public JetTypeInfo visitConstantExpression(@NotNull JetConstantExpression expression, ExpressionTypingContext context) {
CompileTimeConstant<?> value = ConstantExpressionEvaluator.object$.evaluate(expression, context.trace, context.expectedType);
CompileTimeConstant<?> value = ConstantExpressionEvaluator.OBJECT$.evaluate(expression, context.trace, context.expectedType);
if (!(value instanceof IntegerValueTypeConstant)) {
CompileTimeConstantChecker compileTimeConstantChecker = context.getCompileTimeConstantChecker();
@@ -752,7 +752,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
result = returnType;
}
CompileTimeConstant<?> value = ConstantExpressionEvaluator.object$.evaluate(expression, contextWithExpectedType.trace,
CompileTimeConstant<?> value = ConstantExpressionEvaluator.OBJECT$.evaluate(expression, contextWithExpectedType.trace,
contextWithExpectedType.expectedType);
if (value != null) {
return createCompileTimeConstantTypeInfo(value, expression, contextWithExpectedType);
@@ -917,7 +917,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
context.trace.report(UNSUPPORTED.on(operationSign, "Unknown operation"));
result = JetTypeInfo.create(null, context.dataFlowInfo);
}
CompileTimeConstant<?> value = ConstantExpressionEvaluator.object$.
CompileTimeConstant<?> value = ConstantExpressionEvaluator.OBJECT$.
evaluate(expression, contextWithExpectedType.trace, contextWithExpectedType.expectedType);
if (value != null) {
return createCompileTimeConstantTypeInfo(value, expression, contextWithExpectedType);
@@ -1257,7 +1257,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
}
});
}
ConstantExpressionEvaluator.object$.evaluate(expression, context.trace, contextWithExpectedType.expectedType);
ConstantExpressionEvaluator.OBJECT$.evaluate(expression, context.trace, contextWithExpectedType.expectedType);
return DataFlowUtils.checkType(KotlinBuiltIns.getInstance().getStringType(), expression, contextWithExpectedType, dataFlowInfo[0]);
}
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java
+1 -1
View File
@@ -170,7 +170,7 @@ public class DataFlowUtils {
}
if (expression instanceof JetConstantExpression) {
CompileTimeConstant<?> value = ConstantExpressionEvaluator.object$.evaluate(expression, trace, expectedType);
CompileTimeConstant<?> value = ConstantExpressionEvaluator.OBJECT$.evaluate(expression, trace, expectedType);
if (value instanceof IntegerValueTypeConstant) {
value = EvaluatePackage.createCompileTimeConstantWithType((IntegerValueTypeConstant) value, expectedType);
}
compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java
+1 -1
View File
@@ -396,7 +396,7 @@ public class ExpressionTypingServices {
if (defaultValue != null) {
getType(declaringScope, defaultValue, valueParameterDescriptor.getType(), dataFlowInfo, trace);
if (DescriptorUtils.isAnnotationClass(DescriptorResolver.getContainingClass(declaringScope))) {
ConstantExpressionEvaluator.object$.evaluate(defaultValue, trace, valueParameterDescriptor.getType());
ConstantExpressionEvaluator.OBJECT$.evaluate(defaultValue, trace, valueParameterDescriptor.getType());
}
}
}
compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java
+1 -1
View File
@@ -2,7 +2,7 @@ public final class ClassObjectField implements kotlin.jvm.internal.KObject {
@org.jetbrains.annotations.Nullable
public static final java.lang.String x = "";
private static final java.lang.String y = "";
public static final ClassObjectField.object object$;
public static final ClassObjectField.object OBJECT$;
public ClassObjectField() { /* compiled code */ }
compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java
+1 -1
View File
@@ -1,5 +1,5 @@
public interface TraitClassObjectField extends kotlin.jvm.internal.KObject {
TraitClassObjectField.object object$;
TraitClassObjectField.object OBJECT$;
@org.jetbrains.annotations.Nullable
java.lang.String x = "";
compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java
+9 -9
View File
@@ -2,18 +2,18 @@ package test;
class ClassObject {
void accessToClassObject() {
WithClassObject.object$.foo();
WithClassObject.object$.getValue();
WithClassObject.object$.getValueWithGetter();
WithClassObject.object$.getVariable();
WithClassObject.object$.setVariable(0);
WithClassObject.object$.getVariableWithAccessors();
WithClassObject.object$.setVariableWithAccessors(0);
WithClassObject.OBJECT$.foo();
WithClassObject.OBJECT$.getValue();
WithClassObject.OBJECT$.getValueWithGetter();
WithClassObject.OBJECT$.getVariable();
WithClassObject.OBJECT$.setVariable(0);
WithClassObject.OBJECT$.getVariableWithAccessors();
WithClassObject.OBJECT$.setVariableWithAccessors(0);
}
void accessToPackageObject() {
PackageInner.instance$.foo();
PackageInner.instance$.getValue();
PackageInner.INSTANCE$.foo();
PackageInner.INSTANCE$.getValue();
}
void accessToInnerClass() {
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class C {
<!CONFLICTING_JVM_DECLARATIONS!>class object<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>val `object$`<!> = C
<!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = C
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt
+2 -2
View File
@@ -1,7 +1,7 @@
class C {
<!CONFLICTING_JVM_DECLARATIONS!>class object<!> {
<!CONFLICTING_JVM_DECLARATIONS!>val `object$`<!> = this
<!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = this
}
val `object$` = C
val `OBJECT$` = C
}
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt
+1 -1
View File
@@ -1,3 +1,3 @@
object <!CONFLICTING_JVM_DECLARATIONS!>O<!> {
<!CONFLICTING_JVM_DECLARATIONS!>val `instance$`: O<!> = null!!
<!CONFLICTING_JVM_DECLARATIONS!>val `INSTANCE$`: O<!> = null!!
}
compiler/tests/org/jetbrains/jet/storage/StorageManagerTest.java
+5 -5
View File
@@ -281,7 +281,7 @@ public class StorageManagerTest extends TestCase {
new Function1<String, Unit>() {
@Override
public Unit invoke(String s) {
return Unit.instance$;
return Unit.INSTANCE$;
}
}
);
@@ -317,7 +317,7 @@ public class StorageManagerTest extends TestCase {
public Unit invoke(String s) {
counter.inc();
assertEquals("tolerant", s);
return Unit.instance$;
return Unit.INSTANCE$;
}
}
);
@@ -346,7 +346,7 @@ public class StorageManagerTest extends TestCase {
public Unit invoke(Collection<String> strings) {
counter.inc();
strings.add("postComputed");
return Unit.instance$;
return Unit.INSTANCE$;
}
}
);
@@ -372,7 +372,7 @@ public class StorageManagerTest extends TestCase {
public Unit invoke(Collection<String> strings) {
counter.inc();
strings.add("postComputed");
return Unit.instance$;
return Unit.INSTANCE$;
}
}
);
@@ -405,7 +405,7 @@ public class StorageManagerTest extends TestCase {
@Override
public Unit invoke(String s) {
fail("Recursion-tolerating value should not be post computed");
return Unit.instance$;
return Unit.INSTANCE$;
}
}
);