Add typecheck test for SysML calc defs as function symbols by linggd · Pull Request #99 · MontiCore/sysmlv2

linggd · 2026-04-14T16:02:19Z

Added

Added a test for handling SysML calc defs as function symbols.
Added an adapter to treat CalcUsage as function symbols.
Added calculation for calc usage in TypesCompleter

mathias-pfeiffer · 2026-04-16T09:51:33Z

+      throw new IllegalStateException("CalcUsage has no body elements: " + adaptee.getFullName());
+    }
+
+    var elem = ast.getSysMLElement(0);


Stattdessen das Element mit "return" finden

mathias-pfeiffer · 2026-04-16T09:52:03Z

+      );
+    }
+
+    ASTAnonymousUsage anon = (ASTAnonymousUsage) elem;


Kein Grund für einen Cast

mathias-pfeiffer · 2026-04-16T09:52:36Z

+      throw new IllegalStateException("Calc return has no specialization: " + adaptee.getFullName());
+    }
+
+    ASTSpecialization spec = anon.getSpecialization(0);


Um die Specialization, also den Typen zu finden, kannst du einen Visitor auf das ungecastete elem loslassen

mathias-pfeiffer · 2026-04-16T09:53:23Z

+  }
+
+  protected SymTypeExpression deriveReturnType() {
+    if (!adaptee.isPresentAstNode()) {


Stattdessen den Type bereits am CalcDefSymbol speichern

mathias-pfeiffer · 2026-04-16T09:55:28Z

+
+    ASTCalcUsage ast = adaptee.getAstNode();
+
+    if (ast.getSysMLElementList().isEmpty()) {


Der Default Type ist "Any", das Analog der MontiCore-Types-Welt ist SymTypeExpressionFactory.createTopType()

mathias-pfeiffer · 2026-04-16T09:56:03Z

+    ASTSpecialization spec = anon.getSpecialization(0);
+
+    if (spec.getSuperTypesList().isEmpty()) {
+      throw new IllegalStateException("Calc return specialization has no super type: " + adaptee.getFullName());


s.o., SymTypeExpressionFactory.createTopType()

mathias-pfeiffer · 2026-04-16T09:56:48Z

+      return SymTypeExpressionFactory.createFromSymbol(typeSymbol);
+    }
+
+    // fallback for primitive names if needed


Dieser Fall sollte nie eintreten, entfernen

mathias-pfeiffer · 2026-04-24T10:04:10Z

+  public void endVisit(ASTCalcUsage node) {
+    if (node.isPresentSymbol()) {
+      CalcUsageSymbol symbol = node.getSymbol();
+      CalcReturnSpecVisitor visitor = new CalcReturnSpecVisitor();


Direkt hier die Klasse implementieren, keine eigene Klasse anlegen

mathias-pfeiffer · 2026-04-24T10:04:36Z

+import de.monticore.lang.sysmlbasis._visitor.SysMLBasisVisitor2;
+import java.util.Optional;
+
+public class CalcReturnSpecVisitor implements SysMLBasisVisitor2 {


Keine eigene Klasse (s.u.), sondern direkt (ad-hoc) in Adapter definieren

mathias-pfeiffer · 2026-04-24T10:05:08Z

+    }
+  }
+
+  public Optional<ASTSpecialization> getSpecializationReturn() {


braucht dann keinen Getter, sondern setzt direkt die Variable ausserhalb des Visitors (in der visit-Methode von Adapter)

mathias-pfeiffer · 2026-04-24T10:05:37Z

+import java.util.Optional;
+
+public class CalcReturnSpecVisitor implements SysMLBasisVisitor2 {
+  protected ASTSpecialization specializationReturn;


Direkt SymType berechnen, keine Zwischenschritte

mathias-pfeiffer · 2026-04-24T10:05:52Z

+  protected ASTSpecialization specializationReturn;
+
+  @Override
+  public void visit(ASTAnonymousUsage node) {


Auch ein Visit für Attribute Usages implementieren

mathias-pfeiffer · 2026-04-24T10:06:33Z

+  @Override
+  public void visit(ASTAnonymousUsage node) {
+    if (specializationReturn == null && node.getModifier().isReturn()
+        && !node.getSpecializationList().isEmpty()) {


Wenn empty, dann ist der Type Obscure! (SymTypeObscure bzw. Factory.createObscureType)

mathias-pfeiffer · 2026-04-24T10:08:38Z

+      var traverser = SysMLActionsMill.inheritanceTraverser();
+      traverser.add4SysMLBasis(visitor);
+
+      for (ASTSysMLElement elem : node.getSysMLElementList()) {


Keine For-Loops, sondern direkt den Visitor ausführen und den ersten Return-Type nehmen, der gefunden wird und im korrekten Scope liegt (returnType.enclosingScope == node.getSpannedScope oder so ähnlich)

mathias-pfeiffer · 2026-04-24T10:09:05Z

+public class CalcUsageAsFunctionsTest {
+
+  @Test
+  public void testSimpleModel() throws Exception {


Sehr gut

Suggested change

public void testSimpleModel() throws Exception {

public void testValid() throws Exception {

mathias-pfeiffer · 2026-04-24T10:10:53Z

+    checker.checkAll(ast);
+
+    assertTrue(Log.getFindings().isEmpty(), ()-> Log.getFindings().toString());
+  }


Bitte noch einen testInvalid hinzufügen:

Suggested change

}

}

@Test

void testInvalid() {

var model = "... calc bar { return : nat } ...";

...

assertThat(Log.getFindings()).hasSize(1);

assertThat(Log.getFindings().get(0).getMessage()).containts("0x12354 Type was nat")

mathias-pfeiffer · 2026-04-24T10:11:45Z

Die Versionsnummer in gradle.properties muss noch angepasst (inkrementiert) werden

…e in this model

mathias-pfeiffer · 2026-04-27T13:51:06Z

+  public void endVisit(ASTCalcUsage node) {
+    if (node.isPresentSymbol()) {
+      CalcUsageSymbol symbol = node.getSymbol();
+      final SymTypeExpression[] returnType = new SymTypeExpression[1];


Kein Array verwenden

Suggested change

final SymTypeExpression[] returnType = new SymTypeExpression[1];

SymTypeExpression returnType = SymTypeExpressionFactory.createTopType();

mathias-pfeiffer · 2026-04-27T13:52:53Z

+  @Override
+  public void endVisit(ASTCalcUsage node) {
+    if (node.isPresentSymbol()) {
+      CalcUsageSymbol symbol = node.getSymbol();


Wird nur 1x benutzt, entfernen

Suggested change

CalcUsageSymbol symbol = node.getSymbol();

mathias-pfeiffer · 2026-04-27T13:53:41Z

+      traverser.add4SysMLBasis(new SysMLBasisVisitor2() {
+        @Override
+        public void visit(ASTAnonymousUsage retNode) {
+          // Store only the first return type declared directly in  calc usage


Quatsch, einfach "der letzte gewinnt" und eine CoCo schreiben, die prüft, dass es maximal 1 mit Modifier "return" gibt

Suggested change

// Store only the first return type declared directly in calc usage

mathias-pfeiffer · 2026-04-27T13:54:54Z

+        @Override
+        public void visit(ASTAnonymousUsage retNode) {
+          // Store only the first return type declared directly in  calc usage
+          if (returnType[0] == null


Suggested change

if (returnType[0] == null

if (node.getModifier().isReturn()

&& retNode.getEnclosingScope() == node.getSpannedScope()) {

// This code is limited to the first type in the list

List<SymTypeExpression> types = getTypeCompletion(retNode.getSpecializationList(), false);

returnType = types.isEmpty() ? SymTypeExpressionFactory.createObscureType() : types.get(0);

}

mathias-pfeiffer · 2026-04-27T13:55:18Z

+      traverser.add4SysMLParts(new SysMLPartsVisitor2() {
+        @Override
+        public void visit(ASTAttributeUsage retNode) {
+          if (returnType[0] == null


s.o., keine Checks auf null

mathias-pfeiffer · 2026-04-27T13:55:59Z

+      });
+      node.accept(traverser);
+
+      if (returnType[0] != null) {


Keine Checks, einfach setzen

Suggested change

if (returnType[0] != null) {

symbol.setReturnType(returnType[0]);

linggd assigned mathias-pfeiffer Apr 14, 2026

mathias-pfeiffer reviewed Apr 16, 2026

View reviewed changes

mathias-pfeiffer marked this pull request as draft April 16, 2026 09:57

linggd marked this pull request as ready for review April 21, 2026 11:30

mathias-pfeiffer reviewed Apr 24, 2026

View reviewed changes

Comment thread .../java/de/monticore/lang/sysmlparts/symboltable/adapters/CalcUsage2FunctionSymbolAdapter.java

mathias-pfeiffer reviewed Apr 24, 2026

View reviewed changes

mathias-pfeiffer marked this pull request as draft April 24, 2026 10:11

ling guo dei added 7 commits April 26, 2026 14:15

Add test for calc defs as functions

e3c1436

treat CalcUsage as function symbol with the help of adapter

5ac5eef

Handle calc return types in TypesCompleter

1de0a6e

change calc def to calc usage since we are actually dealing with usag…

920c706

…e in this model

move ad-hoc visitor into TypesCompleter and added adapter documentation

e383491

documentation formatting

fc9b21d

typo fix

6e41942

linggd force-pushed the ln/calc-defs-as-functions branch from 5bdda1f to 6e41942 Compare April 26, 2026 12:19

linggd marked this pull request as ready for review April 26, 2026 12:39

mathias-pfeiffer reviewed Apr 27, 2026

View reviewed changes

mathias-pfeiffer merged commit 8c6a83c into release/7.8.x Apr 27, 2026
5 of 6 checks passed

mathias-pfeiffer deleted the ln/calc-defs-as-functions branch April 27, 2026 13:56


		ASTCalcUsage ast = adaptee.getAstNode();

		if (ast.getSysMLElementList().isEmpty()) {

	public void testSimpleModel() throws Exception {
	public void testValid() throws Exception {

-  }
+  }
+  @Test
+  void testInvalid() {
+    var model = "... calc bar { return : nat } ...";
+    ...
+    assertThat(Log.getFindings()).hasSize(1);
+    assertThat(Log.getFindings().get(0).getMessage()).containts("0x12354 Type was nat")

	final SymTypeExpression[] returnType = new SymTypeExpression[1];
	SymTypeExpression returnType = SymTypeExpressionFactory.createTopType();

-          if (returnType[0] == null
+          if (node.getModifier().isReturn()
+              && retNode.getEnclosingScope() == node.getSpannedScope()) {
+            // This code is limited to the first type in the list
+            List<SymTypeExpression> types = getTypeCompletion(retNode.getSpecializationList(), false);
+            returnType = types.isEmpty() ? SymTypeExpressionFactory.createObscureType() : types.get(0);
+          }

	if (returnType[0] != null) {
	symbol.setReturnType(returnType[0]);

Conversation

linggd commented Apr 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mathias-pfeiffer commented Apr 24, 2026

Uh oh!

mathias-pfeiffer Apr 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mathias-pfeiffer Apr 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

linggd commented Apr 14, 2026 •

edited

Loading

mathias-pfeiffer Apr 27, 2026 •

edited

Loading

mathias-pfeiffer Apr 27, 2026 •

edited

Loading