Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Step Extension] Add semantic support xml step extension #43106

Merged
merged 19 commits into from
Oct 3, 2024
Merged

[Step Extension] Add semantic support xml step extension #43106

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8c5617d
Add step extension indexed access support
poorna2152 May 13, 2024
bb27df8
Add step extension filter access support
poorna2152 May 15, 2024
2319b7a
Add xml indexed and filter based step extension tests
poorna2152 May 30, 2024
93909a0
Add xml indexed and filter extend combined tests
poorna2152 Jun 4, 2024
84754d4
Update failing tests
poorna2152 Jun 4, 2024
b67b217
Add negative tests
poorna2152 Jun 4, 2024
95e3a44
Add step extend intial method invocation support
poorna2152 May 30, 2024
6da0cfe
Add separate AST node for extended xml step expression
poorna2152 Jun 7, 2024
8cb4461
Remove unused fileds in xml navigation access class
poorna2152 Jun 7, 2024
326d4e9
Add more combined tests
poorna2152 Jun 7, 2024
90d45dd
Update the blangnodebuilder parser class use
poorna2152 Jul 16, 2024
84977f0
Refactor code and add toString functions
poorna2152 Jul 19, 2024
f4abb6f
Handle setting of position of the new nodes
poorna2152 Jul 21, 2024
fa9dc93
Extract if to switch cases and add functions
poorna2152 Jul 21, 2024
1fb49c5
Update use of position in desugar
poorna2152 Jul 21, 2024
5e9ee97
Add more finder tests
poorna2152 Sep 15, 2024
2caeea3
Split the test function
poorna2152 Sep 19, 2024
317e292
Update closure desugar
poorna2152 Sep 19, 2024
089ff59
Use ASTBuilderUtil for index expr creation
poorna2152 Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/BaseVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementFilter;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementLiteral;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLFilterStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLIndexedStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLMethodCallStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLNavigationAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLProcInsLiteral;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLQName;
Expand Down Expand Up @@ -1046,6 +1049,18 @@
public void visit(BLangXMLNavigationAccess xmlNavigation) {
}

@Override
public void visit(BLangXMLIndexedStepExtend xmlIndexedStepExtend) {
}

Check warning on line 1054 in compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/BaseVisitor.java

View check run for this annotation

Codecov / codecov/patch

compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/BaseVisitor.java#L1054 

Added line #L1054 was not covered by tests

@Override
public void visit(BLangXMLFilterStepExtend xmlFilterStepExtend) {
}

Check warning on line 1058 in compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/BaseVisitor.java

View check run for this annotation

Codecov / codecov/patch

compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/BaseVisitor.java#L1058 

Added line #L1058 was not covered by tests

@Override
public void visit(BLangXMLMethodCallStepExtend xmlMethodCallStepExtend) {
}

Check warning on line 1062 in compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/BaseVisitor.java

View check run for this annotation

Codecov / codecov/patch

compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/BaseVisitor.java#L1062 

Added line #L1062 was not covered by tests

@Override
public void visit(BLangClassDefinition classDefinition) {
}
Expand Down
27 changes: 26 additions & 1 deletion compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/NodeFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
import org.wso2.ballerinalang.compiler.tree.expressions.BLangElvisExpr;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangErrorConstructorExpr;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangErrorVarRef;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangExtendedXMLNavigationAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangFieldBasedAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangGroupExpr;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangIndexBasedAccess;
Expand Down Expand Up @@ -144,6 +145,9 @@
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementFilter;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementLiteral;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLFilterStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLIndexedStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLMethodCallStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLNavigationAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLProcInsLiteral;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLQName;
Expand Down Expand Up @@ -1283,10 +1287,31 @@
@Override
public void visit(BLangXMLNavigationAccess xmlNavigation) {
lookupNode(xmlNavigation.expr);
lookupNode(xmlNavigation.childIndex);
lookupNodes(xmlNavigation.filters);
}

@Override
public void visit(BLangExtendedXMLNavigationAccess extendedXmlNavigationAccess) {
lookupNode(extendedXmlNavigationAccess.stepExpr);
lookupNodes(extendedXmlNavigationAccess.extensions);
}

@Override
public void visit(BLangXMLIndexedStepExtend xmlIndexedStepExtend) {
lookupNode(xmlIndexedStepExtend.indexExpr);
}

@Override
public void visit(BLangXMLFilterStepExtend xmlFilterStepExtend) {
lookupNodes(xmlFilterStepExtend.filters);
setEnclosingNode(xmlFilterStepExtend, xmlFilterStepExtend.pos);
}

Check warning on line 1308 in compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/NodeFinder.java

View check run for this annotation

Codecov / codecov/patch

compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/NodeFinder.java#L1306-L1308 

Added lines #L1306 - L1308 were not covered by tests
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we check if we can fix the codecov warnings?


@Override
public void visit(BLangXMLMethodCallStepExtend xmlMethodCallStepExtend) {
lookupNode(xmlMethodCallStepExtend.invocation);
}

@Override
public void visit(BLangMatchStatement matchStatementNode) {
lookupNode(matchStatementNode.expr);
Expand Down
31 changes: 30 additions & 1 deletion compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/ReferenceFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
import org.wso2.ballerinalang.compiler.tree.expressions.BLangErrorConstructorExpr;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangErrorVarRef;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangExpression;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangExtendedXMLNavigationAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangFieldBasedAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangFieldBasedAccess.BLangNSPrefixedFieldBasedAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangGroupExpr;
Expand Down Expand Up @@ -151,6 +152,9 @@
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementFilter;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementLiteral;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLFilterStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLIndexedStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLMethodCallStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLNavigationAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLProcInsLiteral;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLQName;
Expand Down Expand Up @@ -1323,11 +1327,36 @@ public void visit(BLangXMLElementAccess xmlElementAccess) {

@Override
public void visit(BLangXMLNavigationAccess xmlNavigation) {
find(xmlNavigation.childIndex);
find(xmlNavigation.filters);
find(xmlNavigation.expr);
}

@Override
public void visit(BLangExtendedXMLNavigationAccess extendedXmlNavigationAccess) {
find(extendedXmlNavigationAccess.extensions);
find(extendedXmlNavigationAccess.stepExpr);
}

@Override
public void visit(BLangXMLIndexedStepExtend xmlIndexedStepExtend) {
find(xmlIndexedStepExtend.indexExpr);
}

@Override
public void visit(BLangXMLFilterStepExtend xmlFilterStepExtend) {
find(xmlFilterStepExtend.filters);
}

@Override
public void visit(BLangXMLMethodCallStepExtend xmlMethodCallStepExtend) {
BLangInvocation invocation = xmlMethodCallStepExtend.invocation;
List<BLangExpression> argExprs = invocation.argExprs;
for (int i = 1; i < argExprs.size(); i++) {
find(argExprs.get(i));
}
addIfSameSymbol(invocation.symbol, invocation.name.pos);
}

@Override
public void visit(BLangClassDefinition classDefinition) {
find(classDefinition.annAttachments);
Expand Down
26 changes: 25 additions & 1 deletion compiler/ballerina-lang/src/main/java/io/ballerina/compiler/api/impl/SymbolFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
import org.wso2.ballerinalang.compiler.tree.expressions.BLangErrorConstructorExpr;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangErrorVarRef;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangExpression;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangExtendedXMLNavigationAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangFieldBasedAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangGroupExpr;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangIgnoreExpr;
Expand Down Expand Up @@ -162,6 +163,9 @@
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementFilter;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementLiteral;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLFilterStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLIndexedStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLMethodCallStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLNavigationAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLProcInsLiteral;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLQName;
Expand Down Expand Up @@ -1670,10 +1674,30 @@ public void visit(BLangXMLElementAccess xmlElementAccess) {
@Override
public void visit(BLangXMLNavigationAccess xmlNavigation) {
lookupNode(xmlNavigation.expr);
lookupNode(xmlNavigation.childIndex);
lookupNodes(xmlNavigation.filters);
}

@Override
public void visit(BLangExtendedXMLNavigationAccess extendedXmlNavigationAccess) {
lookupNode(extendedXmlNavigationAccess.stepExpr);
lookupNodes(extendedXmlNavigationAccess.extensions);
}

@Override
public void visit(BLangXMLIndexedStepExtend xmlIndexedStepExtend) {
lookupNode(xmlIndexedStepExtend.indexExpr);
}

@Override
public void visit(BLangXMLFilterStepExtend xmlFilterStepExtend) {
lookupNodes(xmlFilterStepExtend.filters);
}

@Override
public void visit(BLangXMLMethodCallStepExtend xmlMethodCallStepExtend) {
lookupNode(xmlMethodCallStepExtend.invocation);
}

@Override
public void visit(BLangInvocation.BLangResourceAccessInvocation resourceAccessInvocation) {
lookupNodes(resourceAccessInvocation.annAttachments);
Expand Down
4 changes: 4 additions & 0 deletions compiler/ballerina-lang/src/main/java/org/ballerinalang/model/tree/NodeKind.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ public enum NodeKind {
XML_ELEMENT_FILTER_EXPR,
XML_ELEMENT_ACCESS,
XML_NAVIGATION,
XML_EXTENDED_NAVIGATION,
XML_STEP_INDEXED_EXTEND,
XML_STEP_FILTER_EXTEND,
XML_STEP_METHOD_CALL_EXTEND,
STATEMENT_EXPRESSION,
MATCH_EXPRESSION,
MATCH_EXPRESSION_PATTERN_CLAUSE,
Expand Down
2 changes: 0 additions & 2 deletions ...rina-lang/src/main/java/org/ballerinalang/model/tree/expressions/XMLNavigationAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,4 @@ public static NavAccessType fromInt(int number) {
List<BLangXMLElementFilter> getFilters();

BLangExpression getExpression();

BLangExpression getChildIndex();
}
28 changes: 27 additions & 1 deletion ...erina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ClassClosureDesugar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
import org.wso2.ballerinalang.compiler.tree.expressions.BLangErrorConstructorExpr;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangErrorVarRef;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangExpression;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangExtendedXMLNavigationAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangFieldBasedAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangGroupExpr;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangIgnoreExpr;
Expand Down Expand Up @@ -104,6 +105,9 @@
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLCommentLiteral;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementLiteral;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLFilterStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLIndexedStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLMethodCallStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLNavigationAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLProcInsLiteral;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLQName;
Expand Down Expand Up @@ -1092,11 +1096,33 @@ public void visit(BLangXMLElementAccess xmlElementAccess) {
@Override
public void visit(BLangXMLNavigationAccess xmlNavigation) {
xmlNavigation.expr = rewriteExpr(xmlNavigation.expr);
xmlNavigation.childIndex = rewriteExpr(xmlNavigation.childIndex);
result = xmlNavigation;
}

@Override
public void visit(BLangExtendedXMLNavigationAccess extendedXMLNavigationAccess) {
extendedXMLNavigationAccess.stepExpr = rewriteExpr(extendedXMLNavigationAccess.stepExpr);
rewriteExprs(extendedXMLNavigationAccess.extensions);
result = extendedXMLNavigationAccess;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to check codecov warnings everywhere.


@Override
public void visit(BLangXMLIndexedStepExtend xmlIndexedStepExtend) {
xmlIndexedStepExtend.indexExpr = rewriteExpr(xmlIndexedStepExtend.indexExpr);
result = xmlIndexedStepExtend;
}

@Override
public void visit(BLangXMLMethodCallStepExtend xmlMethodCallStepExtend) {
xmlMethodCallStepExtend.invocation = rewriteExpr(xmlMethodCallStepExtend.invocation);
result = xmlMethodCallStepExtend;
}

@Override
public void visit(BLangXMLFilterStepExtend xmlFilterStepExtend) {
result = xmlFilterStepExtend;
}

@Override
public void visit(BLangIndexBasedAccess.BLangJSONAccessExpr jsonAccessExpr) {
jsonAccessExpr.indexExpr = rewriteExpr(jsonAccessExpr.indexExpr);
Expand Down
3 changes: 0 additions & 3 deletions .../ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ClosureDesugar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1900,7 +1900,6 @@ public void visit(BLangIndexBasedAccess.BLangXMLAccessExpr xmlIndexAccessExpr) {
result = xmlIndexAccessExpr;
}


@Override
public void visit(BLangXMLElementAccess xmlElementAccess) {
xmlElementAccess.expr = rewriteExpr(xmlElementAccess.expr);
Expand All @@ -1910,11 +1909,9 @@ public void visit(BLangXMLElementAccess xmlElementAccess) {
@Override
public void visit(BLangXMLNavigationAccess xmlNavigation) {
xmlNavigation.expr = rewriteExpr(xmlNavigation.expr);
xmlNavigation.childIndex = rewriteExpr(xmlNavigation.childIndex);
result = xmlNavigation;
}


@Override
public void visit(BLangIndexBasedAccess.BLangJSONAccessExpr jsonAccessExpr) {
jsonAccessExpr.indexExpr = rewriteExpr(jsonAccessExpr.indexExpr);
Expand Down
33 changes: 32 additions & 1 deletion ...allerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ClosureGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
import org.wso2.ballerinalang.compiler.tree.expressions.BLangErrorConstructorExpr;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangErrorVarRef;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangExpression;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangExtendedXMLNavigationAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangFieldBasedAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangGroupExpr;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangIgnoreExpr;
Expand Down Expand Up @@ -142,11 +143,15 @@
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLCommentLiteral;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementLiteral;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLFilterStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLIndexedStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLMethodCallStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLNavigationAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLProcInsLiteral;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLQName;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLQuotedString;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLSequenceLiteral;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLTextLiteral;
import org.wso2.ballerinalang.compiler.tree.statements.BLangAssignment;
import org.wso2.ballerinalang.compiler.tree.statements.BLangBlockStmt;
Expand Down Expand Up @@ -1392,10 +1397,36 @@ public void visit(BLangXMLElementAccess xmlElementAccess) {
@Override
public void visit(BLangXMLNavigationAccess xmlNavigation) {
xmlNavigation.expr = rewriteExpr(xmlNavigation.expr);
xmlNavigation.childIndex = rewriteExpr(xmlNavigation.childIndex);
result = xmlNavigation;
}

@Override
public void visit(BLangExtendedXMLNavigationAccess extendedXmlNavigationAccess) {
extendedXmlNavigationAccess.stepExpr = rewriteExpr(extendedXmlNavigationAccess.stepExpr);
List<BLangXMLStepExtend> extensions = extendedXmlNavigationAccess.extensions;
for (int i = 0; i < extensions.size(); i++) {
extensions.set(i, rewrite(extensions.get(i), env));
}
result = extendedXmlNavigationAccess;
}

@Override
public void visit(BLangXMLIndexedStepExtend xmlIndexedStepExtend) {
xmlIndexedStepExtend.indexExpr = rewriteExpr(xmlIndexedStepExtend.indexExpr);
result = xmlIndexedStepExtend;
}

@Override
public void visit(BLangXMLFilterStepExtend xmlFilterStepExtend) {
result = xmlFilterStepExtend;
}

@Override
public void visit(BLangXMLMethodCallStepExtend xmlMethodCallStepExtend) {
xmlMethodCallStepExtend.invocation = rewriteExpr(xmlMethodCallStepExtend.invocation);
result = xmlMethodCallStepExtend;
}

@Override
public void visit(BLangIndexBasedAccess.BLangJSONAccessExpr jsonAccessExpr) {
jsonAccessExpr.indexExpr = rewriteExpr(jsonAccessExpr.indexExpr);
Expand Down
33 changes: 32 additions & 1 deletion ...erina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/ConstantPropagation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
import org.wso2.ballerinalang.compiler.tree.expressions.BLangElvisExpr;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangErrorConstructorExpr;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangErrorVarRef;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangExtendedXMLNavigationAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangFieldBasedAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangGroupExpr;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangIndexBasedAccess;
Expand Down Expand Up @@ -134,9 +135,13 @@
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementFilter;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLElementLiteral;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLFilterStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLIndexedStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLMethodCallStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLNavigationAccess;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLProcInsLiteral;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLSequenceLiteral;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLStepExtend;
import org.wso2.ballerinalang.compiler.tree.expressions.BLangXMLTextLiteral;
import org.wso2.ballerinalang.compiler.tree.matchpatterns.BLangConstPattern;
import org.wso2.ballerinalang.compiler.tree.matchpatterns.BLangErrorMatchPattern;
Expand Down Expand Up @@ -874,10 +879,36 @@ public void visit(BLangXMLElementAccess xmlElementAccess) {

@Override
public void visit(BLangXMLNavigationAccess xmlNavigation) {
xmlNavigation.childIndex = rewrite(xmlNavigation.childIndex);
result = xmlNavigation;
}

@Override
public void visit(BLangExtendedXMLNavigationAccess extendedXmlNavigationAccess) {
List<BLangXMLStepExtend> extensions = extendedXmlNavigationAccess.extensions;
for (int i = 0; i < extensions.size(); i++) {
BLangXMLStepExtend extension = extensions.get(i);
extensions.set(i, rewrite(extension));
}
result = extendedXmlNavigationAccess;
}

@Override
public void visit(BLangXMLIndexedStepExtend xmlIndexedStepExtend) {
xmlIndexedStepExtend.indexExpr = rewrite(xmlIndexedStepExtend.indexExpr);
result = xmlIndexedStepExtend;
}

@Override
public void visit(BLangXMLFilterStepExtend xmlFilterStepExtend) {
result = xmlFilterStepExtend;
}

@Override
public void visit(BLangXMLMethodCallStepExtend xmlMethodCallStepExtend) {
xmlMethodCallStepExtend.invocation = rewrite(xmlMethodCallStepExtend.invocation);
result = xmlMethodCallStepExtend;
}

@Override
public void visit(BLangXMLNS xmlnsNode) {
result = xmlnsNode;
Expand Down
Loading