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/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) {