This is an automated email from the ASF dual-hosted git repository. joshtynjala pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 9c7cbc1717a4a1de7627407599a0d59d433ffe21 Author: Josh Tynjala <[email protected]> AuthorDate: Mon Dec 12 15:38:04 2022 -0800 MemberAccessExpressionNode: remove setAllowE4XFilter() from commit 86b4fff Not necessary for now. Will reconsider if ?.() function calls are to be supported --- .../apache/royale/compiler/internal/parsing/as/BaseASParser.java | 2 -- .../compiler/internal/tree/as/MemberAccessExpressionNode.java | 9 +-------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/parsing/as/BaseASParser.java b/compiler/src/main/java/org/apache/royale/compiler/internal/parsing/as/BaseASParser.java index 7174b62f4..20493a54e 100644 --- a/compiler/src/main/java/org/apache/royale/compiler/internal/parsing/as/BaseASParser.java +++ b/compiler/src/main/java/org/apache/royale/compiler/internal/parsing/as/BaseASParser.java @@ -3175,7 +3175,6 @@ abstract class BaseASParser extends LLkParser implements IProblemReporter { ASToken memberAccessOperator = new ASToken(ASTokenTypes.TOKEN_OPERATOR_MEMBER_ACCESS, op.getStart(), op.getEnd(), op.getLine(), op.getColumn(), "."); MemberAccessExpressionNode memberAccessNode = new MemberAccessExpressionNode(prevRightNode, memberAccessOperator, r); - memberAccessNode.setAllowE4XFilter(false); ASToken ternaryOperator = new ASToken(ASTokenTypes.TOKEN_OPERATOR_TERNARY, -1, -1, -1, -1, "?"); ASToken innerResultNullToken = new ASToken(ASTokenTypes.TOKEN_KEYWORD_NULL, -1, -1, -1, -1, "null"); @@ -3207,7 +3206,6 @@ abstract class BaseASParser extends LLkParser implements IProblemReporter ASToken memberAccessOperator = new ASToken(ASTokenTypes.TOKEN_OPERATOR_MEMBER_ACCESS, op.getStart(), op.getEnd(), op.getLine(), op.getColumn(), "."); MemberAccessExpressionNode memberAccessNode = new MemberAccessExpressionNode(l, memberAccessOperator, r); - memberAccessNode.setAllowE4XFilter(false); ASToken ternaryOperator = new ASToken(ASTokenTypes.TOKEN_OPERATOR_TERNARY, -1, -1, -1, -1, "?"); ASToken resultNullToken = new ASToken(ASTokenTypes.TOKEN_KEYWORD_NULL, -1, -1, -1, -1, "null"); diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/as/MemberAccessExpressionNode.java b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/as/MemberAccessExpressionNode.java index 59a7484db..42d77b8ff 100644 --- a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/as/MemberAccessExpressionNode.java +++ b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/as/MemberAccessExpressionNode.java @@ -96,7 +96,7 @@ public class MemberAccessExpressionNode extends BinaryOperatorNodeBase implement { nodeID = ASTNodeID.Op_DescendantsID; } - else if (allowE4XFilter && rightOperandNode != null && rightOperandNode.hasParenthesis()) + else if (rightOperandNode != null && rightOperandNode.hasParenthesis()) { nodeID = ASTNodeID.E4XFilterID; } @@ -264,13 +264,6 @@ public class MemberAccessExpressionNode extends BinaryOperatorNodeBase implement // Other methods // - private boolean allowE4XFilter = true; - - public void setAllowE4XFilter(boolean allow) - { - allowE4XFilter = allow; - } - public boolean isSuper(ExpressionNodeBase node) { if (!(node instanceof ILanguageIdentifierNode))
