This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 3ccebe5cb71c0bf0d7f313c2e88fc340a622aafa Author: Alex Harui <[email protected]> AuthorDate: Sun Dec 26 23:35:05 2021 -0800 ignore disabled conditional compilation blocks --- .../compiler/internal/codegen/js/utils/EmitterUtils.java | 11 +++++++---- .../compiler/internal/tree/as/ConfigConditionBlockNode.java | 5 +++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/utils/EmitterUtils.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/utils/EmitterUtils.java index c260963..17e0474 100644 --- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/utils/EmitterUtils.java +++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/utils/EmitterUtils.java @@ -71,11 +71,14 @@ public class EmitterUtils else if (child.getNodeID() == ASTNodeID.ConfigBlockID) { ConfigConditionBlockNode configNode = (ConfigConditionBlockNode)child; - if (configNode.getChildCount() > 0) + if (configNode.getEnabled() && configNode.getChildCount() > 0) { - child = configNode.getChild(0); - if (child instanceof ITypeNode) - return (ITypeNode) child; + for (int j = 0; j < configNode.getChildCount(); j++) + { + child = configNode.getChild(j); + if (child instanceof ITypeNode) + return (ITypeNode) child; + } } } } diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/as/ConfigConditionBlockNode.java b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/as/ConfigConditionBlockNode.java index c0998f4..9724dd3 100644 --- a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/as/ConfigConditionBlockNode.java +++ b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/as/ConfigConditionBlockNode.java @@ -47,6 +47,11 @@ public final class ConfigConditionBlockNode extends BlockNode this.setContainerType(ContainerType.CONFIG_BLOCK); } + public boolean getEnabled() + { + return this.enabled; + } + /** * Disabled configuration condition block doesn't have children. */
