diff --git a/pom.xml b/pom.xml
index 9cce2d99..ea7be6b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,14 @@
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+ 9
+
+
diff --git a/src/de/dhbwstuttgart/environment/CompilationEnvironment.java b/src/de/dhbwstuttgart/environment/CompilationEnvironment.java
index 7044da6b..5f294130 100644
--- a/src/de/dhbwstuttgart/environment/CompilationEnvironment.java
+++ b/src/de/dhbwstuttgart/environment/CompilationEnvironment.java
@@ -40,15 +40,18 @@ public class CompilationEnvironment {
* @param sourceFiles die zu kompilierenden Dateien
*/
public CompilationEnvironment(List sourceFiles) {
- String bootClassPath = System.getProperty("sun.boot.class.path");
- librarys = new ArrayList<>();
- for(String path : bootClassPath.split(File.pathSeparator)) {
- try {
- librarys.add(new URL("file:"+path));
- } catch (MalformedURLException e) {
- new DebugException("Fehler im Classpath auf diesem System");
- }
- }
+ /**
+ * Java 9 bringt einige Änderungen am Classloader
+ * So funktioniert der BootClassLoader nicht mehr.
+ * hier gibts ein paar Quellen zum nachlesen:
+ * http://java9.wtf/class-loading/
+ * https://stackoverflow.com/questions/46494112/classloaders-hierarchy-in-java-9
+ *
+ */
+ //String bootClassPath = System.getProperty("sun.boot.class.path");
+ ClassLoader cl = ClassLoader.getPlatformClassLoader();
+ URLClassLoader loader = new URLClassLoader(new URL[0], cl);
+ librarys = Arrays.asList(loader.getURLs());
this.sourceFiles = sourceFiles;
this.packageCrawler = new PackageCrawler(librarys);
}
diff --git a/src/de/dhbwstuttgart/parser/JavaTXParser.java b/src/de/dhbwstuttgart/parser/JavaTXParser.java
index c860a6a7..aad0a575 100644
--- a/src/de/dhbwstuttgart/parser/JavaTXParser.java
+++ b/src/de/dhbwstuttgart/parser/JavaTXParser.java
@@ -29,7 +29,7 @@ public class JavaTXParser {
*/
}
- /* Für das Typsystem ist es notwendig, dass sich der Source in einer Datei befindet:
+ /* Für das Typsystem ist es notwendig, dass sich der Source in einer Datei befindet:
public SourceFile parse(String fileContent) throws IOException, java.lang.ClassNotFoundException {
return this.parse(new ByteArrayInputStream(fileContent.getBytes(StandardCharsets.UTF_8)));
}
diff --git a/src/de/dhbwstuttgart/sat/asp/model/ASPRule.java b/src/de/dhbwstuttgart/sat/asp/model/ASPRule.java
index 41237547..8d4d73f9 100644
--- a/src/de/dhbwstuttgart/sat/asp/model/ASPRule.java
+++ b/src/de/dhbwstuttgart/sat/asp/model/ASPRule.java
@@ -8,7 +8,8 @@ public enum ASPRule {
ASP_PARAMLIST_NAME("param"),
ASP_PARAMLISTNUMERATION_NAME("paramNum"),
ASP_PARAMLIST_END_POINTER("null"),
- ASP_TYPE("type")
+ ASP_TYPE("type"),
+ ASP_FCTYPE("type")
;
private final String text;
diff --git a/src/de/dhbwstuttgart/sat/asp/writer/ASPGenerator.java b/src/de/dhbwstuttgart/sat/asp/writer/ASPGenerator.java
index 002e3c7f..66c206e1 100644
--- a/src/de/dhbwstuttgart/sat/asp/writer/ASPGenerator.java
+++ b/src/de/dhbwstuttgart/sat/asp/writer/ASPGenerator.java
@@ -36,8 +36,8 @@ public class ASPGenerator {
private String toASP(List constraintSet, Collection fcClasses){
TypeConverter converter = new TypeConverter();
for(ClassOrInterface cl : fcClasses){
- ASPType superClass = cl.getSuperClass().acceptTV(converter);
- ASPPairSmaller fcEntry = new ASPPairSmaller(convert(cl), superClass);
+ ASPRefType superClass = (ASPRefType) cl.getSuperClass().acceptTV(converter);
+ ASPPairSmaller fcEntry = new ASPPairSmaller(new ASPFCType(convert(cl)), new ASPFCType(superClass));
writer.add(new ASPStatement(fcEntry.toASP()));
}
for(Pair cons : constraintSet){
@@ -58,7 +58,7 @@ public class ASPGenerator {
}else throw new NotImplementedException();
}
- private ASPType convert(ClassOrInterface cl){
+ private ASPRefType convert(ClassOrInterface cl){
List paramList = new ArrayList<>();
for(GenericTypeVar gtv : cl.getGenerics()){
paramList.add(new ASPGenericType(toConstant(gtv.getName())));
diff --git a/src/de/dhbwstuttgart/sat/asp/writer/model/ASPFCType.java b/src/de/dhbwstuttgart/sat/asp/writer/model/ASPFCType.java
new file mode 100644
index 00000000..777a34a7
--- /dev/null
+++ b/src/de/dhbwstuttgart/sat/asp/writer/model/ASPFCType.java
@@ -0,0 +1,17 @@
+package de.dhbwstuttgart.sat.asp.writer.model;
+
+import de.dhbwstuttgart.sat.asp.model.ASPRule;
+
+public class ASPFCType extends ASPRefType {
+ public ASPFCType(String name, ASPParameterList params){
+ super(name, params);
+ }
+
+ public ASPFCType(ASPRefType refType){
+ super(refType.name, refType.params);
+ }
+
+ public String toString(){
+ return ASPRule.ASP_FCTYPE + "(" + name +"," + params.name + ")";
+ }
+}
diff --git a/src/de/dhbwstuttgart/sat/asp/writer/model/ASPPairSmaller.java b/src/de/dhbwstuttgart/sat/asp/writer/model/ASPPairSmaller.java
index f57170f6..928acb49 100644
--- a/src/de/dhbwstuttgart/sat/asp/writer/model/ASPPairSmaller.java
+++ b/src/de/dhbwstuttgart/sat/asp/writer/model/ASPPairSmaller.java
@@ -5,7 +5,7 @@ import de.dhbwstuttgart.sat.asp.model.ASPRule;
import java.util.Map;
public class ASPPairSmaller extends ASPPair{
- public ASPPairSmaller(ASPType ls, ASPType rs){
+ public ASPPairSmaller(ASPFCType ls, ASPFCType rs){
super(ls, rs);
}
diff --git a/src/de/dhbwstuttgart/sat/asp/writer/model/ASPRefType.java b/src/de/dhbwstuttgart/sat/asp/writer/model/ASPRefType.java
index 6491ff33..bfbf27a0 100644
--- a/src/de/dhbwstuttgart/sat/asp/writer/model/ASPRefType.java
+++ b/src/de/dhbwstuttgart/sat/asp/writer/model/ASPRefType.java
@@ -3,8 +3,8 @@ package de.dhbwstuttgart.sat.asp.writer.model;
import de.dhbwstuttgart.sat.asp.model.ASPRule;
public class ASPRefType implements ASPType {
- private final ASPParameterList params;
- private final String name;
+ protected final ASPParameterList params;
+ protected final String name;
public ASPRefType(String name, ASPParameterList params){
this.name = name;
diff --git a/src/de/dhbwstuttgart/typeinference/assumptions/FunNClass.java b/src/de/dhbwstuttgart/typeinference/assumptions/FunNClass.java
index 0eba225d..a04ce9bb 100644
--- a/src/de/dhbwstuttgart/typeinference/assumptions/FunNClass.java
+++ b/src/de/dhbwstuttgart/typeinference/assumptions/FunNClass.java
@@ -1,6 +1,5 @@
package de.dhbwstuttgart.typeinference.assumptions;
-import com.sun.org.apache.regexp.internal.RE;
import de.dhbwstuttgart.parser.NullToken;
import de.dhbwstuttgart.parser.SyntaxTreeGenerator.GenericContext;
import de.dhbwstuttgart.parser.scope.GenericTypeName;