Skip to content

7.8.26: TypesCompleter für MCTuples #73

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

Merged
mathias-pfeiffer merged 3 commits into from
Mar 12, 2026
Merged

7.8.26: TypesCompleter für MCTuples #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e350d9d
SymTypeExpression fuer MCTupleType
DovydasSkauranskas Feb 21, 2026
06bd632
type.hasTypeInfo() check
DovydasSkauranskas Feb 21, 2026
859f836
Version erhoeht
DovydasSkauranskas Mar 12, 2026
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 gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ assertj_version = 3.21.0
junit_version = 5.8.2

# Version of published artifacts
version = 7.8.25
version = 7.8.26
13 changes: 12 additions & 1 deletion language/src/main/java/de/monticore/lang/sysmlv2/symboltable/completers/TypesCompleter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import de.monticore.types.check.SymTypeExpression;
import de.monticore.types.check.SymTypeExpressionFactory;
import de.monticore.types.mccollectiontypes._ast.ASTMCGenericType;
import de.monticore.types.mcstructuraltypes._ast.ASTMCTupleType;
import de.se_rwth.commons.logging.Log;

import java.util.ArrayList;
Expand All @@ -47,7 +48,17 @@ private List<SymTypeExpression> getTypeCompletion(List<ASTSpecialization> specia

for(var mcType: astTyping.getSuperTypesList()) {
SymTypeExpression res = null;
if(mcType instanceof ASTMCGenericType) {
if(mcType instanceof ASTMCTupleType) {
var tupleType = (ASTMCTupleType) mcType;
List<SymTypeExpression> componentTypes = new ArrayList<>();
for(var componentMcType : tupleType.getMCTypeList()) {
componentTypes.add(SymTypeExpressionFactory.createTypeExpression(
componentMcType.printType(),
(IBasicSymbolsScope) componentMcType.getEnclosingScope()));
}
res = SymTypeExpressionFactory.createTuple(componentTypes);
}
else if(mcType instanceof ASTMCGenericType) {
// We still have to print when the type is generic because the defining symbol does not give info about the
// instantiation with type arguments
res = SymTypeExpressionFactory.createTypeExpression(
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/de/monticore/lang/sysmlv2/types/SysMLv2DeriveSymTypeOfCommonExpressions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public boolean isIntegralType(SymTypeExpression type) {
protected void calculateFieldAccessAboutPortUsage(SymTypeExpression type) {
if (this.isStream) {
//case for isStream == true
if (type.getTypeInfo().getName().contains("Stream")) {
if (type.hasTypeInfo() && type.getTypeInfo().getName().contains("Stream")) {
//type is already Stream, set TypeCheckResult
getTypeCheckResult().setResult(type);
} else {
Expand Down
Loading