Regenerate injectors and keyword strings

After recent changes to Printer
This commit is contained in:
Alexander Udalov
2014-10-20 18:42:51 +04:00
parent f8be39b26b
commit 51fd654802
10 changed files with 63 additions and 63 deletions
@@ -47,7 +47,7 @@ import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */ /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */
@SuppressWarnings("all") @SuppressWarnings("all")
public class InjectorForJavaDescriptorResolver { public class InjectorForJavaDescriptorResolver {
private final Project project; private final Project project;
private final BindingTrace bindingTrace; private final BindingTrace bindingTrace;
private final GlobalContextImpl globalContext; private final GlobalContextImpl globalContext;
@@ -73,7 +73,7 @@ public class InjectorForJavaDescriptorResolver {
private final AnnotationDescriptorLoader annotationDescriptorLoader; private final AnnotationDescriptorLoader annotationDescriptorLoader;
private final DescriptorLoadersStorage descriptorLoadersStorage; private final DescriptorLoadersStorage descriptorLoadersStorage;
private final ConstantDescriptorLoader constantDescriptorLoader; private final ConstantDescriptorLoader constantDescriptorLoader;
public InjectorForJavaDescriptorResolver( public InjectorForJavaDescriptorResolver(
@NotNull Project project, @NotNull Project project,
@NotNull BindingTrace bindingTrace @NotNull BindingTrace bindingTrace
@@ -138,25 +138,25 @@ public class InjectorForJavaDescriptorResolver {
javaClassFinder.initialize(); javaClassFinder.initialize();
} }
@PreDestroy @PreDestroy
public void destroy() { public void destroy() {
} }
public GlobalContextImpl getGlobalContext() { public GlobalContextImpl getGlobalContext() {
return this.globalContext; return this.globalContext;
} }
public ModuleDescriptorImpl getModule() { public ModuleDescriptorImpl getModule() {
return this.module; return this.module;
} }
public JavaDescriptorResolver getJavaDescriptorResolver() { public JavaDescriptorResolver getJavaDescriptorResolver() {
return this.javaDescriptorResolver; return this.javaDescriptorResolver;
} }
public JavaClassFinderImpl getJavaClassFinder() { public JavaClassFinderImpl getJavaClassFinder() {
return this.javaClassFinder; return this.javaClassFinder;
} }
} }
@@ -71,7 +71,7 @@ import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */ /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */
@SuppressWarnings("all") @SuppressWarnings("all")
public class InjectorForLazyResolveWithJava { public class InjectorForLazyResolveWithJava {
private final Project project; private final Project project;
private final GlobalContext globalContext; private final GlobalContext globalContext;
private final StorageManager storageManager; private final StorageManager storageManager;
@@ -121,7 +121,7 @@ public class InjectorForLazyResolveWithJava {
private final AnnotationDescriptorLoader annotationDescriptorLoader; private final AnnotationDescriptorLoader annotationDescriptorLoader;
private final DescriptorLoadersStorage descriptorLoadersStorage; private final DescriptorLoadersStorage descriptorLoadersStorage;
private final ConstantDescriptorLoader constantDescriptorLoader; private final ConstantDescriptorLoader constantDescriptorLoader;
public InjectorForLazyResolveWithJava( public InjectorForLazyResolveWithJava(
@NotNull Project project, @NotNull Project project,
@NotNull GlobalContext globalContext, @NotNull GlobalContext globalContext,
@@ -277,17 +277,17 @@ public class InjectorForLazyResolveWithJava {
javaClassFinder.initialize(); javaClassFinder.initialize();
} }
@PreDestroy @PreDestroy
public void destroy() { public void destroy() {
} }
public ResolveSession getResolveSession() { public ResolveSession getResolveSession() {
return this.resolveSession; return this.resolveSession;
} }
public JavaDescriptorResolver getJavaDescriptorResolver() { public JavaDescriptorResolver getJavaDescriptorResolver() {
return this.javaDescriptorResolver; return this.javaDescriptorResolver;
} }
} }
@@ -82,7 +82,7 @@ import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */ /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */
@SuppressWarnings("all") @SuppressWarnings("all")
public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnalyzer { public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnalyzer {
private final Project project; private final Project project;
private final GlobalContext globalContext; private final GlobalContext globalContext;
private final StorageManager storageManager; private final StorageManager storageManager;
@@ -143,7 +143,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
private final AnnotationDescriptorLoader annotationDescriptorLoader; private final AnnotationDescriptorLoader annotationDescriptorLoader;
private final DescriptorLoadersStorage descriptorLoadersStorage; private final DescriptorLoadersStorage descriptorLoadersStorage;
private final ConstantDescriptorLoader constantDescriptorLoader; private final ConstantDescriptorLoader constantDescriptorLoader;
public InjectorForTopDownAnalyzerForJvm( public InjectorForTopDownAnalyzerForJvm(
@NotNull Project project, @NotNull Project project,
@NotNull GlobalContext globalContext, @NotNull GlobalContext globalContext,
@@ -361,29 +361,29 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
javaClassFinder.initialize(); javaClassFinder.initialize();
} }
@PreDestroy @PreDestroy
public void destroy() { public void destroy() {
} }
public ModuleDescriptor getModuleDescriptor() { public ModuleDescriptor getModuleDescriptor() {
return this.moduleDescriptor; return this.moduleDescriptor;
} }
public TopDownAnalyzer getTopDownAnalyzer() { public TopDownAnalyzer getTopDownAnalyzer() {
return this.topDownAnalyzer; return this.topDownAnalyzer;
} }
public LazyTopDownAnalyzer getLazyTopDownAnalyzer() { public LazyTopDownAnalyzer getLazyTopDownAnalyzer() {
return this.lazyTopDownAnalyzer; return this.lazyTopDownAnalyzer;
} }
public JavaDescriptorResolver getJavaDescriptorResolver() { public JavaDescriptorResolver getJavaDescriptorResolver() {
return this.javaDescriptorResolver; return this.javaDescriptorResolver;
} }
public DeserializationGlobalContextForJava getDeserializationGlobalContextForJava() { public DeserializationGlobalContextForJava getDeserializationGlobalContextForJava() {
return this.deserializationGlobalContextForJava; return this.deserializationGlobalContextForJava;
} }
} }
@@ -52,7 +52,7 @@ import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */ /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */
@SuppressWarnings("all") @SuppressWarnings("all")
public class InjectorForBodyResolve { public class InjectorForBodyResolve {
private final Project project; private final Project project;
private final GlobalContext globalContext; private final GlobalContext globalContext;
private final StorageManager storageManager; private final StorageManager storageManager;
@@ -83,7 +83,7 @@ public class InjectorForBodyResolve {
private final ModifiersChecker modifiersChecker; private final ModifiersChecker modifiersChecker;
private final FunctionAnalyzerExtension functionAnalyzerExtension; private final FunctionAnalyzerExtension functionAnalyzerExtension;
private final ScriptBodyResolver scriptBodyResolver; private final ScriptBodyResolver scriptBodyResolver;
public InjectorForBodyResolve( public InjectorForBodyResolve(
@NotNull Project project, @NotNull Project project,
@NotNull GlobalContext globalContext, @NotNull GlobalContext globalContext,
@@ -195,13 +195,13 @@ public class InjectorForBodyResolve {
scriptBodyResolver.setExpressionTypingServices(expressionTypingServices); scriptBodyResolver.setExpressionTypingServices(expressionTypingServices);
} }
@PreDestroy @PreDestroy
public void destroy() { public void destroy() {
} }
public BodyResolver getBodyResolver() { public BodyResolver getBodyResolver() {
return this.bodyResolver; return this.bodyResolver;
} }
} }
@@ -51,7 +51,7 @@ import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */ /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */
@SuppressWarnings("all") @SuppressWarnings("all")
public class InjectorForLazyResolve { public class InjectorForLazyResolve {
private final Project project; private final Project project;
private final GlobalContext globalContext; private final GlobalContext globalContext;
private final StorageManager storageManager; private final StorageManager storageManager;
@@ -81,7 +81,7 @@ public class InjectorForLazyResolve {
private final JetImportsFactory jetImportsFactory; private final JetImportsFactory jetImportsFactory;
private final ScopeProvider scopeProvider; private final ScopeProvider scopeProvider;
private final ScriptBodyResolver scriptBodyResolver; private final ScriptBodyResolver scriptBodyResolver;
public InjectorForLazyResolve( public InjectorForLazyResolve(
@NotNull Project project, @NotNull Project project,
@NotNull GlobalContext globalContext, @NotNull GlobalContext globalContext,
@@ -185,13 +185,13 @@ public class InjectorForLazyResolve {
scriptBodyResolver.setExpressionTypingServices(expressionTypingServices); scriptBodyResolver.setExpressionTypingServices(expressionTypingServices);
} }
@PreDestroy @PreDestroy
public void destroy() { public void destroy() {
} }
public ResolveSession getResolveSession() { public ResolveSession getResolveSession() {
return this.resolveSession; return this.resolveSession;
} }
} }
@@ -45,7 +45,7 @@ import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */ /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */
@SuppressWarnings("all") @SuppressWarnings("all")
public class InjectorForMacros { public class InjectorForMacros {
private final Project project; private final Project project;
private final ModuleDescriptor moduleDescriptor; private final ModuleDescriptor moduleDescriptor;
private final PlatformToKotlinClassMap platformToKotlinClassMap; private final PlatformToKotlinClassMap platformToKotlinClassMap;
@@ -69,7 +69,7 @@ public class InjectorForMacros {
private final ArgumentTypeResolver argumentTypeResolver; private final ArgumentTypeResolver argumentTypeResolver;
private final CallCompleter callCompleter; private final CallCompleter callCompleter;
private final CandidateResolver candidateResolver; private final CandidateResolver candidateResolver;
public InjectorForMacros( public InjectorForMacros(
@NotNull Project project, @NotNull Project project,
@NotNull ModuleDescriptor moduleDescriptor @NotNull ModuleDescriptor moduleDescriptor
@@ -151,21 +151,21 @@ public class InjectorForMacros {
candidateResolver.setArgumentTypeResolver(argumentTypeResolver); candidateResolver.setArgumentTypeResolver(argumentTypeResolver);
} }
@PreDestroy @PreDestroy
public void destroy() { public void destroy() {
} }
public ExpressionTypingServices getExpressionTypingServices() { public ExpressionTypingServices getExpressionTypingServices() {
return this.expressionTypingServices; return this.expressionTypingServices;
} }
public ExpressionTypingComponents getExpressionTypingComponents() { public ExpressionTypingComponents getExpressionTypingComponents() {
return this.expressionTypingComponents; return this.expressionTypingComponents;
} }
public CallResolver getCallResolver() { public CallResolver getCallResolver() {
return this.callResolver; return this.callResolver;
} }
} }
@@ -62,7 +62,7 @@ import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */ /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */
@SuppressWarnings("all") @SuppressWarnings("all")
public class InjectorForTopDownAnalyzerBasic { public class InjectorForTopDownAnalyzerBasic {
private final Project project; private final Project project;
private final GlobalContext globalContext; private final GlobalContext globalContext;
private final StorageManager storageManager; private final StorageManager storageManager;
@@ -103,7 +103,7 @@ public class InjectorForTopDownAnalyzerBasic {
private final OverrideResolver overrideResolver; private final OverrideResolver overrideResolver;
private final TypeHierarchyResolver typeHierarchyResolver; private final TypeHierarchyResolver typeHierarchyResolver;
private final ScriptHeaderResolver scriptHeaderResolver; private final ScriptHeaderResolver scriptHeaderResolver;
public InjectorForTopDownAnalyzerBasic( public InjectorForTopDownAnalyzerBasic(
@NotNull Project project, @NotNull Project project,
@NotNull GlobalContext globalContext, @NotNull GlobalContext globalContext,
@@ -269,21 +269,21 @@ public class InjectorForTopDownAnalyzerBasic {
scriptHeaderResolver.setTrace(bindingTrace); scriptHeaderResolver.setTrace(bindingTrace);
} }
@PreDestroy @PreDestroy
public void destroy() { public void destroy() {
} }
public ModuleDescriptor getModuleDescriptor() { public ModuleDescriptor getModuleDescriptor() {
return this.moduleDescriptor; return this.moduleDescriptor;
} }
public TopDownAnalyzer getTopDownAnalyzer() { public TopDownAnalyzer getTopDownAnalyzer() {
return this.topDownAnalyzer; return this.topDownAnalyzer;
} }
public LazyTopDownAnalyzer getLazyTopDownAnalyzer() { public LazyTopDownAnalyzer getLazyTopDownAnalyzer() {
return this.lazyTopDownAnalyzer; return this.lazyTopDownAnalyzer;
} }
} }
@@ -45,7 +45,7 @@ import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */ /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */
@SuppressWarnings("all") @SuppressWarnings("all")
public class InjectorForTests { public class InjectorForTests {
private final Project project; private final Project project;
private final ModuleDescriptor moduleDescriptor; private final ModuleDescriptor moduleDescriptor;
private final PlatformToKotlinClassMap platformToKotlinClassMap; private final PlatformToKotlinClassMap platformToKotlinClassMap;
@@ -69,7 +69,7 @@ public class InjectorForTests {
private final CallExpressionResolver callExpressionResolver; private final CallExpressionResolver callExpressionResolver;
private final CallResolverExtensionProvider callResolverExtensionProvider; private final CallResolverExtensionProvider callResolverExtensionProvider;
private final QualifiedExpressionResolver qualifiedExpressionResolver; private final QualifiedExpressionResolver qualifiedExpressionResolver;
public InjectorForTests( public InjectorForTests(
@NotNull Project project, @NotNull Project project,
@NotNull ModuleDescriptor moduleDescriptor @NotNull ModuleDescriptor moduleDescriptor
@@ -151,25 +151,25 @@ public class InjectorForTests {
callExpressionResolver.setExpressionTypingServices(expressionTypingServices); callExpressionResolver.setExpressionTypingServices(expressionTypingServices);
} }
@PreDestroy @PreDestroy
public void destroy() { public void destroy() {
} }
public DescriptorResolver getDescriptorResolver() { public DescriptorResolver getDescriptorResolver() {
return this.descriptorResolver; return this.descriptorResolver;
} }
public ExpressionTypingServices getExpressionTypingServices() { public ExpressionTypingServices getExpressionTypingServices() {
return this.expressionTypingServices; return this.expressionTypingServices;
} }
public ExpressionTypingUtils getExpressionTypingUtils() { public ExpressionTypingUtils getExpressionTypingUtils() {
return this.expressionTypingUtils; return this.expressionTypingUtils;
} }
public TypeResolver getTypeResolver() { public TypeResolver getTypeResolver() {
return this.typeResolver; return this.typeResolver;
} }
} }
@@ -23,7 +23,7 @@ import java.util.HashSet;
/** This class is generated by {@link "org.jetbrains.jet.generators.frontend.GenerateKeywordStrings"}. DO NOT MODIFY MANUALLY */ /** This class is generated by {@link "org.jetbrains.jet.generators.frontend.GenerateKeywordStrings"}. DO NOT MODIFY MANUALLY */
public class KeywordStringsGenerated { public class KeywordStringsGenerated {
private KeywordStringsGenerated() {} private KeywordStringsGenerated() {}
public static final Set<String> KEYWORDS = new HashSet<String>(Arrays.asList( public static final Set<String> KEYWORDS = new HashSet<String>(Arrays.asList(
"package", "package",
"as", "as",
@@ -62,7 +62,7 @@ import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */ /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */
@SuppressWarnings("all") @SuppressWarnings("all")
public class InjectorForTopDownAnalyzerForJs { public class InjectorForTopDownAnalyzerForJs {
private final Project project; private final Project project;
private final GlobalContext globalContext; private final GlobalContext globalContext;
private final StorageManager storageManager; private final StorageManager storageManager;
@@ -103,7 +103,7 @@ public class InjectorForTopDownAnalyzerForJs {
private final OverrideResolver overrideResolver; private final OverrideResolver overrideResolver;
private final TypeHierarchyResolver typeHierarchyResolver; private final TypeHierarchyResolver typeHierarchyResolver;
private final ScriptHeaderResolver scriptHeaderResolver; private final ScriptHeaderResolver scriptHeaderResolver;
public InjectorForTopDownAnalyzerForJs( public InjectorForTopDownAnalyzerForJs(
@NotNull Project project, @NotNull Project project,
@NotNull GlobalContext globalContext, @NotNull GlobalContext globalContext,
@@ -268,21 +268,21 @@ public class InjectorForTopDownAnalyzerForJs {
scriptHeaderResolver.setTrace(bindingTrace); scriptHeaderResolver.setTrace(bindingTrace);
} }
@PreDestroy @PreDestroy
public void destroy() { public void destroy() {
} }
public ModuleDescriptor getModuleDescriptor() { public ModuleDescriptor getModuleDescriptor() {
return this.moduleDescriptor; return this.moduleDescriptor;
} }
public TopDownAnalyzer getTopDownAnalyzer() { public TopDownAnalyzer getTopDownAnalyzer() {
return this.topDownAnalyzer; return this.topDownAnalyzer;
} }
public LazyTopDownAnalyzer getLazyTopDownAnalyzer() { public LazyTopDownAnalyzer getLazyTopDownAnalyzer() {
return this.lazyTopDownAnalyzer; return this.lazyTopDownAnalyzer;
} }
} }