Skip to content

Use Arguments in SysMLFunctionOperationExpression #355 #204

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

Open
alexwp10 wants to merge 1 commit into
base: release/7.8.x
Choose a base branch
from
+19 −1
Open

Use Arguments in SysMLFunctionOperationExpression #355 #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion language/src/main/grammars/de/monticore/lang/SysMLExpressions.mc4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ component grammar SysMLExpressions

SysMLFunctionOperationExpression implements Expression <291> =
Expression "->" Name
("(" (SysMLParameter || ",")* ")")?
(Arguments)?
(body:SysMLBodyExpression)? ;

// Eigentlich ist "^" der Name einer CalcDef aus den Domain Libraries
Expand Down
18 changes: 18 additions & 0 deletions language/src/test/java/parser/ExpressionParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,22 @@ public void testFunctionOperationAfterFieldAccess() throws IOException {
assertThat(functionOperation.getName()).isEqualTo("c");
}

/**
* Checks that a function operation with arguments is parsed directly as
* ASTSysMLFunctionOperationExpression, not wrapped in an ASTCallExpression.
*/
@Test
public void testFunctionOperationWithArguments() throws IOException {
var ast = parser.parse_StringExpression("x->b(y)");

assertThat(ast).isPresent();
assertThat(Log.getFindings()).isEmpty();
assertThat(ast.get()).isInstanceOf(ASTSysMLFunctionOperationExpression.class);
assertThat(ast.get()).isNotInstanceOf(ASTCallExpression.class);

var functionOperation = (ASTSysMLFunctionOperationExpression) ast.get();
assertThat(functionOperation.getName()).isEqualTo("b");
assertThat(functionOperation.getArguments().getExpressionList()).hasSize(1);
}

}
Loading