Add semantic analysis and negative tests for natural expressions #43993
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,81 @@ | ||||||
| /* | ||||||
| * Copyright (c) 2025, WSO2 LLC. (http://www.wso2.org). | ||||||
| * | ||||||
| * WSO2 Inc. licenses this file to you under the Apache License, | ||||||
MaryamZi marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| * Version 2.0 (the "License"); you may not use this file except | ||||||
| * in compliance with the License. | ||||||
| * You may obtain a copy of the License at | ||||||
| * | ||||||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||||||
| * | ||||||
| * Unless required by applicable law or agreed to in writing, | ||||||
| * software distributed under the License is distributed on an | ||||||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||||||
| * KIND, either express or implied. See the License for the | ||||||
| * specific language governing permissions and limitations | ||||||
| * under the License. | ||||||
| */ | ||||||
|
|
||||||
| package io.ballerina.projects.internal; | ||||||
|
|
||||||
| import io.ballerina.compiler.syntax.tree.ExternalFunctionBodyNode; | ||||||
| import io.ballerina.compiler.syntax.tree.FunctionDefinitionNode; | ||||||
| import io.ballerina.compiler.syntax.tree.ModulePartNode; | ||||||
| import io.ballerina.compiler.syntax.tree.NaturalExpressionNode; | ||||||
| import io.ballerina.compiler.syntax.tree.Node; | ||||||
| import io.ballerina.compiler.syntax.tree.NodeVisitor; | ||||||
| import io.ballerina.compiler.syntax.tree.SimpleNameReferenceNode; | ||||||
|
|
||||||
| /** | ||||||
| * Check and add an import for the natural programming module if there is a natural expression. | ||||||
| * | ||||||
| * @since 2201.13.0 | ||||||
| */ | ||||||
| public class NaturalProgrammingImportAnalyzer extends NodeVisitor { | ||||||
|
|
||||||
| private boolean shouldImportNaturalProgrammingModule; | ||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
|
||||||
| private static final String CODE_ANNOTATION = "code"; | ||||||
|
|
||||||
| public boolean shouldImportNaturalProgrammingModule(ModulePartNode modulePartNode) { | ||||||
| modulePartNode.accept(this); | ||||||
| return this.shouldImportNaturalProgrammingModule; | ||||||
| } | ||||||
|
|
||||||
| @Override | ||||||
| public void visit(NaturalExpressionNode naturalExpressionNode) { | ||||||
| this.shouldImportNaturalProgrammingModule = true; | ||||||
| } | ||||||
|
|
||||||
| @Override | ||||||
| public void visit(FunctionDefinitionNode functionDefinitionNode) { | ||||||
| if (this.shouldImportNaturalProgrammingModule) { | ||||||
| return; | ||||||
| } | ||||||
|
|
||||||
| if (isExternalFunctionWithCodeAnnotation(functionDefinitionNode)) { | ||||||
| this.shouldImportNaturalProgrammingModule = true; | ||||||
| return; | ||||||
| } | ||||||
|
|
||||||
| super.visit(functionDefinitionNode); | ||||||
| } | ||||||
|
|
||||||
| private boolean isExternalFunctionWithCodeAnnotation(FunctionDefinitionNode functionDefinitionNode) { | ||||||
| if (!(functionDefinitionNode.functionBody() instanceof ExternalFunctionBodyNode externalFunctionBodyNode)) { | ||||||
| return false; | ||||||
| } | ||||||
|
|
||||||
| return externalFunctionBodyNode.annotations().stream() | ||||||
| .anyMatch(annotation -> | ||||||
| annotation.annotReference() instanceof SimpleNameReferenceNode annotReference && | ||||||
| CODE_ANNOTATION.equals(annotReference.name().text())); | ||||||
|
Contributor
There was a problem hiding this comment. Since code is a common name, shall we check the prompt field also?
Member
Author
There was a problem hiding this comment. It'll have the module prefix then.
Member
Author
There was a problem hiding this comment. Looks like we don't give a redeclared symbol error for code in the current module. Will fix this for m2.
Member
Author
There was a problem hiding this comment. This is when there is a |
||||||
| } | ||||||
|
|
||||||
| @Override | ||||||
| protected void visitSyntaxNode(Node node) { | ||||||
| if (this.shouldImportNaturalProgrammingModule) { | ||||||
| return; | ||||||
| } | ||||||
| super.visitSyntaxNode(node); | ||||||
| } | ||||||
| } | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /* | ||
| * Copyright (c) 2025, WSO2 LLC. (http://www.wso2.org). | ||
| * | ||
| * WSO2 Inc. licenses this file to you under the Apache License, | ||
| * Version 2.0 (the "License"); you may not use this file except | ||
| * in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.ballerinalang.model.tree.expressions; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Represents a natural expression node. | ||
| * | ||
| * @since 2201.13.0 | ||
| */ | ||
| public interface NaturalExpressionNode extends ExpressionNode { | ||
|
|
||
| List<? extends ExpressionNode> getInsertions(); | ||
|
|
||
| void addInsertion(ExpressionNode expression); | ||
|
|
||
| List<? extends ExpressionNode> getStrings(); | ||
|
|
||
| void addString(ExpressionNode stringLiteral); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In here Don't we need to consider about the language version
As an example np module can have different versions for U12 and U13
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's resolved by the project API? Which is why we shouldn't specify a version here?