Skip to content
Snippets Groups Projects
Commit cb3151fc authored by Ronny Böttger's avatar Ronny Böttger
Browse files

RoleRag with added EmptyDeclaration

parent 699b7ef9
No related branches found
No related tags found
No related merge requests found
...@@ -41,7 +41,7 @@ jar { ...@@ -41,7 +41,7 @@ jar {
} }
from { from {
configurations.runtimeClasspath.collect { return (it.exists() && !it.toString().endsWith("model.jar")) ? (it.isDirectory() ? it : zipTree(it)) : null } configurations.runtimeClasspath.collect { return (it.exists() && (!it.toString().contains("/build/libs/")|| it.toString().contains("-base-"))) ? (it.isDirectory() ? it : zipTree(it)) : null }
} }
} }
...@@ -143,3 +143,4 @@ jastadd { ...@@ -143,3 +143,4 @@ jastadd {
clean.dependsOn(cleanGen) clean.dependsOn(cleanGen)
generateAst.dependsOn(relast) generateAst.dependsOn(relast)
jar.dependsOn("relast.preprocessor:jar") // the jar is a fat jar that contains the jar of the preprocessor
\ No newline at end of file
relast.preprocessor @ 4b4b7798
Subproject commit b4fe30b62b9e891c20497af3e92614dd07c8d8b1 Subproject commit 4b4b7798e65fae598958afb4e33a1d9b0938be58
...@@ -88,6 +88,7 @@ public class Main extends org.jastadd.relast.compiler.RelAstProcessor { ...@@ -88,6 +88,7 @@ public class Main extends org.jastadd.relast.compiler.RelAstProcessor {
} }
} }
Document navigation = program.toNavigation(useExceptions, useOptionals, exceptionName); Document navigation = program.toNavigation(useExceptions, useOptionals, exceptionName);
Path yamlFile = outputBasePath.resolve(navigation.getFileName()); Path yamlFile = outputBasePath.resolve(navigation.getFileName());
...@@ -103,6 +104,7 @@ public class Main extends org.jastadd.relast.compiler.RelAstProcessor { ...@@ -103,6 +104,7 @@ public class Main extends org.jastadd.relast.compiler.RelAstProcessor {
throw new CompilerException("Unable to expand template", e); throw new CompilerException("Unable to expand template", e);
} }
for (GrammarFile grammarFile : program.getGrammarFileList()) { for (GrammarFile grammarFile : program.getGrammarFileList()) {
printMessage("Writing output file " + grammarFile.getFileName()); printMessage("Writing output file " + grammarFile.getFileName());
// TODO decide and document what the file name should be, the full path or a simple name? // TODO decide and document what the file name should be, the full path or a simple name?
......
...@@ -3,6 +3,4 @@ ...@@ -3,6 +3,4 @@
args: args:
- "--inputBaseDir=in" - "--inputBaseDir=in"
- "--outputBaseDir=out" - "--outputBaseDir=out"
- "--errorHandling=null"
- "Example.relast" - "Example.relast"
- "EmptyDeclaration.relast"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment