RoleRag with added EmptyDeclaration

build.gradle

@@ -41,7 +41,7 @@ jar {
     }
 
     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 {
 
 clean.dependsOn(cleanGen)
 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

src/main/java/org/jastadd/preprocessor/Main.java

@@ -88,6 +88,7 @@ public class Main extends org.jastadd.relast.compiler.RelAstProcessor {
         }
     }
 
+
     Document navigation = program.toNavigation(useExceptions, useOptionals, exceptionName);
 
     Path yamlFile = outputBasePath.resolve(navigation.getFileName());
@@ -103,6 +104,7 @@ public class Main extends org.jastadd.relast.compiler.RelAstProcessor {
       throw new CompilerException("Unable to expand template", e);
     }
 
+
     for (GrammarFile grammarFile : program.getGrammarFileList()) {
       printMessage("Writing output file " + grammarFile.getFileName());
       // TODO decide and document what the file name should be, the full path or a simple name?

src/test/resources/AddEmptyDeclaration/config.yaml

@@ -3,6 +3,4 @@
   args:
     - "--inputBaseDir=in"
     - "--outputBaseDir=out"
-    - "--errorHandling=null"
     - "Example.relast"
-    - "EmptyDeclaration.relast"