From 7ef14fc11b74220cea35589d065d14be92c06921 Mon Sep 17 00:00:00 2001 From: Artem Kobzar Date: Wed, 16 Mar 2022 16:18:19 +0100 Subject: [PATCH] chore: use CompositeBlock instead of GlobalBlock. --- .../kotlin/cli/js/internal/JSStdlibLinker.kt | 2 +- .../kotlin/ir/backend/js/codegen/IrToJs.kt | 6 +- .../irToJs/IrDeclarationToJsTransformer.kt | 2 +- .../IrElementToJsStatementTransformer.kt | 3 +- .../irToJs/IrFileToJsTransformer.kt | 5 +- .../irToJs/IrModuleToJsTransformer.kt | 4 +- .../transformers/irToJs/JsClassGenerator.kt | 10 +- .../irToJs/JsIrProgramFragment.kt | 8 +- .../backend/js/transformers/irToJs/Merger.kt | 8 +- .../ir/backend/js/utils/JsStaticContext.kt | 4 +- .../serialization/JsIrAstDeserializer.kt | 12 +- .../backend/JsToStringGenerationVisitor.java | 5 +- .../kotlin/js/backend/ast/JsBlock.java | 4 +- .../kotlin/js/backend/ast/JsClassModel.kt | 2 +- ...{JsVirtualBlock.kt => JsCompositeBlock.kt} | 10 +- .../kotlin/js/backend/ast/JsGlobalBlock.java | 29 - .../kotlin/js/backend/ast/JsProgram.java | 4 +- .../js/backend/ast/JsProgramFragment.kt | 8 +- .../kotlin/js/dce/DeadCodeElimination.kt | 4 +- .../kotlin/js/inline/InliningScope.kt | 2 +- js/js.serializer/src/js-ast.proto | 25 +- .../serialization/js/ast/JsAstDeserializer.kt | 15 +- .../js/ast/JsAstDeserializerBase.kt | 13 +- .../serialization/js/ast/JsAstProtoBuf.java | 1202 ++++------------- .../js/ast/JsAstSerializerBase.kt | 14 +- .../js/testOld/ast/NameResolutionTest.kt | 6 +- .../context/InlineFunctionContext.kt | 8 +- .../kotlin/js/translate/general/Merger.kt | 8 +- 28 files changed, 374 insertions(+), 1049 deletions(-) rename js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/{JsVirtualBlock.kt => JsCompositeBlock.kt} (62%) delete mode 100644 js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsGlobalBlock.java diff --git a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/internal/JSStdlibLinker.kt b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/internal/JSStdlibLinker.kt index b678fbd1112..6a6ea9b11ba 100644 --- a/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/internal/JSStdlibLinker.kt +++ b/compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/internal/JSStdlibLinker.kt @@ -97,7 +97,7 @@ private fun mergeStdlibParts(outputFile: File, wrapperFile: File, baseDir: File, } private fun List.createInsertionPlace(): JsBlock { - val block = JsGlobalBlock() + val block = JsCompositeBlock() val visitor = object : JsVisitorWithContextImpl() { override fun visit(x: JsExpressionStatement, ctx: JsContext): Boolean { diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/codegen/IrToJs.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/codegen/IrToJs.kt index d883cb38df4..7b7b992d838 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/codegen/IrToJs.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/codegen/IrToJs.kt @@ -172,8 +172,8 @@ class IrToJs( it.accept(IrFileToJsTransformer(), staticContext).statements } - val preDeclarationBlock = JsGlobalBlock() - val postDeclarationBlock = JsGlobalBlock() + val preDeclarationBlock = JsCompositeBlock() + val postDeclarationBlock = JsCompositeBlock() processClassModels(staticContext.classModels, preDeclarationBlock, postDeclarationBlock) val statements = mutableListOf() @@ -421,7 +421,7 @@ private val IrModuleFragment.jsModuleName: String get() = name.asString().dropWhile { it == '<' }.dropLastWhile { it == '>' } private fun List.toJsCodeString(): String = - JsGlobalBlock().also { it.statements += this }.toString() + JsCompositeBlock().also { it.statements += this }.toString() enum class JsGenerationGranularity { WHOLE_PROGRAM, diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrDeclarationToJsTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrDeclarationToJsTransformer.kt index 1bbe466cf31..9ed60fdf765 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrDeclarationToJsTransformer.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrDeclarationToJsTransformer.kt @@ -51,7 +51,7 @@ class IrDeclarationToJsTransformer : BaseIrElementToJsNodeTransformer { override fun visitFile(declaration: IrFile, data: JsStaticContext): JsBlock { @@ -20,7 +19,7 @@ class IrFileToJsTransformer(private val useBareParameterNames: Boolean = false) staticContext = data, useBareParameterNames = useBareParameterNames ) - val block = JsGlobalBlock() + val block = JsCompositeBlock() declaration.declarations.forEach { block.statements.add(it.accept(IrDeclarationToJsTransformer(), fileContext)) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt index d0eba890169..e3e6d4e3cff 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt @@ -293,8 +293,8 @@ class IrModuleToJsTransformer( private fun generateModuleBody(modules: Iterable, staticContext: JsStaticContext): List { val statements = mutableListOf() - val preDeclarationBlock = JsGlobalBlock() - val postDeclarationBlock = JsGlobalBlock() + val preDeclarationBlock = JsCompositeBlock() + val postDeclarationBlock = JsCompositeBlock() statements.addWithComment("block: pre-declaration", preDeclarationBlock) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsClassGenerator.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsClassGenerator.kt index e7b094314c0..f652c21b431 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsClassGenerator.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsClassGenerator.kt @@ -34,7 +34,7 @@ class JsClassGenerator(private val irClass: IrClass, val context: JsGenerationCo if (baseClass != null && !baseClass.isAny()) baseClass.getClassRef(context) else null } private val classPrototypeRef = prototypeOf(classNameRef) - private val classBlock = JsGlobalBlock() + private val classBlock = JsCompositeBlock() private val classModel = JsIrClassModel(irClass) private val es6mode = context.staticContext.backendContext.es6mode @@ -434,11 +434,11 @@ private val IrClassifierSymbol.isEffectivelyExternal get() = (owner as? IrDeclar class JsIrClassModel(val klass: IrClass) { val superClasses = klass.superTypes.map { it.classifierOrFail as IrClassSymbol } - val preDeclarationBlock = JsGlobalBlock() - val postDeclarationBlock = JsGlobalBlock() + val preDeclarationBlock = JsCompositeBlock() + val postDeclarationBlock = JsCompositeBlock() } class JsIrIcClassModel(val superClasses: List) { - val preDeclarationBlock = JsGlobalBlock() - val postDeclarationBlock = JsGlobalBlock() + val preDeclarationBlock = JsCompositeBlock() + val postDeclarationBlock = JsCompositeBlock() } \ No newline at end of file diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsIrProgramFragment.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsIrProgramFragment.kt index 412eb723c19..c516a9c7fd9 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsIrProgramFragment.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsIrProgramFragment.kt @@ -10,18 +10,18 @@ import org.jetbrains.kotlin.js.backend.ast.* class JsIrProgramFragment(val packageFqn: String) { val nameBindings = mutableMapOf() - val declarations = JsGlobalBlock() - val exports = JsGlobalBlock() + val declarations = JsCompositeBlock() + val exports = JsCompositeBlock() val importedModules = mutableListOf() val imports = mutableMapOf() var dts: String? = null val classes = mutableMapOf() - val initializers = JsGlobalBlock() + val initializers = JsCompositeBlock() var mainFunction: JsStatement? = null var testFunInvocation: JsStatement? = null var suiteFn: JsName? = null val definitions = mutableSetOf() - val polyfills = JsGlobalBlock() + val polyfills = JsCompositeBlock() } class JsIrModule( diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/Merger.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/Merger.kt index b4c536bee32..bd6e437fca6 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/Merger.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/Merger.kt @@ -161,14 +161,14 @@ class Merger( val moduleBody = mutableListOf() - val preDeclarationBlock = JsGlobalBlock() - val postDeclarationBlock = JsGlobalBlock() - val polyfillDeclarationBlock = JsGlobalBlock() + val preDeclarationBlock = JsCompositeBlock() + val postDeclarationBlock = JsCompositeBlock() + val polyfillDeclarationBlock = JsCompositeBlock() moduleBody.addWithComment("block: pre-declaration", preDeclarationBlock) val classModels = mutableMapOf() - val initializerBlock = JsGlobalBlock() + val initializerBlock = JsCompositeBlock() fragments.forEach { moduleBody += it.declarations.statements diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/JsStaticContext.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/JsStaticContext.kt index 325f7bc319f..cc6bb413c2b 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/JsStaticContext.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/JsStaticContext.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.JsIntrinsicTransfo import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.JsIrClassModel import org.jetbrains.kotlin.ir.declarations.IrDeclaration import org.jetbrains.kotlin.ir.symbols.IrClassSymbol -import org.jetbrains.kotlin.js.backend.ast.JsGlobalBlock +import org.jetbrains.kotlin.js.backend.ast.JsCompositeBlock import org.jetbrains.kotlin.js.config.JSConfigurationKeys @@ -23,7 +23,7 @@ class JsStaticContext( val classModels = mutableMapOf() val coroutineImplDeclaration = backendContext.ir.symbols.coroutineImpl.owner - val initializerBlock = JsGlobalBlock() + val initializerBlock = JsCompositeBlock() val genSourcemaps = backendContext.configuration.getBoolean(JSConfigurationKeys.SOURCE_MAP) } diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/serialization/JsIrAstDeserializer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/serialization/JsIrAstDeserializer.kt index 8cdc1a2ec29..3d6659d7ce2 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/serialization/JsIrAstDeserializer.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/serialization/JsIrAstDeserializer.kt @@ -51,16 +51,16 @@ class JsIrAstDeserializer : JsAstDeserializerBase() { } if (proto.hasDeclarationBlock()) { - fragment.declarations.statements += deserializeGlobalBlock(proto.declarationBlock).statements + fragment.declarations.statements += deserializeCompositeBlock(proto.declarationBlock).statements } if (proto.hasInitializerBlock()) { - fragment.initializers.statements += deserializeGlobalBlock(proto.initializerBlock).statements + fragment.initializers.statements += deserializeCompositeBlock(proto.initializerBlock).statements } if (proto.hasExportBlock()) { - fragment.exports.statements += deserializeGlobalBlock(proto.exportBlock).statements + fragment.exports.statements += deserializeCompositeBlock(proto.exportBlock).statements } if (proto.hasPolyfills()) { - fragment.polyfills.statements += deserializeGlobalBlock(proto.polyfills).statements + fragment.polyfills.statements += deserializeCompositeBlock(proto.polyfills).statements } proto.nameBindingList.associateTo(fragment.nameBindings) { nameBindingProto -> @@ -90,10 +90,10 @@ class JsIrAstDeserializer : JsAstDeserializerBase() { private fun deserialize(proto: IrClassModel): Pair { return deserializeName(proto.nameId) to JsIrIcClassModel(proto.superClassesList.map { deserializeName(it) }).apply { if (proto.hasPreDeclarationBlock()) { - preDeclarationBlock.statements += deserializeGlobalBlock(proto.preDeclarationBlock).statements + preDeclarationBlock.statements += deserializeCompositeBlock(proto.preDeclarationBlock).statements } if (proto.hasPostDeclarationBlock()) { - postDeclarationBlock.statements += deserializeGlobalBlock(proto.postDeclarationBlock).statements + postDeclarationBlock.statements += deserializeCompositeBlock(proto.postDeclarationBlock).statements } } } diff --git a/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsToStringGenerationVisitor.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsToStringGenerationVisitor.java index 844940310e9..7385ad92790 100644 --- a/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsToStringGenerationVisitor.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/JsToStringGenerationVisitor.java @@ -1275,14 +1275,15 @@ public class JsToStringGenerationVisitor extends JsVisitor { sourceLocationConsumer.pushSourceInfo(null); - boolean needBraces = !x.isGlobalBlock() && !x.isVirtualBlock(); + boolean needBraces = !x.isTransparent(); + if (needBraces) { blockOpen(); } Iterator iterator = x.getStatements().iterator(); while (iterator.hasNext()) { - boolean isGlobal = x.isGlobalBlock() || globalBlocks.contains(x); + boolean isGlobal = x.isTransparent() || globalBlocks.contains(x); JsStatement statement = iterator.next(); if (statement instanceof JsEmpty) { diff --git a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsBlock.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsBlock.java index e0034cece59..84fdefe0d94 100644 --- a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsBlock.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsBlock.java @@ -43,12 +43,10 @@ public class JsBlock extends SourceInfoAwareJsNode implements JsStatement { return statements.isEmpty(); } - public boolean isGlobalBlock() { + public boolean isTransparent() { return false; } - public boolean isVirtualBlock() { return false; } - @Override public void accept(JsVisitor v) { v.visitBlock(this); diff --git a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsClassModel.kt b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsClassModel.kt index 0a4df27a1cd..648d3dffe3c 100644 --- a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsClassModel.kt +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsClassModel.kt @@ -18,5 +18,5 @@ package org.jetbrains.kotlin.js.backend.ast class JsClassModel(val name: JsName, val superName: JsName?) { val interfaces: MutableSet = mutableSetOf() - val postDeclarationBlock = JsGlobalBlock() + val postDeclarationBlock = JsCompositeBlock() } diff --git a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsVirtualBlock.kt b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsCompositeBlock.kt similarity index 62% rename from js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsVirtualBlock.kt rename to js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsCompositeBlock.kt index 68f6d7017b4..2e31f09e073 100644 --- a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsVirtualBlock.kt +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsCompositeBlock.kt @@ -7,15 +7,15 @@ import org.jetbrains.kotlin.js.util.AstUtil; /** - * Represents a JavaScript block in the global scope. + * Represents a JavaScript block which could not be rendered into a material one. */ -class JsVirtualBlock(statements: List = emptyList()) : JsBlock(statements) { - override fun isVirtualBlock(): Boolean { +class JsCompositeBlock(statements: List = mutableListOf()) : JsBlock(statements) { + override fun isTransparent(): Boolean { return true } - override fun deepCopy(): JsVirtualBlock { - val globalBlockCopy = JsVirtualBlock() + override fun deepCopy(): JsCompositeBlock { + val globalBlockCopy = JsCompositeBlock() val statementscopy = AstUtil.deepCopy(statements); globalBlockCopy.statements.addAll(statementscopy); return globalBlockCopy.withMetadataFrom(this); diff --git a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsGlobalBlock.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsGlobalBlock.java deleted file mode 100644 index a1910eea822..00000000000 --- a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsGlobalBlock.java +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file -// for details. All rights reserved. Use of this source code is governed by a -// BSD-style license that can be found in the LICENSE file. - -package org.jetbrains.kotlin.js.backend.ast; - -import org.jetbrains.kotlin.js.util.AstUtil; -import org.jetbrains.annotations.NotNull; - -import java.util.List; - -/** - * Represents a JavaScript block in the global scope. - */ -public class JsGlobalBlock extends JsBlock { - @Override - public boolean isGlobalBlock() { - return true; - } - - @NotNull - @Override - public JsGlobalBlock deepCopy() { - JsGlobalBlock globalBlockCopy = new JsGlobalBlock(); - List statementscopy = AstUtil.deepCopy(getStatements()); - globalBlockCopy.getStatements().addAll(statementscopy); - return globalBlockCopy.withMetadataFrom(this); - } -} diff --git a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsProgram.java b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsProgram.java index e9b1b8ff699..81f5d9484a0 100644 --- a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsProgram.java +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsProgram.java @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; * A JavaScript program. */ public final class JsProgram extends SourceInfoAwareJsNode { - private final JsGlobalBlock globalBlock = new JsGlobalBlock(); + private final JsCompositeBlock globalBlock = new JsCompositeBlock(); private final JsRootScope rootScope; private final JsObjectScope topScope; @@ -20,7 +20,7 @@ public final class JsProgram extends SourceInfoAwareJsNode { topScope = new JsObjectScope(rootScope, "Global"); } - public JsGlobalBlock getGlobalBlock() { + public JsCompositeBlock getGlobalBlock() { return globalBlock; } diff --git a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsProgramFragment.kt b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsProgramFragment.kt index 73b455ee8cf..fac740faa5c 100644 --- a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsProgramFragment.kt +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsProgramFragment.kt @@ -9,13 +9,13 @@ import java.util.* class JsProgramFragment(val scope: JsScope, val packageFqn: String) { val importedModules = mutableListOf() val imports: MutableMap = LinkedHashMap() - val declarationBlock = JsGlobalBlock() - val exportBlock = JsGlobalBlock() - val initializerBlock = JsGlobalBlock() + val declarationBlock = JsCompositeBlock() + val exportBlock = JsCompositeBlock() + val initializerBlock = JsCompositeBlock() val nameBindings = mutableListOf() val classes: MutableMap = LinkedHashMap() val inlineModuleMap: MutableMap = LinkedHashMap() var tests: JsStatement? = null var mainFunction: JsStatement? = null - val inlinedLocalDeclarations = mutableMapOf() + val inlinedLocalDeclarations = mutableMapOf() } diff --git a/js/js.dce/src/org/jetbrains/kotlin/js/dce/DeadCodeElimination.kt b/js/js.dce/src/org/jetbrains/kotlin/js/dce/DeadCodeElimination.kt index fbae7f8d6fe..984fbc3354f 100644 --- a/js/js.dce/src/org/jetbrains/kotlin/js/dce/DeadCodeElimination.kt +++ b/js/js.dce/src/org/jetbrains/kotlin/js/dce/DeadCodeElimination.kt @@ -9,7 +9,7 @@ import com.google.gwt.dev.js.rhino.CodePosition import com.google.gwt.dev.js.rhino.ErrorReporter import org.jetbrains.kotlin.js.backend.JsToStringGenerationVisitor import org.jetbrains.kotlin.js.backend.ast.JsBlock -import org.jetbrains.kotlin.js.backend.ast.JsGlobalBlock +import org.jetbrains.kotlin.js.backend.ast.JsCompositeBlock import org.jetbrains.kotlin.js.backend.ast.JsNode import org.jetbrains.kotlin.js.backend.ast.JsProgram import org.jetbrains.kotlin.js.dce.Context.Node @@ -78,7 +78,7 @@ class DeadCodeElimination( var hasErrors = false val blocks = inputFiles.map { file -> - val block = JsGlobalBlock() + val block = JsCompositeBlock() val code = file.resource.reader().let { InputStreamReader(it, "UTF-8") }.use { it.readText() } val statements = parse(code, Reporter(file.resource.name, logConsumer), program.scope, file.resource.name) ?: run { hasErrors = true diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InliningScope.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InliningScope.kt index 8d4e70f3a37..193025e6c96 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InliningScope.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InliningScope.kt @@ -177,7 +177,7 @@ class ImportIntoFragmentInliningScope private constructor( override fun addInlinedDeclaration(tag: String?, declaration: JsStatement) { if (tag != null) { - fragment.inlinedLocalDeclarations.computeIfAbsent(tag) { JsGlobalBlock() }.statements.add(declaration) + fragment.inlinedLocalDeclarations.computeIfAbsent(tag) { JsCompositeBlock() }.statements.add(declaration) } else { additionalDeclarations.add(declaration) } diff --git a/js/js.serializer/src/js-ast.proto b/js/js.serializer/src/js-ast.proto index 384ffe5b903..9d3d4870979 100644 --- a/js/js.serializer/src/js-ast.proto +++ b/js/js.serializer/src/js-ast.proto @@ -243,7 +243,7 @@ message Statement { ExpressionStatement expression = 26; Vars vars = 27; Block block = 28; - GlobalBlock global_block = 29; + CompositeBlock composite_block = 29; Label label = 30; If if_statement = 31; Switch switch_statement = 32; @@ -254,7 +254,6 @@ message Statement { Try try_statement = 37; Empty empty = 38; SingleLineComment single_line_comment = 39; - VirtualBlock virtual_block = 40; } } @@ -299,11 +298,7 @@ message Block { repeated Statement statement = 1; } -message GlobalBlock { - repeated Statement statement = 1; -} - -message VirtualBlock { +message CompositeBlock { repeated Statement statement = 1; } @@ -394,9 +389,9 @@ enum InlineStrategy { message Fragment { repeated ImportedModule imported_module = 1; repeated Import import_entry = 2; - optional GlobalBlock declaration_block = 3; - optional GlobalBlock export_block = 4; - optional GlobalBlock initializer_block = 5; + optional CompositeBlock declaration_block = 3; + optional CompositeBlock export_block = 4; + optional CompositeBlock initializer_block = 5; repeated NameBinding name_binding = 6; repeated ClassModel class_model = 7; repeated Expression module_expression = 8; @@ -409,12 +404,12 @@ message Fragment { optional string dts = 15; optional int32 suite_function = 16; repeated int32 definitions = 17; - optional GlobalBlock polyfills = 18; + optional CompositeBlock polyfills = 18; } message InlinedLocalDeclarations { required int32 tag = 1; - required GlobalBlock block = 2; + required CompositeBlock block = 2; } message ImportedModule { @@ -437,14 +432,14 @@ message ClassModel { required int32 name_id = 1; optional int32 super_name_id = 2; repeated int32 interface_name_id = 4; - optional GlobalBlock post_declaration_block = 3; + optional CompositeBlock post_declaration_block = 3; } message IrClassModel { required int32 name_id = 1; repeated int32 super_classes = 2; - optional GlobalBlock pre_declaration_block = 3; - optional GlobalBlock post_declaration_block = 4; + optional CompositeBlock pre_declaration_block = 3; + optional CompositeBlock post_declaration_block = 4; } message InlineModule { diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstDeserializer.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstDeserializer.kt index c258070da00..a1f37417cdb 100644 --- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstDeserializer.kt +++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstDeserializer.kt @@ -19,17 +19,12 @@ package org.jetbrains.kotlin.serialization.js.ast import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.backend.ast.JsImportedModule import org.jetbrains.kotlin.js.backend.ast.metadata.* -import org.jetbrains.kotlin.js.backend.ast.metadata.LocalAlias -import org.jetbrains.kotlin.js.backend.ast.metadata.SpecialFunction import org.jetbrains.kotlin.protobuf.CodedInputStream import org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.* -import org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Expression.ExpressionCase -import org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Statement.StatementCase import java.io.File import java.io.FileInputStream import java.io.InputStream import java.io.InputStreamReader -import java.util.* class JsAstDeserializer(program: JsProgram, private val sourceRoots: Iterable) : JsAstDeserializerBase() { @@ -68,13 +63,13 @@ class JsAstDeserializer(program: JsProgram, private val sourceRoots: Iterable @@ -103,7 +98,7 @@ class JsAstDeserializer(program: JsProgram, private val sourceRoots: Iterable { - JsVirtualBlock(proto.virtualBlock.statementList.map { deserialize(it) }) - } - - JsAstProtoBuf.Statement.StatementCase.GLOBAL_BLOCK -> { - deserializeGlobalBlock(proto.globalBlock) + JsAstProtoBuf.Statement.StatementCase.COMPOSITE_BLOCK -> { + deserializeCompositeBlock(proto.compositeBlock) } JsAstProtoBuf.Statement.StatementCase.LABEL -> { @@ -340,8 +336,9 @@ abstract class JsAstDeserializerBase { return vars } - protected fun deserializeGlobalBlock(proto: JsAstProtoBuf.GlobalBlock): JsGlobalBlock { - return JsGlobalBlock().apply { statements += proto.statementList.map { deserialize(it) } } + protected fun deserializeCompositeBlock(proto: JsAstProtoBuf.CompositeBlock): JsCompositeBlock { + return JsCompositeBlock() + .apply { statements += proto.statementList.map { deserialize(it) } } } protected fun deserializeParameter(proto: JsAstProtoBuf.Parameter): JsParameter { diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstProtoBuf.java b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstProtoBuf.java index fd71f3947d3..d41395f5d59 100644 --- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstProtoBuf.java +++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstProtoBuf.java @@ -15567,13 +15567,13 @@ public final class JsAstProtoBuf { org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Block getBlock(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock global_block = 29; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock composite_block = 29; */ - boolean hasGlobalBlock(); + boolean hasCompositeBlock(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock global_block = 29; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock composite_block = 29; */ - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getGlobalBlock(); + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getCompositeBlock(); /** * optional .org.jetbrains.kotlin.serialization.js.ast.Label label = 30; @@ -15664,15 +15664,6 @@ public final class JsAstProtoBuf { * optional .org.jetbrains.kotlin.serialization.js.ast.SingleLineComment single_line_comment = 39; */ org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.SingleLineComment getSingleLineComment(); - - /** - * optional .org.jetbrains.kotlin.serialization.js.ast.VirtualBlock virtual_block = 40; - */ - boolean hasVirtualBlock(); - /** - * optional .org.jetbrains.kotlin.serialization.js.ast.VirtualBlock virtual_block = 40; - */ - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock getVirtualBlock(); } /** * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.Statement} @@ -15852,13 +15843,13 @@ public final class JsAstProtoBuf { break; } case 234: { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.Builder subBuilder = null; + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.Builder subBuilder = null; if (statementCase_ == 29) { - subBuilder = ((org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock) statement_).toBuilder(); + subBuilder = ((org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock) statement_).toBuilder(); } - statement_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.PARSER, extensionRegistry); + statement_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.PARSER, extensionRegistry); if (subBuilder != null) { - subBuilder.mergeFrom((org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock) statement_); + subBuilder.mergeFrom((org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock) statement_); statement_ = subBuilder.buildPartial(); } statementCase_ = 29; @@ -15994,19 +15985,6 @@ public final class JsAstProtoBuf { statementCase_ = 39; break; } - case 322: { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock.Builder subBuilder = null; - if (statementCase_ == 40) { - subBuilder = ((org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock) statement_).toBuilder(); - } - statement_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom((org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock) statement_); - statement_ = subBuilder.buildPartial(); - } - statementCase_ = 40; - break; - } } } } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { @@ -16053,7 +16031,7 @@ public final class JsAstProtoBuf { EXPRESSION(26), VARS(27), BLOCK(28), - GLOBAL_BLOCK(29), + COMPOSITE_BLOCK(29), LABEL(30), IF_STATEMENT(31), SWITCH_STATEMENT(32), @@ -16064,7 +16042,6 @@ public final class JsAstProtoBuf { TRY_STATEMENT(37), EMPTY(38), SINGLE_LINE_COMMENT(39), - VIRTUAL_BLOCK(40), STATEMENT_NOT_SET(0); private int value = 0; private StatementCase(int value) { @@ -16080,7 +16057,7 @@ public final class JsAstProtoBuf { case 26: return EXPRESSION; case 27: return VARS; case 28: return BLOCK; - case 29: return GLOBAL_BLOCK; + case 29: return COMPOSITE_BLOCK; case 30: return LABEL; case 31: return IF_STATEMENT; case 32: return SWITCH_STATEMENT; @@ -16091,7 +16068,6 @@ public final class JsAstProtoBuf { case 37: return TRY_STATEMENT; case 38: return EMPTY; case 39: return SINGLE_LINE_COMMENT; - case 40: return VIRTUAL_BLOCK; case 0: return STATEMENT_NOT_SET; default: throw new java.lang.IllegalArgumentException( "Value is undefined for this oneof enum."); @@ -16289,21 +16265,21 @@ public final class JsAstProtoBuf { return org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Block.getDefaultInstance(); } - public static final int GLOBAL_BLOCK_FIELD_NUMBER = 29; + public static final int COMPOSITE_BLOCK_FIELD_NUMBER = 29; /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock global_block = 29; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock composite_block = 29; */ - public boolean hasGlobalBlock() { + public boolean hasCompositeBlock() { return statementCase_ == 29; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock global_block = 29; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock composite_block = 29; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getGlobalBlock() { + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getCompositeBlock() { if (statementCase_ == 29) { - return (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock) statement_; + return (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock) statement_; } - return org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + return org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); } public static final int LABEL_FIELD_NUMBER = 30; @@ -16476,23 +16452,6 @@ public final class JsAstProtoBuf { return org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.SingleLineComment.getDefaultInstance(); } - public static final int VIRTUAL_BLOCK_FIELD_NUMBER = 40; - /** - * optional .org.jetbrains.kotlin.serialization.js.ast.VirtualBlock virtual_block = 40; - */ - public boolean hasVirtualBlock() { - return statementCase_ == 40; - } - /** - * optional .org.jetbrains.kotlin.serialization.js.ast.VirtualBlock virtual_block = 40; - */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock getVirtualBlock() { - if (statementCase_ == 40) { - return (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock) statement_; - } - return org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock.getDefaultInstance(); - } - private void initFields() { fileId_ = 0; location_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Location.getDefaultInstance(); @@ -16540,8 +16499,8 @@ public final class JsAstProtoBuf { return false; } } - if (hasGlobalBlock()) { - if (!getGlobalBlock().isInitialized()) { + if (hasCompositeBlock()) { + if (!getCompositeBlock().isInitialized()) { memoizedIsInitialized = 0; return false; } @@ -16600,12 +16559,6 @@ public final class JsAstProtoBuf { return false; } } - if (hasVirtualBlock()) { - if (!getVirtualBlock().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } memoizedIsInitialized = 1; return true; } @@ -16647,7 +16600,7 @@ public final class JsAstProtoBuf { output.writeMessage(28, (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Block) statement_); } if (statementCase_ == 29) { - output.writeMessage(29, (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock) statement_); + output.writeMessage(29, (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock) statement_); } if (statementCase_ == 30) { output.writeMessage(30, (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Label) statement_); @@ -16679,9 +16632,6 @@ public final class JsAstProtoBuf { if (statementCase_ == 39) { output.writeMessage(39, (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.SingleLineComment) statement_); } - if (statementCase_ == 40) { - output.writeMessage(40, (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock) statement_); - } output.writeRawBytes(unknownFields); } @@ -16737,7 +16687,7 @@ public final class JsAstProtoBuf { } if (statementCase_ == 29) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(29, (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock) statement_); + .computeMessageSize(29, (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock) statement_); } if (statementCase_ == 30) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream @@ -16779,10 +16729,6 @@ public final class JsAstProtoBuf { size += org.jetbrains.kotlin.protobuf.CodedOutputStream .computeMessageSize(39, (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.SingleLineComment) statement_); } - if (statementCase_ == 40) { - size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(40, (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock) statement_); - } size += unknownFields.size(); memoizedSerializedSize = size; return size; @@ -16977,9 +16923,6 @@ public final class JsAstProtoBuf { if (statementCase_ == 39) { result.statement_ = statement_; } - if (statementCase_ == 40) { - result.statement_ = statement_; - } result.bitField0_ = to_bitField0_; result.statementCase_ = statementCase_; return result; @@ -17029,8 +16972,8 @@ public final class JsAstProtoBuf { mergeBlock(other.getBlock()); break; } - case GLOBAL_BLOCK: { - mergeGlobalBlock(other.getGlobalBlock()); + case COMPOSITE_BLOCK: { + mergeCompositeBlock(other.getCompositeBlock()); break; } case LABEL: { @@ -17073,10 +17016,6 @@ public final class JsAstProtoBuf { mergeSingleLineComment(other.getSingleLineComment()); break; } - case VIRTUAL_BLOCK: { - mergeVirtualBlock(other.getVirtualBlock()); - break; - } case STATEMENT_NOT_SET: { break; } @@ -17123,8 +17062,8 @@ public final class JsAstProtoBuf { return false; } } - if (hasGlobalBlock()) { - if (!getGlobalBlock().isInitialized()) { + if (hasCompositeBlock()) { + if (!getCompositeBlock().isInitialized()) { return false; } @@ -17183,12 +17122,6 @@ public final class JsAstProtoBuf { return false; } } - if (hasVirtualBlock()) { - if (!getVirtualBlock().isInitialized()) { - - return false; - } - } return true; } @@ -17862,24 +17795,24 @@ public final class JsAstProtoBuf { } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock global_block = 29; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock composite_block = 29; */ - public boolean hasGlobalBlock() { + public boolean hasCompositeBlock() { return statementCase_ == 29; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock global_block = 29; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock composite_block = 29; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getGlobalBlock() { + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getCompositeBlock() { if (statementCase_ == 29) { - return (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock) statement_; + return (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock) statement_; } - return org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + return org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock global_block = 29; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock composite_block = 29; */ - public Builder setGlobalBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock value) { + public Builder setCompositeBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock value) { if (value == null) { throw new NullPointerException(); } @@ -17889,22 +17822,22 @@ public final class JsAstProtoBuf { return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock global_block = 29; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock composite_block = 29; */ - public Builder setGlobalBlock( - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.Builder builderForValue) { + public Builder setCompositeBlock( + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.Builder builderForValue) { statement_ = builderForValue.build(); statementCase_ = 29; return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock global_block = 29; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock composite_block = 29; */ - public Builder mergeGlobalBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock value) { + public Builder mergeCompositeBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock value) { if (statementCase_ == 29 && - statement_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance()) { - statement_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.newBuilder((org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock) statement_) + statement_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance()) { + statement_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.newBuilder((org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock) statement_) .mergeFrom(value).buildPartial(); } else { statement_ = value; @@ -17914,9 +17847,9 @@ public final class JsAstProtoBuf { return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock global_block = 29; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock composite_block = 29; */ - public Builder clearGlobalBlock() { + public Builder clearCompositeBlock() { if (statementCase_ == 29) { statementCase_ = 0; statement_ = null; @@ -18565,70 +18498,6 @@ public final class JsAstProtoBuf { return this; } - /** - * optional .org.jetbrains.kotlin.serialization.js.ast.VirtualBlock virtual_block = 40; - */ - public boolean hasVirtualBlock() { - return statementCase_ == 40; - } - /** - * optional .org.jetbrains.kotlin.serialization.js.ast.VirtualBlock virtual_block = 40; - */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock getVirtualBlock() { - if (statementCase_ == 40) { - return (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock) statement_; - } - return org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock.getDefaultInstance(); - } - /** - * optional .org.jetbrains.kotlin.serialization.js.ast.VirtualBlock virtual_block = 40; - */ - public Builder setVirtualBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock value) { - if (value == null) { - throw new NullPointerException(); - } - statement_ = value; - - statementCase_ = 40; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.js.ast.VirtualBlock virtual_block = 40; - */ - public Builder setVirtualBlock( - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock.Builder builderForValue) { - statement_ = builderForValue.build(); - - statementCase_ = 40; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.js.ast.VirtualBlock virtual_block = 40; - */ - public Builder mergeVirtualBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock value) { - if (statementCase_ == 40 && - statement_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock.getDefaultInstance()) { - statement_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock.newBuilder((org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock) statement_) - .mergeFrom(value).buildPartial(); - } else { - statement_ = value; - } - - statementCase_ = 40; - return this; - } - /** - * optional .org.jetbrains.kotlin.serialization.js.ast.VirtualBlock virtual_block = 40; - */ - public Builder clearVirtualBlock() { - if (statementCase_ == 40) { - statementCase_ = 0; - statement_ = null; - - } - return this; - } - // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.ast.Statement) } @@ -22733,8 +22602,8 @@ public final class JsAstProtoBuf { // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.ast.Block) } - public interface GlobalBlockOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.ast.GlobalBlock) + public interface CompositeBlockOrBuilder extends + // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.ast.CompositeBlock) org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { /** @@ -22752,30 +22621,30 @@ public final class JsAstProtoBuf { int getStatementCount(); } /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.GlobalBlock} + * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.CompositeBlock} */ - public static final class GlobalBlock extends + public static final class CompositeBlock extends org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements - // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.ast.GlobalBlock) - GlobalBlockOrBuilder { - // Use GlobalBlock.newBuilder() to construct. - private GlobalBlock(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { + // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.ast.CompositeBlock) + CompositeBlockOrBuilder { + // Use CompositeBlock.newBuilder() to construct. + private CompositeBlock(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - private GlobalBlock(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;} + private CompositeBlock(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;} - private static final GlobalBlock defaultInstance; - public static GlobalBlock getDefaultInstance() { + private static final CompositeBlock defaultInstance; + public static CompositeBlock getDefaultInstance() { return defaultInstance; } - public GlobalBlock getDefaultInstanceForType() { + public CompositeBlock getDefaultInstanceForType() { return defaultInstance; } private final org.jetbrains.kotlin.protobuf.ByteString unknownFields; - private GlobalBlock( + private CompositeBlock( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { @@ -22830,18 +22699,18 @@ public final class JsAstProtoBuf { makeExtensionsImmutable(); } } - public static org.jetbrains.kotlin.protobuf.Parser PARSER = - new org.jetbrains.kotlin.protobuf.AbstractParser() { - public GlobalBlock parsePartialFrom( + public static org.jetbrains.kotlin.protobuf.Parser PARSER = + new org.jetbrains.kotlin.protobuf.AbstractParser() { + public CompositeBlock parsePartialFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return new GlobalBlock(input, extensionRegistry); + return new CompositeBlock(input, extensionRegistry); } }; @java.lang.Override - public org.jetbrains.kotlin.protobuf.Parser getParserForType() { + public org.jetbrains.kotlin.protobuf.Parser getParserForType() { return PARSER; } @@ -22930,53 +22799,53 @@ public final class JsAstProtoBuf { return super.writeReplace(); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock parseFrom( + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock parseFrom( org.jetbrains.kotlin.protobuf.ByteString data) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock parseFrom( + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock parseFrom( org.jetbrains.kotlin.protobuf.ByteString data, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock parseFrom(byte[] data) + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock parseFrom(byte[] data) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock parseFrom( + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock parseFrom( byte[] data, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock parseFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock parseFrom( + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock parseFrom( java.io.InputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock parseDelimitedFrom( + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock parseDelimitedFrom( java.io.InputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock parseFrom( + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock parseFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock parseFrom( + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock parseFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -22985,21 +22854,21 @@ public final class JsAstProtoBuf { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock prototype) { + public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.GlobalBlock} + * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.CompositeBlock} */ public static final class Builder extends org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock, Builder> + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock, Builder> implements - // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.ast.GlobalBlock) - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlockOrBuilder { - // Construct using org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.newBuilder() + // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.ast.CompositeBlock) + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlockOrBuilder { + // Construct using org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -23021,20 +22890,20 @@ public final class JsAstProtoBuf { return create().mergeFrom(buildPartial()); } - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getDefaultInstanceForType() { - return org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getDefaultInstanceForType() { + return org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); } - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock build() { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock result = buildPartial(); + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock build() { + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock buildPartial() { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock result = new org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock(this); + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock buildPartial() { + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock result = new org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock(this); int from_bitField0_ = bitField0_; if (((bitField0_ & 0x00000001) == 0x00000001)) { statement_ = java.util.Collections.unmodifiableList(statement_); @@ -23044,8 +22913,8 @@ public final class JsAstProtoBuf { return result; } - public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock other) { - if (other == org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock other) { + if (other == org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance()) return this; if (!other.statement_.isEmpty()) { if (statement_.isEmpty()) { statement_ = other.statement_; @@ -23075,11 +22944,11 @@ public final class JsAstProtoBuf { org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock parsedMessage = null; + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock) e.getUnfinishedMessage(); + parsedMessage = (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -23215,508 +23084,15 @@ public final class JsAstProtoBuf { return this; } - // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.ast.GlobalBlock) + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.ast.CompositeBlock) } static { - defaultInstance = new GlobalBlock(true); + defaultInstance = new CompositeBlock(true); defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.ast.GlobalBlock) - } - - public interface VirtualBlockOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.ast.VirtualBlock) - org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { - - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - java.util.List - getStatementList(); - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Statement getStatement(int index); - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - int getStatementCount(); - } - /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.VirtualBlock} - */ - public static final class VirtualBlock extends - org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements - // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.ast.VirtualBlock) - VirtualBlockOrBuilder { - // Use VirtualBlock.newBuilder() to construct. - private VirtualBlock(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private VirtualBlock(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;} - - private static final VirtualBlock defaultInstance; - public static VirtualBlock getDefaultInstance() { - return defaultInstance; - } - - public VirtualBlock getDefaultInstanceForType() { - return defaultInstance; - } - - private final org.jetbrains.kotlin.protobuf.ByteString unknownFields; - private VirtualBlock( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput = - org.jetbrains.kotlin.protobuf.ByteString.newOutput(); - org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput = - org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance( - unknownFieldsOutput, 1); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFieldsCodedOutput, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - statement_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - statement_.add(input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Statement.PARSER, extensionRegistry)); - break; - } - } - } - } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - statement_ = java.util.Collections.unmodifiableList(statement_); - } - try { - unknownFieldsCodedOutput.flush(); - } catch (java.io.IOException e) { - // Should not happen - } finally { - unknownFields = unknownFieldsOutput.toByteString(); - } - makeExtensionsImmutable(); - } - } - public static org.jetbrains.kotlin.protobuf.Parser PARSER = - new org.jetbrains.kotlin.protobuf.AbstractParser() { - public VirtualBlock parsePartialFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return new VirtualBlock(input, extensionRegistry); - } - }; - - @java.lang.Override - public org.jetbrains.kotlin.protobuf.Parser getParserForType() { - return PARSER; - } - - public static final int STATEMENT_FIELD_NUMBER = 1; - private java.util.List statement_; - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - public java.util.List getStatementList() { - return statement_; - } - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - public java.util.List - getStatementOrBuilderList() { - return statement_; - } - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - public int getStatementCount() { - return statement_.size(); - } - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Statement getStatement(int index) { - return statement_.get(index); - } - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.StatementOrBuilder getStatementOrBuilder( - int index) { - return statement_.get(index); - } - - private void initFields() { - statement_ = java.util.Collections.emptyList(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - for (int i = 0; i < getStatementCount(); i++) { - if (!getStatement(i).isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - for (int i = 0; i < statement_.size(); i++) { - output.writeMessage(1, statement_.get(i)); - } - output.writeRawBytes(unknownFields); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - for (int i = 0; i < statement_.size(); i++) { - size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(1, statement_.get(i)); - } - size += unknownFields.size(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock parseFrom( - org.jetbrains.kotlin.protobuf.ByteString data) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock parseFrom( - org.jetbrains.kotlin.protobuf.ByteString data, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock parseFrom(byte[] data) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock parseFrom( - byte[] data, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock parseFrom( - java.io.InputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock parseDelimitedFrom( - java.io.InputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock parseFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock parseFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.VirtualBlock} - */ - public static final class Builder extends - org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock, Builder> - implements - // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.ast.VirtualBlock) - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlockOrBuilder { - // Construct using org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - statement_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock getDefaultInstanceForType() { - return org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock.getDefaultInstance(); - } - - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock build() { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock buildPartial() { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock result = new org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock(this); - int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - statement_ = java.util.Collections.unmodifiableList(statement_); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.statement_ = statement_; - return result; - } - - public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock other) { - if (other == org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock.getDefaultInstance()) return this; - if (!other.statement_.isEmpty()) { - if (statement_.isEmpty()) { - statement_ = other.statement_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureStatementIsMutable(); - statement_.addAll(other.statement_); - } - - } - setUnknownFields( - getUnknownFields().concat(other.unknownFields)); - return this; - } - - public final boolean isInitialized() { - for (int i = 0; i < getStatementCount(); i++) { - if (!getStatement(i).isInitialized()) { - - return false; - } - } - return true; - } - - public Builder mergeFrom( - org.jetbrains.kotlin.protobuf.CodedInputStream input, - org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.VirtualBlock) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - private java.util.List statement_ = - java.util.Collections.emptyList(); - private void ensureStatementIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { - statement_ = new java.util.ArrayList(statement_); - bitField0_ |= 0x00000001; - } - } - - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - public java.util.List getStatementList() { - return java.util.Collections.unmodifiableList(statement_); - } - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - public int getStatementCount() { - return statement_.size(); - } - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Statement getStatement(int index) { - return statement_.get(index); - } - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - public Builder setStatement( - int index, org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Statement value) { - if (value == null) { - throw new NullPointerException(); - } - ensureStatementIsMutable(); - statement_.set(index, value); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - public Builder setStatement( - int index, org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Statement.Builder builderForValue) { - ensureStatementIsMutable(); - statement_.set(index, builderForValue.build()); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - public Builder addStatement(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Statement value) { - if (value == null) { - throw new NullPointerException(); - } - ensureStatementIsMutable(); - statement_.add(value); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - public Builder addStatement( - int index, org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Statement value) { - if (value == null) { - throw new NullPointerException(); - } - ensureStatementIsMutable(); - statement_.add(index, value); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - public Builder addStatement( - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Statement.Builder builderForValue) { - ensureStatementIsMutable(); - statement_.add(builderForValue.build()); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - public Builder addStatement( - int index, org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Statement.Builder builderForValue) { - ensureStatementIsMutable(); - statement_.add(index, builderForValue.build()); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - public Builder addAllStatement( - java.lang.Iterable values) { - ensureStatementIsMutable(); - org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll( - values, statement_); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - public Builder clearStatement() { - statement_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - - return this; - } - /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.Statement statement = 1; - */ - public Builder removeStatement(int index) { - ensureStatementIsMutable(); - statement_.remove(index); - - return this; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.ast.VirtualBlock) - } - - static { - defaultInstance = new VirtualBlock(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.ast.VirtualBlock) + // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.ast.CompositeBlock) } public interface LabelOrBuilder extends @@ -31472,31 +30848,31 @@ public final class JsAstProtoBuf { int getImportEntryCount(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock declaration_block = 3; */ boolean hasDeclarationBlock(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock declaration_block = 3; */ - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getDeclarationBlock(); + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getDeclarationBlock(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock export_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock export_block = 4; */ boolean hasExportBlock(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock export_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock export_block = 4; */ - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getExportBlock(); + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getExportBlock(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock initializer_block = 5; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock initializer_block = 5; */ boolean hasInitializerBlock(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock initializer_block = 5; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock initializer_block = 5; */ - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getInitializerBlock(); + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getInitializerBlock(); /** * repeated .org.jetbrains.kotlin.serialization.js.ast.NameBinding name_binding = 6; @@ -31651,13 +31027,13 @@ public final class JsAstProtoBuf { int getDefinitions(int index); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock polyfills = 18; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock polyfills = 18; */ boolean hasPolyfills(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock polyfills = 18; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock polyfills = 18; */ - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getPolyfills(); + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getPolyfills(); } /** * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.Fragment} @@ -31726,11 +31102,11 @@ public final class JsAstProtoBuf { break; } case 26: { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.Builder subBuilder = null; + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = declarationBlock_.toBuilder(); } - declarationBlock_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.PARSER, extensionRegistry); + declarationBlock_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(declarationBlock_); declarationBlock_ = subBuilder.buildPartial(); @@ -31739,11 +31115,11 @@ public final class JsAstProtoBuf { break; } case 34: { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.Builder subBuilder = null; + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = exportBlock_.toBuilder(); } - exportBlock_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.PARSER, extensionRegistry); + exportBlock_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(exportBlock_); exportBlock_ = subBuilder.buildPartial(); @@ -31752,11 +31128,11 @@ public final class JsAstProtoBuf { break; } case 42: { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.Builder subBuilder = null; + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = initializerBlock_.toBuilder(); } - initializerBlock_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.PARSER, extensionRegistry); + initializerBlock_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(initializerBlock_); initializerBlock_ = subBuilder.buildPartial(); @@ -31877,11 +31253,11 @@ public final class JsAstProtoBuf { break; } case 146: { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.Builder subBuilder = null; + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.Builder subBuilder = null; if (((bitField0_ & 0x00000100) == 0x00000100)) { subBuilder = polyfills_.toBuilder(); } - polyfills_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.PARSER, extensionRegistry); + polyfills_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(polyfills_); polyfills_ = subBuilder.buildPartial(); @@ -32021,47 +31397,47 @@ public final class JsAstProtoBuf { } public static final int DECLARATION_BLOCK_FIELD_NUMBER = 3; - private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock declarationBlock_; + private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock declarationBlock_; /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock declaration_block = 3; */ public boolean hasDeclarationBlock() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock declaration_block = 3; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getDeclarationBlock() { + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getDeclarationBlock() { return declarationBlock_; } public static final int EXPORT_BLOCK_FIELD_NUMBER = 4; - private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock exportBlock_; + private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock exportBlock_; /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock export_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock export_block = 4; */ public boolean hasExportBlock() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock export_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock export_block = 4; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getExportBlock() { + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getExportBlock() { return exportBlock_; } public static final int INITIALIZER_BLOCK_FIELD_NUMBER = 5; - private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock initializerBlock_; + private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock initializerBlock_; /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock initializer_block = 5; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock initializer_block = 5; */ public boolean hasInitializerBlock() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock initializer_block = 5; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock initializer_block = 5; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getInitializerBlock() { + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getInitializerBlock() { return initializerBlock_; } @@ -32427,26 +31803,26 @@ public final class JsAstProtoBuf { } public static final int POLYFILLS_FIELD_NUMBER = 18; - private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock polyfills_; + private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock polyfills_; /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock polyfills = 18; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock polyfills = 18; */ public boolean hasPolyfills() { return ((bitField0_ & 0x00000100) == 0x00000100); } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock polyfills = 18; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock polyfills = 18; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getPolyfills() { + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getPolyfills() { return polyfills_; } private void initFields() { importedModule_ = java.util.Collections.emptyList(); importEntry_ = java.util.Collections.emptyList(); - declarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); - exportBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); - initializerBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + declarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); + exportBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); + initializerBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); nameBinding_ = java.util.Collections.emptyList(); classModel_ = java.util.Collections.emptyList(); moduleExpression_ = java.util.Collections.emptyList(); @@ -32459,7 +31835,7 @@ public final class JsAstProtoBuf { dts_ = ""; suiteFunction_ = 0; definitions_ = java.util.Collections.emptyList(); - polyfills_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + polyfills_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -32796,11 +32172,11 @@ public final class JsAstProtoBuf { bitField0_ = (bitField0_ & ~0x00000001); importEntry_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000002); - declarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + declarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000004); - exportBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + exportBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000008); - initializerBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + initializerBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000010); nameBinding_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000020); @@ -32826,7 +32202,7 @@ public final class JsAstProtoBuf { bitField0_ = (bitField0_ & ~0x00008000); definitions_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00010000); - polyfills_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + polyfills_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00020000); return this; } @@ -33421,23 +32797,23 @@ public final class JsAstProtoBuf { return this; } - private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock declarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock declarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock declaration_block = 3; */ public boolean hasDeclarationBlock() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock declaration_block = 3; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getDeclarationBlock() { + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getDeclarationBlock() { return declarationBlock_; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock declaration_block = 3; */ - public Builder setDeclarationBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock value) { + public Builder setDeclarationBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock value) { if (value == null) { throw new NullPointerException(); } @@ -33447,23 +32823,23 @@ public final class JsAstProtoBuf { return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock declaration_block = 3; */ public Builder setDeclarationBlock( - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.Builder builderForValue) { + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.Builder builderForValue) { declarationBlock_ = builderForValue.build(); bitField0_ |= 0x00000004; return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock declaration_block = 3; */ - public Builder mergeDeclarationBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock value) { + public Builder mergeDeclarationBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock value) { if (((bitField0_ & 0x00000004) == 0x00000004) && - declarationBlock_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance()) { + declarationBlock_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance()) { declarationBlock_ = - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.newBuilder(declarationBlock_).mergeFrom(value).buildPartial(); + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.newBuilder(declarationBlock_).mergeFrom(value).buildPartial(); } else { declarationBlock_ = value; } @@ -33472,32 +32848,32 @@ public final class JsAstProtoBuf { return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock declaration_block = 3; */ public Builder clearDeclarationBlock() { - declarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + declarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000004); return this; } - private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock exportBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock exportBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock export_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock export_block = 4; */ public boolean hasExportBlock() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock export_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock export_block = 4; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getExportBlock() { + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getExportBlock() { return exportBlock_; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock export_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock export_block = 4; */ - public Builder setExportBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock value) { + public Builder setExportBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock value) { if (value == null) { throw new NullPointerException(); } @@ -33507,23 +32883,23 @@ public final class JsAstProtoBuf { return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock export_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock export_block = 4; */ public Builder setExportBlock( - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.Builder builderForValue) { + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.Builder builderForValue) { exportBlock_ = builderForValue.build(); bitField0_ |= 0x00000008; return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock export_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock export_block = 4; */ - public Builder mergeExportBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock value) { + public Builder mergeExportBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock value) { if (((bitField0_ & 0x00000008) == 0x00000008) && - exportBlock_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance()) { + exportBlock_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance()) { exportBlock_ = - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.newBuilder(exportBlock_).mergeFrom(value).buildPartial(); + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.newBuilder(exportBlock_).mergeFrom(value).buildPartial(); } else { exportBlock_ = value; } @@ -33532,32 +32908,32 @@ public final class JsAstProtoBuf { return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock export_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock export_block = 4; */ public Builder clearExportBlock() { - exportBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + exportBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000008); return this; } - private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock initializerBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock initializerBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock initializer_block = 5; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock initializer_block = 5; */ public boolean hasInitializerBlock() { return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock initializer_block = 5; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock initializer_block = 5; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getInitializerBlock() { + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getInitializerBlock() { return initializerBlock_; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock initializer_block = 5; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock initializer_block = 5; */ - public Builder setInitializerBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock value) { + public Builder setInitializerBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock value) { if (value == null) { throw new NullPointerException(); } @@ -33567,23 +32943,23 @@ public final class JsAstProtoBuf { return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock initializer_block = 5; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock initializer_block = 5; */ public Builder setInitializerBlock( - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.Builder builderForValue) { + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.Builder builderForValue) { initializerBlock_ = builderForValue.build(); bitField0_ |= 0x00000010; return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock initializer_block = 5; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock initializer_block = 5; */ - public Builder mergeInitializerBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock value) { + public Builder mergeInitializerBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock value) { if (((bitField0_ & 0x00000010) == 0x00000010) && - initializerBlock_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance()) { + initializerBlock_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance()) { initializerBlock_ = - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.newBuilder(initializerBlock_).mergeFrom(value).buildPartial(); + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.newBuilder(initializerBlock_).mergeFrom(value).buildPartial(); } else { initializerBlock_ = value; } @@ -33592,10 +32968,10 @@ public final class JsAstProtoBuf { return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock initializer_block = 5; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock initializer_block = 5; */ public Builder clearInitializerBlock() { - initializerBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + initializerBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000010); return this; @@ -34721,23 +34097,23 @@ public final class JsAstProtoBuf { return this; } - private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock polyfills_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock polyfills_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock polyfills = 18; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock polyfills = 18; */ public boolean hasPolyfills() { return ((bitField0_ & 0x00020000) == 0x00020000); } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock polyfills = 18; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock polyfills = 18; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getPolyfills() { + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getPolyfills() { return polyfills_; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock polyfills = 18; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock polyfills = 18; */ - public Builder setPolyfills(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock value) { + public Builder setPolyfills(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock value) { if (value == null) { throw new NullPointerException(); } @@ -34747,23 +34123,23 @@ public final class JsAstProtoBuf { return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock polyfills = 18; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock polyfills = 18; */ public Builder setPolyfills( - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.Builder builderForValue) { + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.Builder builderForValue) { polyfills_ = builderForValue.build(); bitField0_ |= 0x00020000; return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock polyfills = 18; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock polyfills = 18; */ - public Builder mergePolyfills(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock value) { + public Builder mergePolyfills(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock value) { if (((bitField0_ & 0x00020000) == 0x00020000) && - polyfills_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance()) { + polyfills_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance()) { polyfills_ = - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.newBuilder(polyfills_).mergeFrom(value).buildPartial(); + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.newBuilder(polyfills_).mergeFrom(value).buildPartial(); } else { polyfills_ = value; } @@ -34772,10 +34148,10 @@ public final class JsAstProtoBuf { return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock polyfills = 18; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock polyfills = 18; */ public Builder clearPolyfills() { - polyfills_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + polyfills_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00020000); return this; @@ -34806,13 +34182,13 @@ public final class JsAstProtoBuf { int getTag(); /** - * required .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock block = 2; + * required .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock block = 2; */ boolean hasBlock(); /** - * required .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock block = 2; + * required .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock block = 2; */ - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getBlock(); + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getBlock(); } /** * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations} @@ -34870,11 +34246,11 @@ public final class JsAstProtoBuf { break; } case 18: { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.Builder subBuilder = null; + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = block_.toBuilder(); } - block_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.PARSER, extensionRegistry); + block_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(block_); block_ = subBuilder.buildPartial(); @@ -34932,23 +34308,23 @@ public final class JsAstProtoBuf { } public static final int BLOCK_FIELD_NUMBER = 2; - private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock block_; + private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock block_; /** - * required .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock block = 2; + * required .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock block = 2; */ public boolean hasBlock() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock block = 2; + * required .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock block = 2; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getBlock() { + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getBlock() { return block_; } private void initFields() { tag_ = 0; - block_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + block_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -35094,7 +34470,7 @@ public final class JsAstProtoBuf { super.clear(); tag_ = 0; bitField0_ = (bitField0_ & ~0x00000001); - block_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + block_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -35211,23 +34587,23 @@ public final class JsAstProtoBuf { return this; } - private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock block_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock block_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); /** - * required .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock block = 2; + * required .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock block = 2; */ public boolean hasBlock() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock block = 2; + * required .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock block = 2; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getBlock() { + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getBlock() { return block_; } /** - * required .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock block = 2; + * required .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock block = 2; */ - public Builder setBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock value) { + public Builder setBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock value) { if (value == null) { throw new NullPointerException(); } @@ -35237,23 +34613,23 @@ public final class JsAstProtoBuf { return this; } /** - * required .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock block = 2; + * required .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock block = 2; */ public Builder setBlock( - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.Builder builderForValue) { + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.Builder builderForValue) { block_ = builderForValue.build(); bitField0_ |= 0x00000002; return this; } /** - * required .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock block = 2; + * required .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock block = 2; */ - public Builder mergeBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock value) { + public Builder mergeBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock value) { if (((bitField0_ & 0x00000002) == 0x00000002) && - block_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance()) { + block_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance()) { block_ = - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.newBuilder(block_).mergeFrom(value).buildPartial(); + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.newBuilder(block_).mergeFrom(value).buildPartial(); } else { block_ = value; } @@ -35262,10 +34638,10 @@ public final class JsAstProtoBuf { return this; } /** - * required .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock block = 2; + * required .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock block = 2; */ public Builder clearBlock() { - block_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + block_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000002); return this; @@ -36826,13 +36202,13 @@ public final class JsAstProtoBuf { int getInterfaceNameId(int index); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 3; */ boolean hasPostDeclarationBlock(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 3; */ - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getPostDeclarationBlock(); + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getPostDeclarationBlock(); } /** * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.ClassModel} @@ -36895,11 +36271,11 @@ public final class JsAstProtoBuf { break; } case 26: { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.Builder subBuilder = null; + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = postDeclarationBlock_.toBuilder(); } - postDeclarationBlock_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.PARSER, extensionRegistry); + postDeclarationBlock_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(postDeclarationBlock_); postDeclarationBlock_ = subBuilder.buildPartial(); @@ -37018,17 +36394,17 @@ public final class JsAstProtoBuf { } public static final int POST_DECLARATION_BLOCK_FIELD_NUMBER = 3; - private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock postDeclarationBlock_; + private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock postDeclarationBlock_; /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 3; */ public boolean hasPostDeclarationBlock() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 3; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getPostDeclarationBlock() { + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getPostDeclarationBlock() { return postDeclarationBlock_; } @@ -37036,7 +36412,7 @@ public final class JsAstProtoBuf { nameId_ = 0; superNameId_ = 0; interfaceNameId_ = java.util.Collections.emptyList(); - postDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + postDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -37203,7 +36579,7 @@ public final class JsAstProtoBuf { bitField0_ = (bitField0_ & ~0x00000002); interfaceNameId_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000004); - postDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + postDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -37438,23 +36814,23 @@ public final class JsAstProtoBuf { return this; } - private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock postDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock postDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 3; */ public boolean hasPostDeclarationBlock() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 3; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getPostDeclarationBlock() { + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getPostDeclarationBlock() { return postDeclarationBlock_; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 3; */ - public Builder setPostDeclarationBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock value) { + public Builder setPostDeclarationBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock value) { if (value == null) { throw new NullPointerException(); } @@ -37464,23 +36840,23 @@ public final class JsAstProtoBuf { return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 3; */ public Builder setPostDeclarationBlock( - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.Builder builderForValue) { + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.Builder builderForValue) { postDeclarationBlock_ = builderForValue.build(); bitField0_ |= 0x00000008; return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 3; */ - public Builder mergePostDeclarationBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock value) { + public Builder mergePostDeclarationBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock value) { if (((bitField0_ & 0x00000008) == 0x00000008) && - postDeclarationBlock_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance()) { + postDeclarationBlock_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance()) { postDeclarationBlock_ = - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.newBuilder(postDeclarationBlock_).mergeFrom(value).buildPartial(); + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.newBuilder(postDeclarationBlock_).mergeFrom(value).buildPartial(); } else { postDeclarationBlock_ = value; } @@ -37489,10 +36865,10 @@ public final class JsAstProtoBuf { return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 3; */ public Builder clearPostDeclarationBlock() { - postDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + postDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000008); return this; @@ -37536,22 +36912,22 @@ public final class JsAstProtoBuf { int getSuperClasses(int index); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock pre_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock pre_declaration_block = 3; */ boolean hasPreDeclarationBlock(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock pre_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock pre_declaration_block = 3; */ - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getPreDeclarationBlock(); + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getPreDeclarationBlock(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 4; */ boolean hasPostDeclarationBlock(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 4; */ - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getPostDeclarationBlock(); + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getPostDeclarationBlock(); } /** * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.IrClassModel} @@ -37630,11 +37006,11 @@ public final class JsAstProtoBuf { break; } case 26: { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.Builder subBuilder = null; + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = preDeclarationBlock_.toBuilder(); } - preDeclarationBlock_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.PARSER, extensionRegistry); + preDeclarationBlock_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(preDeclarationBlock_); preDeclarationBlock_ = subBuilder.buildPartial(); @@ -37643,11 +37019,11 @@ public final class JsAstProtoBuf { break; } case 34: { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.Builder subBuilder = null; + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = postDeclarationBlock_.toBuilder(); } - postDeclarationBlock_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.PARSER, extensionRegistry); + postDeclarationBlock_ = input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(postDeclarationBlock_); postDeclarationBlock_ = subBuilder.buildPartial(); @@ -37730,40 +37106,40 @@ public final class JsAstProtoBuf { } public static final int PRE_DECLARATION_BLOCK_FIELD_NUMBER = 3; - private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock preDeclarationBlock_; + private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock preDeclarationBlock_; /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock pre_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock pre_declaration_block = 3; */ public boolean hasPreDeclarationBlock() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock pre_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock pre_declaration_block = 3; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getPreDeclarationBlock() { + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getPreDeclarationBlock() { return preDeclarationBlock_; } public static final int POST_DECLARATION_BLOCK_FIELD_NUMBER = 4; - private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock postDeclarationBlock_; + private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock postDeclarationBlock_; /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 4; */ public boolean hasPostDeclarationBlock() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 4; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getPostDeclarationBlock() { + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getPostDeclarationBlock() { return postDeclarationBlock_; } private void initFields() { nameId_ = 0; superClasses_ = java.util.Collections.emptyList(); - preDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); - postDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + preDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); + postDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -37934,9 +37310,9 @@ public final class JsAstProtoBuf { bitField0_ = (bitField0_ & ~0x00000001); superClasses_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000002); - preDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + preDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000004); - postDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + postDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -38145,23 +37521,23 @@ public final class JsAstProtoBuf { return this; } - private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock preDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock preDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock pre_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock pre_declaration_block = 3; */ public boolean hasPreDeclarationBlock() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock pre_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock pre_declaration_block = 3; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getPreDeclarationBlock() { + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getPreDeclarationBlock() { return preDeclarationBlock_; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock pre_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock pre_declaration_block = 3; */ - public Builder setPreDeclarationBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock value) { + public Builder setPreDeclarationBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock value) { if (value == null) { throw new NullPointerException(); } @@ -38171,23 +37547,23 @@ public final class JsAstProtoBuf { return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock pre_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock pre_declaration_block = 3; */ public Builder setPreDeclarationBlock( - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.Builder builderForValue) { + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.Builder builderForValue) { preDeclarationBlock_ = builderForValue.build(); bitField0_ |= 0x00000004; return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock pre_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock pre_declaration_block = 3; */ - public Builder mergePreDeclarationBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock value) { + public Builder mergePreDeclarationBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock value) { if (((bitField0_ & 0x00000004) == 0x00000004) && - preDeclarationBlock_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance()) { + preDeclarationBlock_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance()) { preDeclarationBlock_ = - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.newBuilder(preDeclarationBlock_).mergeFrom(value).buildPartial(); + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.newBuilder(preDeclarationBlock_).mergeFrom(value).buildPartial(); } else { preDeclarationBlock_ = value; } @@ -38196,32 +37572,32 @@ public final class JsAstProtoBuf { return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock pre_declaration_block = 3; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock pre_declaration_block = 3; */ public Builder clearPreDeclarationBlock() { - preDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + preDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000004); return this; } - private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock postDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + private org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock postDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 4; */ public boolean hasPostDeclarationBlock() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 4; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getPostDeclarationBlock() { + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock getPostDeclarationBlock() { return postDeclarationBlock_; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 4; */ - public Builder setPostDeclarationBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock value) { + public Builder setPostDeclarationBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock value) { if (value == null) { throw new NullPointerException(); } @@ -38231,23 +37607,23 @@ public final class JsAstProtoBuf { return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 4; */ public Builder setPostDeclarationBlock( - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.Builder builderForValue) { + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.Builder builderForValue) { postDeclarationBlock_ = builderForValue.build(); bitField0_ |= 0x00000008; return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 4; */ - public Builder mergePostDeclarationBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock value) { + public Builder mergePostDeclarationBlock(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock value) { if (((bitField0_ & 0x00000008) == 0x00000008) && - postDeclarationBlock_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance()) { + postDeclarationBlock_ != org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance()) { postDeclarationBlock_ = - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.newBuilder(postDeclarationBlock_).mergeFrom(value).buildPartial(); + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.newBuilder(postDeclarationBlock_).mergeFrom(value).buildPartial(); } else { postDeclarationBlock_ = value; } @@ -38256,10 +37632,10 @@ public final class JsAstProtoBuf { return this; } /** - * optional .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock post_declaration_block = 4; + * optional .org.jetbrains.kotlin.serialization.js.ast.CompositeBlock post_declaration_block = 4; */ public Builder clearPostDeclarationBlock() { - postDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); + postDeclarationBlock_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.CompositeBlock.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000008); return this; diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstSerializerBase.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstSerializerBase.kt index da77dea9456..5553ddfc473 100644 --- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstSerializerBase.kt +++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstSerializerBase.kt @@ -7,7 +7,6 @@ package org.jetbrains.kotlin.serialization.js.ast import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.backend.ast.metadata.* -import java.io.File import java.util.* abstract class JsAstSerializerBase { @@ -68,14 +67,7 @@ abstract class JsAstSerializerBase { override fun visitBlock(x: JsBlock) { when (x) { - is JsGlobalBlock -> { builder.globalBlock = serializeBlock(x) } - is JsVirtualBlock -> { - val virtualBlockBuilder = JsAstProtoBuf.VirtualBlock.newBuilder() - for (part in x.statements) { - virtualBlockBuilder.addStatement(serialize(part)) - } - builder.virtualBlock = virtualBlockBuilder.build() - } + is JsCompositeBlock -> { builder.compositeBlock = serializeBlock(x) } else -> { val blockBuilder = JsAstProtoBuf.Block.newBuilder() for (part in x.statements) { @@ -384,8 +376,8 @@ abstract class JsAstSerializerBase { return parameterBuilder.build() } - protected fun serializeBlock(block: JsGlobalBlock): JsAstProtoBuf.GlobalBlock { - val blockBuilder = JsAstProtoBuf.GlobalBlock.newBuilder() + protected fun serializeBlock(block: JsCompositeBlock): JsAstProtoBuf.CompositeBlock { + val blockBuilder = JsAstProtoBuf.CompositeBlock.newBuilder() for (part in block.statements) { blockBuilder.addStatement(serialize(part)) } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testOld/ast/NameResolutionTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/testOld/ast/NameResolutionTest.kt index 52552d798bd..711076093b0 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testOld/ast/NameResolutionTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/testOld/ast/NameResolutionTest.kt @@ -58,8 +58,10 @@ class NameResolutionTest { val expectedCode = FileUtil.loadFile(File(expectedName)) val parserScope = JsFunctionScope(JsRootScope(JsProgram()), "") - val originalAst = JsGlobalBlock().apply { statements += parse(originalCode, errorReporter, parserScope, originalName).orEmpty() } - val expectedAst = JsGlobalBlock().apply { statements += parse(expectedCode, errorReporter, parserScope, expectedName).orEmpty() } + val originalAst = JsCompositeBlock() + .apply { statements += parse(originalCode, errorReporter, parserScope, originalName).orEmpty() } + val expectedAst = JsCompositeBlock() + .apply { statements += parse(expectedCode, errorReporter, parserScope, expectedName).orEmpty() } originalAst.accept(object : RecursiveJsVisitor() { val cache = mutableMapOf() diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/InlineFunctionContext.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/InlineFunctionContext.kt index a28fe96f807..254fd195ba9 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/InlineFunctionContext.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/InlineFunctionContext.kt @@ -17,12 +17,12 @@ package org.jetbrains.kotlin.js.translate.context import org.jetbrains.kotlin.descriptors.CallableDescriptor -import org.jetbrains.kotlin.js.backend.ast.JsGlobalBlock +import org.jetbrains.kotlin.js.backend.ast.JsCompositeBlock import org.jetbrains.kotlin.js.backend.ast.JsName class InlineFunctionContext(val descriptor: CallableDescriptor) { val imports = mutableMapOf() - val importBlock = JsGlobalBlock() - val prototypeBlock = JsGlobalBlock() - val declarationsBlock = JsGlobalBlock() + val importBlock = JsCompositeBlock() + val prototypeBlock = JsCompositeBlock() + val declarationsBlock = JsCompositeBlock() } \ No newline at end of file diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Merger.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Merger.kt index ec422589670..ce6725c77a5 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Merger.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Merger.kt @@ -43,12 +43,12 @@ class Merger( private val nameTable = mutableMapOf() private val importedModuleTable = mutableMapOf() - private val importBlock = JsGlobalBlock() - private val declarationBlock = JsGlobalBlock() - private val initializerBlock = JsGlobalBlock() + private val importBlock = JsCompositeBlock() + private val declarationBlock = JsCompositeBlock() + private val initializerBlock = JsCompositeBlock() private val testsMap = mutableMapOf() private var mainFn: Pair? = null - private val exportBlock = JsGlobalBlock() + private val exportBlock = JsCompositeBlock() private val declaredImports = mutableSetOf() private val classes = mutableMapOf() private val importedModulesImpl = mutableListOf()