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

Debugausgaben eingeschränkt

Browse Source
This commit is contained in:
JanUlrich 2014-11-04 17:01:35 +01:00
parent c1947e0810
commit d41d3293aa
7 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/de/dhbwstuttgart/syntaxtree/SourceFile.java
View File

@ -698,7 +698,7 @@ public class SourceFile
retValue = Unify.unify(pairs, finiteClosure); retValue = Unify.unify(pairs, finiteClosure);
return retValue;}; return retValue;};
oderConstraints.filterWrongConstraints(unifier); oderConstraints.filterWrongConstraints(unifier);
oderConstraints.unifyUndConstraints(unifier); //oderConstraints.unifyUndConstraints(unifier);
typinferenzLog.debug("Übriggebliebene Konstraints:\n"+oderConstraints+"\n", Section.TYPEINFERENCE); typinferenzLog.debug("Übriggebliebene Konstraints:\n"+oderConstraints+"\n", Section.TYPEINFERENCE);
//Die Constraints in Pair's umwandeln (Karthesisches Produkt bilden): //Die Constraints in Pair's umwandeln (Karthesisches Produkt bilden):
Vector<Vector<Pair>> xConstraints = new Vector<Vector<Pair>>();// = oderConstraints.getConstraints(); Vector<Vector<Pair>> xConstraints = new Vector<Vector<Pair>>();// = oderConstraints.getConstraints();
@ -865,7 +865,7 @@ public class SourceFile
// Debugoutput:Vector<Vector<Pair>> // Debugoutput:Vector<Vector<Pair>>
typinferenzLog.debug("Unifiziertes Ergebnis: "+result, Section.TYPEINFERENCE); //typinferenzLog.debug("Unifiziertes Ergebnis: "+result, Section.TYPEINFERENCE);
/* /*
// Prüfe ob eindeutige Lösung: // Prüfe ob eindeutige Lösung:

2
src/de/dhbwstuttgart/syntaxtree/type/RefType.java
View File

@ -8,8 +8,6 @@ import java.util.Hashtable;
import java.util.Iterator; import java.util.Iterator;
import java.util.Vector; import java.util.Vector;
import org.antlr.v4.runtime.misc.NotNull;
import de.dhbwstuttgart.logger.Logger; import de.dhbwstuttgart.logger.Logger;
import de.dhbwstuttgart.bytecode.JVMCode; import de.dhbwstuttgart.bytecode.JVMCode;
import de.dhbwstuttgart.core.IItemWithOffset; import de.dhbwstuttgart.core.IItemWithOffset;

2
src/de/dhbwstuttgart/typeinference/assumptions/TypeAssumptions.java
View File

@ -3,8 +3,6 @@ package de.dhbwstuttgart.typeinference.assumptions;
import java.util.Iterator; import java.util.Iterator;
import java.util.Vector; import java.util.Vector;
import org.antlr.v4.tool.ast.SetAST;
import de.dhbwstuttgart.core.IItemWithOffset; import de.dhbwstuttgart.core.IItemWithOffset;
import de.dhbwstuttgart.logger.Logger; import de.dhbwstuttgart.logger.Logger;
import de.dhbwstuttgart.logger.Section; import de.dhbwstuttgart.logger.Section;

5
src/de/dhbwstuttgart/typeinference/typedeployment/TypeInsertSet.java
View File

@ -145,6 +145,11 @@ public class TypeInsertSet {
} }
} }
@Override
public String toString(){
return this.points.toString();
}
} }
/** /**

8
test/plugindevelopment/TypeInsertTests/Matrix.java
View File

@ -4,13 +4,17 @@ import java.util.Vector;
import org.junit.Test; import org.junit.Test;
import de.dhbwstuttgart.logger.Logger;
import de.dhbwstuttgart.logger.LoggerConfiguration;
import de.dhbwstuttgart.logger.Section;
public class Matrix { public class Matrix {
private static final String TEST_FILE = "Matrix.jav"; private static final String TEST_FILE = "Matrix.jav";
@Test @Test
public void run(){ public void run(){
Vector<String> mustContain = new Vector<String>(); Vector<String> mustContain = new Vector<String>();
//mustContain.add("TestIfStmt var"); mustContain.add("TestIfStmt var");
//MultipleTypesInsertTester.testSingleInsert(this.TEST_FILE, mustContain); MultipleTypesInsertTester.testSingleInsert(this.TEST_FILE, mustContain);
} }
} }

2
test/plugindevelopment/TypeInsertTests/TypedMatrixSimpleTest.jav
View File

@ -5,7 +5,7 @@ class Matrix extends Vector<Vector<Integer>> {
Matrix mul(Matrix m){ Matrix mul(Matrix m){
Matrix ret; Matrix ret;
ret = new Matrix(); ret = new Matrix();
Integer i; i;
i = 0; i = 0;
while(i < this.size()) { while(i < this.size()) {
Vector<Integer> v1; Vector<Integer> v1;

2
test/plugindevelopment/TypeInsertTests/TypedMatrixSimpleTest.java
View File

@ -10,7 +10,7 @@ public class TypedMatrixSimpleTest {
@Test @Test
public void run(){ public void run(){
Vector<String> mustContain = new Vector<String>(); Vector<String> mustContain = new Vector<String>();
mustContain.add("Integer erg;"); mustContain.add("Integer i;");
MultipleTypesInsertTester.testSingleInsert(this.TEST_FILE, mustContain); MultipleTypesInsertTester.testSingleInsert(this.TEST_FILE, mustContain);
} }
} }