Merge branch 'dev' into 'master'

0.4.0

Closes #27

See merge request !20

src/test/jastadd/resolver/Resolver.relast

@@ -21,3 +21,5 @@ rel A.Bi6? <-> B.Bi6*;
 rel A.Bi7* <-> B.Bi7;
 rel A.Bi8* <-> B.Bi8?;
 rel A.Bi9* <-> B.Bi9*;
+
+abstract Uninstantiable:A;

src/test/jastadd/resolver2/Resolver.relast

@@ -21,3 +21,5 @@ rel A.Bi6l? <-> B.Bi6*;
 rel A.Bi7l* <-> B.Bi7;
 rel A.Bi8l* <-> B.Bi8?;
 rel A.Bi9l* <-> B.Bi9*;
+
+abstract Uninstantiable:A;

src/test/jastadd/serializer-manual-relative/Serializer.relast

@@ -21,3 +21,5 @@ rel A.Bi6? <-> B.Bi6*;
 rel A.Bi9* <-> B.Bi9*;
 
 rel Root.D <-> D.Root?;
+
+abstract Uninstantiable:A;

src/test/jastadd/serializer-manual/Serializer.relast

@@ -21,3 +21,5 @@ rel A.Bi6? <-> B.Bi6*;
 rel A.Bi9* <-> B.Bi9*;
 
 rel Root.D <-> D.Root?;
+
+abstract Uninstantiable:A;

src/test/jastadd/serializer-names/Serializer.relast

@@ -32,3 +32,5 @@ rel A.Bi5? <-> B.Bi5?;
 rel A.Bi6? <-> B.Bi6*;
 
 rel A.Bi9* <-> B.Bi9*;
+
+abstract Uninstantiable:A;

src/test/jastadd/serializer-pointer/Serializer.relast

@@ -21,3 +21,5 @@ rel A.Bi6? <-> B.Bi6*;
 rel A.Bi9* <-> B.Bi9*;
 
 rel Root.D <-> D.Root?;
+
+abstract Uninstantiable:A;

src/test/jastadd/serializer/Serializer.relast

@@ -32,3 +32,5 @@ rel A.Bi5? <-> B.Bi5?;
 rel A.Bi6? <-> B.Bi6*;
 
 rel A.Bi9* <-> B.Bi9*;
+
+abstract Uninstantiable:A;

src/test/java/org/jastadd/relast/tests/ConstructorsTest.java

@@ -39,6 +39,9 @@ public class ConstructorsTest {
     A a = new A();
     S s0 = new S();
     S s1 = new S(a, new List<>(), new Opt<>());
+
+    // S1:A S2:A* [S3:A]       S.r2*
+    // \------ S ------/  \- rel of S -/
     S s2 = new S(a, new List<>(), new Opt<>(), new ArrayList<>());
     Assertions.assertEquals(3, numberOfConstructors(S.class));
   }
@@ -48,10 +51,25 @@ public class ConstructorsTest {
     A a = new A();
     B b0 = new B();
     B b1 = new B(a, new List<>(), new Opt<>(), a, new List<>(), new Opt<>());
+
+    // S1:A S2:A* [S3:A]       S.r2*     B1:A B2:A* [B3:A]     B.r3?
+    // \------ S ------/  \- rel of S -/ \------ B ------/ \- rel of B -/
     B b2 = new B(a, new List<>(), new Opt<>(), new ArrayList<>(), a, new List<>(), new Opt<>(), null);
     Assertions.assertEquals(3, numberOfConstructors(B.class));
   }
 
+  @Test
+  public void testC() {
+    A a = new A();
+    C c0 = new C();
+    C c1 = new C(a, new List<>(), new Opt<>(), new Opt<>(), new List<>(), a);
+
+    // S1:A S2:A* [S3:A]       S.r2*         B.r3?      [B3:A] B2:A* B1:A
+    // \------ S ------/  \- rel of S -/ \- rel of B -/ \------ C ------/
+    C c2 = new C(a, new List<>(), new Opt<>(), new ArrayList<>(), null, new Opt<>(), new List<>(), a);
+    Assertions.assertEquals(3, numberOfConstructors(B.class));
+  }
+
   private int numberOfConstructors(Class<?> clazz) {
     return clazz.getConstructors().length;
   }

src/test/java/org/jastadd/relast/tests/Errors.java

 package org.jastadd.relast.tests;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.jastadd.relast.compiler.Compiler;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -20,7 +18,6 @@ import static org.jastadd.relast.tests.TestHelpers.readFile;
 
 class Errors {
 
-  private static final Logger logger = LogManager.getLogger(Errors.class);
   private static final String FILENAME_PATTERN = "$FILENAME";
 
   @Test
@@ -61,7 +58,7 @@ class Errors {
     String expectedFile = "./src/test/jastadd/errors/" + name + ".expected";
 
     try {
-      logger.debug("user.dir: {}", System.getProperty("user.dir"));
+      System.out.println("user.dir: " + System.getProperty("user.dir"));
       int returnValue = exec(Compiler.class, inFiles.toArray(new String[0]), new File(outFile));
       Assertions.assertEquals(1, returnValue, "Relast did not return with value 1");
     } catch (IOException | InterruptedException e) {
@@ -86,7 +83,7 @@ class Errors {
 
     Assertions.assertLinesMatch(expectedList, outList);
 
-    logger.info("relast for " + name + " returned \n{}", out);
+    System.out.println("relast for " + name + " returned \n" + out);
   }