Skip to content

Fix: Add support for keyword directives for DSTLs #158

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

Draft
luepges wants to merge 2 commits into
base: dev
Choose a base branch
from
+32 −0
Draft

Fix: Add support for keyword directives for DSTLs #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43892a3
handle DSLTR keyword directives
luepges Jun 23, 2025
a135cb5
include some tests for nokeyword
luepges Jul 10, 2025
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 ...in/java/de/monticore/dstlgen/grammartransformation/DSL2TransformationLanguageVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,24 @@ public void visit(ASTConcept srcNode) {
map(srcNode, targetNode);
}

@Override
public void visit(ASTSplitRule srcNode) {
Log.debug("Visiting " + srcNode.toString(), LOG);
tfLang.addSplitRule(srcNode.deepClone());
}

@Override
public void visit(ASTKeywordRule srcNode) {
Log.debug("Visiting " + srcNode.toString(), LOG);
tfLang.addKeywordRule(srcNode.deepClone());
}

@Override
public void visit(ASTReplaceRule srcNode) {
Log.debug("Visiting " + srcNode.toString(), LOG);
tfLang.addReplaceRule(srcNode.deepClone());
}

public ASTMCGrammar getTfLang() {
return tfLang;
}
Expand Down
5 changes: 5 additions & 0 deletions monticore-test/montitrans/test-dstl-gen/src/main/grammars/mc/testcases/ExpressionDSL.mc4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,9 @@ grammar ExpressionDSL extends
Foo = "expr" Expression;

CDAttribute = Modifier MCType Name ("=" initial:Expression)? ";";

// a production introducing a keyword
MyFancyKeywordP = "MyFancyKeyword";
// which is then turned into no keyword
nokeyword "MyFancyKeyword";
}
9 changes: 9 additions & 0 deletions ...rans/test-dstl-gen/src/test/java/mc/testcases/expressiondsl/ExpressionDSLTRParseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,15 @@ public void testAssigns() throws IOException {
Assert.assertEquals("string", ((ASTStringLiteral)((ASTLiteralExpression)((ASTPlusExpression)ast.getValue()).getRight()).getLiteral()).getValue());
}

@Test
public void testNoKeyword() throws IOException {
// Test if (no)keywords rules apply
test("MyFancyKeyword", ExpressionDSLTRParser::parse_StringITFMyFancyKeywordP);
test("MyFancyKeyword", ExpressionDSLTRParser::parse_StringITFNameExpression);
test("42<=42", ExpressionDSLTRParser::parse_StringITFExpression);
test("42 <42", ExpressionDSLTRParser::parse_StringITFExpression);
}

protected <A> A test(String exp, ParserFunction<A> parserFunction) throws IOException {
ExpressionDSLTRParser parser = ExpressionDSLTRMill.parser();
Optional<A> typeOptional = parserFunction.parse(parser, exp);
Expand Down
Loading