Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions language/src/main/java/de/monticore/lang/sysmlv2/SysMLv2Mill.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public static void prepareGlobalScope() {
SysMLv2Mill.initializePrimitives();
SysMLv2Mill.addStringType();
SysMLv2Mill.addCollectionTypes();
SysMLv2Mill.addTsynTypes();
}

/**
Expand Down Expand Up @@ -171,6 +172,23 @@ protected void _addCollectionTypes() {
}
}

public static void addTsynTypes() {
getMill()._addTsynTypes();
}

protected void _addTsynTypes() {
if (SysMLv2Mill.globalScope().resolveType("Eps").isEmpty()) {
var eps = typeSymbolBuilder()
.setName("Eps")
.setEnclosingScope(globalScope())
.setFullName("Eps")
.setSpannedScope(scope())
.setAccessModifier(AccessModifier.ALL_INCLUSION)
.build();
SysMLv2Mill.globalScope().add(eps);
}
}

protected OOTypeSymbol buildCollectionType(String name, String... typeVars) {
var spannedScope = scope();

Expand Down
51 changes: 51 additions & 0 deletions language/src/test/java/symboltable/TsynTypeTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package symboltable;

import de.monticore.lang.sysmlv2.SysMLv2Mill;
import de.monticore.lang.sysmlv2.SysMLv2Tool;
import de.monticore.lang.sysmlv2._ast.ASTSysMLModel;
import de.se_rwth.commons.logging.Log;
import de.se_rwth.commons.logging.LogStub;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import java.io.IOException;
import java.util.Optional;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;

public class TsynTypeTest {

@BeforeAll
static void setup() {
SysMLv2Mill.init();
}

@BeforeEach
public void init() {
LogStub.init();
SysMLv2Mill.globalScope().clear();
SysMLv2Mill.initializePrimitives();
SysMLv2Mill.addCollectionTypes();
SysMLv2Mill.addTsynTypes();
Log.clearFindings();
}

@Test
public void testEpsInModel() throws IOException {
var tool = new SysMLv2Tool();

var model = "part def Valid { attribute e: Eps; }";
var optAst = SysMLv2Mill.parser().parse_String(model);

assertThat(optAst).isPresent();
ASTSysMLModel ast = optAst.get();

tool.createSymbolTable(ast);
tool.completeSymbolTable(ast);

assertTrue(Log.getFindings().isEmpty(), () -> Log.getFindings().toString());
}

}
Loading