i21017/JavaCompilerCore
1
0
Fork 0
forked from JavaTX/JavaCompilerCore
Code Pull Requests Activity

modified: src/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java

Browse Source 
FunN-Types werden nach RefTypes mit FunN$$ nach Unifikation zurueckkonvertiert.

	modified:   target/JavaTXcompiler-0.1-jar-with-dependencies.jar
	modified:   test/bytecode/javFiles/Faculty.jav
	modified:   test/bytecode/javFiles/Lambda.jav
	modified:   test/bytecode/javFiles/OL.jav
	modified:   test/javFiles/Lambda.jav
This commit is contained in:
Martin Plümicke 2018-06-21 09:51:05 +02:00
parent b5bc9fa01a
commit 1991bbbcd3
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
View File

@ -208,7 +208,7 @@ public class UnifyTypeFactory {
}
public static RefTypeOrTPHOrWildcardOrGeneric convert(FunNType t, Map<String,TypePlaceholder> tphs) {
RefType ret = new RefType(new JavaClassName(t.getName()), convert(t.getTypeParams(), tphs), new NullToken());
RefType ret = new RefType(new JavaClassName(t.getName()+"$$"), convert(t.getTypeParams(), tphs), new NullToken());
return ret;
}

BIN
target/JavaTXcompiler-0.1-jar-with-dependencies.jar
View File

Binary file not shown.

10
test/bytecode/javFiles/Faculty.jav
View File

@ -5,12 +5,12 @@ class Faculty {
m () {
var fact = (Integer x) -> {
if (x == 1) {
//if (x == 1) {
return x;
}
else {
return x * fact.apply(x-1);
}
//}
//else {
//return x * (fact.apply(x-1));
//}
};
return fact;
}

2
test/bytecode/javFiles/Lambda.jav
View File

@ -6,6 +6,6 @@ public class Lambda {
var lam1 = (Integer x) -> {
return x;
};
return lam1.apply(1);
return lam1;
}
}

2
test/bytecode/javFiles/OL.jav
View File

@ -12,7 +12,7 @@ class OL {
class OLMain {
java.lang.Integer main(x) {
main(x) {
var ol;
ol = new OL();
return ol.m(x);

2
test/javFiles/Lambda.jav
View File

@ -4,7 +4,7 @@ import java.lang.Number;
public class Lambda {
m () {
var lam1 = (x) -> {
var lam1 = (Integer x) -> {
return x;
};
return lam1.apply(1);