From 51fd654802fe7e6aad155b7ba16071d08cf6b580 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 20 Oct 2014 18:42:51 +0400 Subject: [PATCH] Regenerate injectors and keyword strings After recent changes to Printer --- .../di/InjectorForJavaDescriptorResolver.java | 16 ++++++++-------- .../jet/di/InjectorForLazyResolveWithJava.java | 12 ++++++------ .../di/InjectorForTopDownAnalyzerForJvm.java | 18 +++++++++--------- .../jet/di/InjectorForBodyResolve.java | 10 +++++----- .../jet/di/InjectorForLazyResolve.java | 10 +++++----- .../jetbrains/jet/di/InjectorForMacros.java | 14 +++++++------- .../di/InjectorForTopDownAnalyzerBasic.java | 14 +++++++------- .../org/jetbrains/jet/di/InjectorForTests.java | 16 ++++++++-------- .../jet/renderer/KeywordStringsGenerated.java | 2 +- .../di/InjectorForTopDownAnalyzerForJs.java | 14 +++++++------- 10 files changed, 63 insertions(+), 63 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java index 32d65f62bb7..0765492d223 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java @@ -47,7 +47,7 @@ import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */ @SuppressWarnings("all") public class InjectorForJavaDescriptorResolver { - + private final Project project; private final BindingTrace bindingTrace; private final GlobalContextImpl globalContext; @@ -73,7 +73,7 @@ public class InjectorForJavaDescriptorResolver { private final AnnotationDescriptorLoader annotationDescriptorLoader; private final DescriptorLoadersStorage descriptorLoadersStorage; private final ConstantDescriptorLoader constantDescriptorLoader; - + public InjectorForJavaDescriptorResolver( @NotNull Project project, @NotNull BindingTrace bindingTrace @@ -138,25 +138,25 @@ public class InjectorForJavaDescriptorResolver { javaClassFinder.initialize(); } - + @PreDestroy public void destroy() { } - + public GlobalContextImpl getGlobalContext() { return this.globalContext; } - + public ModuleDescriptorImpl getModule() { return this.module; } - + public JavaDescriptorResolver getJavaDescriptorResolver() { return this.javaDescriptorResolver; } - + public JavaClassFinderImpl getJavaClassFinder() { return this.javaClassFinder; } - + } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java index edfd9d49345..52b1c0faeb1 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java @@ -71,7 +71,7 @@ import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */ @SuppressWarnings("all") public class InjectorForLazyResolveWithJava { - + private final Project project; private final GlobalContext globalContext; private final StorageManager storageManager; @@ -121,7 +121,7 @@ public class InjectorForLazyResolveWithJava { private final AnnotationDescriptorLoader annotationDescriptorLoader; private final DescriptorLoadersStorage descriptorLoadersStorage; private final ConstantDescriptorLoader constantDescriptorLoader; - + public InjectorForLazyResolveWithJava( @NotNull Project project, @NotNull GlobalContext globalContext, @@ -277,17 +277,17 @@ public class InjectorForLazyResolveWithJava { javaClassFinder.initialize(); } - + @PreDestroy public void destroy() { } - + public ResolveSession getResolveSession() { return this.resolveSession; } - + public JavaDescriptorResolver getJavaDescriptorResolver() { return this.javaDescriptorResolver; } - + } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java index c523ddbece0..ac9c1fdabf3 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -82,7 +82,7 @@ import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */ @SuppressWarnings("all") public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnalyzer { - + private final Project project; private final GlobalContext globalContext; private final StorageManager storageManager; @@ -143,7 +143,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly private final AnnotationDescriptorLoader annotationDescriptorLoader; private final DescriptorLoadersStorage descriptorLoadersStorage; private final ConstantDescriptorLoader constantDescriptorLoader; - + public InjectorForTopDownAnalyzerForJvm( @NotNull Project project, @NotNull GlobalContext globalContext, @@ -361,29 +361,29 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly javaClassFinder.initialize(); } - + @PreDestroy public void destroy() { } - + public ModuleDescriptor getModuleDescriptor() { return this.moduleDescriptor; } - + public TopDownAnalyzer getTopDownAnalyzer() { return this.topDownAnalyzer; } - + public LazyTopDownAnalyzer getLazyTopDownAnalyzer() { return this.lazyTopDownAnalyzer; } - + public JavaDescriptorResolver getJavaDescriptorResolver() { return this.javaDescriptorResolver; } - + public DeserializationGlobalContextForJava getDeserializationGlobalContextForJava() { return this.deserializationGlobalContextForJava; } - + } diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java index a5eff9705fe..c3cb6aa4e1d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java @@ -52,7 +52,7 @@ import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */ @SuppressWarnings("all") public class InjectorForBodyResolve { - + private final Project project; private final GlobalContext globalContext; private final StorageManager storageManager; @@ -83,7 +83,7 @@ public class InjectorForBodyResolve { private final ModifiersChecker modifiersChecker; private final FunctionAnalyzerExtension functionAnalyzerExtension; private final ScriptBodyResolver scriptBodyResolver; - + public InjectorForBodyResolve( @NotNull Project project, @NotNull GlobalContext globalContext, @@ -195,13 +195,13 @@ public class InjectorForBodyResolve { scriptBodyResolver.setExpressionTypingServices(expressionTypingServices); } - + @PreDestroy public void destroy() { } - + public BodyResolver getBodyResolver() { return this.bodyResolver; } - + } diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java index 9424c33bc38..b3e4cb04347 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java @@ -51,7 +51,7 @@ import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */ @SuppressWarnings("all") public class InjectorForLazyResolve { - + private final Project project; private final GlobalContext globalContext; private final StorageManager storageManager; @@ -81,7 +81,7 @@ public class InjectorForLazyResolve { private final JetImportsFactory jetImportsFactory; private final ScopeProvider scopeProvider; private final ScriptBodyResolver scriptBodyResolver; - + public InjectorForLazyResolve( @NotNull Project project, @NotNull GlobalContext globalContext, @@ -185,13 +185,13 @@ public class InjectorForLazyResolve { scriptBodyResolver.setExpressionTypingServices(expressionTypingServices); } - + @PreDestroy public void destroy() { } - + public ResolveSession getResolveSession() { return this.resolveSession; } - + } diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java index 1d17be12363..0933ca98b58 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java @@ -45,7 +45,7 @@ import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */ @SuppressWarnings("all") public class InjectorForMacros { - + private final Project project; private final ModuleDescriptor moduleDescriptor; private final PlatformToKotlinClassMap platformToKotlinClassMap; @@ -69,7 +69,7 @@ public class InjectorForMacros { private final ArgumentTypeResolver argumentTypeResolver; private final CallCompleter callCompleter; private final CandidateResolver candidateResolver; - + public InjectorForMacros( @NotNull Project project, @NotNull ModuleDescriptor moduleDescriptor @@ -151,21 +151,21 @@ public class InjectorForMacros { candidateResolver.setArgumentTypeResolver(argumentTypeResolver); } - + @PreDestroy public void destroy() { } - + public ExpressionTypingServices getExpressionTypingServices() { return this.expressionTypingServices; } - + public ExpressionTypingComponents getExpressionTypingComponents() { return this.expressionTypingComponents; } - + public CallResolver getCallResolver() { return this.callResolver; } - + } diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java index b5267bb4497..bf3e0f9af85 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java @@ -62,7 +62,7 @@ import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */ @SuppressWarnings("all") public class InjectorForTopDownAnalyzerBasic { - + private final Project project; private final GlobalContext globalContext; private final StorageManager storageManager; @@ -103,7 +103,7 @@ public class InjectorForTopDownAnalyzerBasic { private final OverrideResolver overrideResolver; private final TypeHierarchyResolver typeHierarchyResolver; private final ScriptHeaderResolver scriptHeaderResolver; - + public InjectorForTopDownAnalyzerBasic( @NotNull Project project, @NotNull GlobalContext globalContext, @@ -269,21 +269,21 @@ public class InjectorForTopDownAnalyzerBasic { scriptHeaderResolver.setTrace(bindingTrace); } - + @PreDestroy public void destroy() { } - + public ModuleDescriptor getModuleDescriptor() { return this.moduleDescriptor; } - + public TopDownAnalyzer getTopDownAnalyzer() { return this.topDownAnalyzer; } - + public LazyTopDownAnalyzer getLazyTopDownAnalyzer() { return this.lazyTopDownAnalyzer; } - + } diff --git a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java index 5c0e85128c8..39aa65f88a4 100644 --- a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java +++ b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java @@ -45,7 +45,7 @@ import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */ @SuppressWarnings("all") public class InjectorForTests { - + private final Project project; private final ModuleDescriptor moduleDescriptor; private final PlatformToKotlinClassMap platformToKotlinClassMap; @@ -69,7 +69,7 @@ public class InjectorForTests { private final CallExpressionResolver callExpressionResolver; private final CallResolverExtensionProvider callResolverExtensionProvider; private final QualifiedExpressionResolver qualifiedExpressionResolver; - + public InjectorForTests( @NotNull Project project, @NotNull ModuleDescriptor moduleDescriptor @@ -151,25 +151,25 @@ public class InjectorForTests { callExpressionResolver.setExpressionTypingServices(expressionTypingServices); } - + @PreDestroy public void destroy() { } - + public DescriptorResolver getDescriptorResolver() { return this.descriptorResolver; } - + public ExpressionTypingServices getExpressionTypingServices() { return this.expressionTypingServices; } - + public ExpressionTypingUtils getExpressionTypingUtils() { return this.expressionTypingUtils; } - + public TypeResolver getTypeResolver() { return this.typeResolver; } - + } diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java b/core/descriptors/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java index 779666a155a..735e9911c05 100644 --- a/core/descriptors/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java +++ b/core/descriptors/src/org/jetbrains/jet/renderer/KeywordStringsGenerated.java @@ -23,7 +23,7 @@ import java.util.HashSet; /** This class is generated by {@link "org.jetbrains.jet.generators.frontend.GenerateKeywordStrings"}. DO NOT MODIFY MANUALLY */ public class KeywordStringsGenerated { private KeywordStringsGenerated() {} - + public static final Set KEYWORDS = new HashSet(Arrays.asList( "package", "as", diff --git a/js/js.frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java b/js/js.frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java index 60b3e0fedfe..90cbe4aa2c8 100644 --- a/js/js.frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java @@ -62,7 +62,7 @@ import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.generators.injectors.InjectorsPackage. DO NOT EDIT! */ @SuppressWarnings("all") public class InjectorForTopDownAnalyzerForJs { - + private final Project project; private final GlobalContext globalContext; private final StorageManager storageManager; @@ -103,7 +103,7 @@ public class InjectorForTopDownAnalyzerForJs { private final OverrideResolver overrideResolver; private final TypeHierarchyResolver typeHierarchyResolver; private final ScriptHeaderResolver scriptHeaderResolver; - + public InjectorForTopDownAnalyzerForJs( @NotNull Project project, @NotNull GlobalContext globalContext, @@ -268,21 +268,21 @@ public class InjectorForTopDownAnalyzerForJs { scriptHeaderResolver.setTrace(bindingTrace); } - + @PreDestroy public void destroy() { } - + public ModuleDescriptor getModuleDescriptor() { return this.moduleDescriptor; } - + public TopDownAnalyzer getTopDownAnalyzer() { return this.topDownAnalyzer; } - + public LazyTopDownAnalyzer getLazyTopDownAnalyzer() { return this.lazyTopDownAnalyzer; } - + }