JavaTX/JavaCompilerCore
2
0
Fork 3
Code Issues 99 Pull Requests Actions Packages Projects Releases Wiki Activity

modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java

Browse Source
This commit is contained in:
AluAli 2021-01-29 18:22:04 +01:00
parent 0bc0e4c722
commit cd135c3962
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
View File

@ -124,6 +124,7 @@ public class GeneratedGenericsFinder implements ASTVisitor {
ConstraintsSimplierResult simplifiedConstraints = null; ConstraintsSimplierResult simplifiedConstraints = null;
GenericsGeneratorResultForClass ggResult = null; GenericsGeneratorResultForClass ggResult = null;
GenericsGeneratorResultForClass ggResultAlternative = null;
for (int i = 0; i < listOfResultSetsList.size(); i++) { for (int i = 0; i < listOfResultSetsList.size(); i++) {
resultSet = listOfResultSetsList.get(i); resultSet = listOfResultSetsList.get(i);
@ -139,7 +140,7 @@ public class GeneratedGenericsFinder implements ASTVisitor {
System.out.println("fogg.classConstraints: "+ fogg.classConstraints); System.out.println("fogg.classConstraints: "+ fogg.classConstraints);
System.out.println("fogg.methodConstraintsWithPosition: "+ fogg.methodConstraintsWithPosition); System.out.println("fogg.methodConstraintsWithPosition: "+ fogg.methodConstraintsWithPosition);
/* /**/
tphsClass = tphExtractor.tphsClass; tphsClass = tphExtractor.tphsClass;
//PL 2020-01-15 //PL 2020-01-15
//Es muss ggResult aus fogg gebildet werden //Es muss ggResult aus fogg gebildet werden
@ -153,11 +154,11 @@ public class GeneratedGenericsFinder implements ASTVisitor {
addMethodConstraints(simplifiedConstraints, ggResult, m); addMethodConstraints(simplifiedConstraints, ggResult, m);
} }
/**/
if(ggResult != null) if(ggResult != null)
generatedGenericsForSF.addGenericGeneratorResultClass(ggResult); generatedGenericsForSF.addGenericGeneratorResultClass(ggResult);
*/
List<GenericsGeneratorResult> listOfClassCons = new ArrayList<>(); List<GenericsGeneratorResult> listOfClassCons = new ArrayList<>();
for(TPHConstraint clCons: fogg.classConstraints) { for(TPHConstraint clCons: fogg.classConstraints) {
@ -177,11 +178,13 @@ public class GeneratedGenericsFinder implements ASTVisitor {
listOfMethAndCons.add(mac); listOfMethAndCons.add(mac);
ggRfaM = new GenericGeneratorResultsForAllMethods(listOfMethAndCons); ggRfaM = new GenericGeneratorResultsForAllMethods(listOfMethAndCons);
} }
ggResult = new GenericsGeneratorResultForClass(className, listOfClassCons, ggRfaM); ggResultAlternative = new GenericsGeneratorResultForClass(className, listOfClassCons, ggRfaM);
if(ggResult != null) { if(ggResultAlternative != null) {
generatedGenericsForSF.addGenericGeneratorResultClass(ggResult); generatedGenericsForSF.addGenericGeneratorResultClass(ggResultAlternative);
System.out.println(generatedGenericsForSF);
} }
System.out.println(ggResultAlternative);
} }