JavaTX Compiler in JavaTX

Martin Plümicke 83b9f7edb8 Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecode2 ... Conflicts: src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java It looks like you may be committing a merge. If this is not correct, please remove the file .git/MERGE_HEAD and try again. Please enter the commit message for your changes. Lines starting with '#' will be ignored, and an empty message aborts the commit. Committer: Martin Plümicke <pl@macmini_pl.verw.ba-horb.de> On branch bytecode2 Your branch and 'origin/bytecode2' have diverged, and have 1 and 2 different commits each, respectively. (use "git pull" to merge the remote branch into yours) All conflicts fixed but you are still merging. Changes to be committed: modified: src/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java modified: src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java		2018-12-19 14:08:42 +01:00
doc	Beginnen mit Parser Dokumentation	2018-09-19 14:37:40 +02:00
src	modified: ../../src/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java	2018-12-18 16:18:36 +01:00
test	Simplify gefixt	2018-12-12 13:03:53 +01:00
testBytecode	generatedBC-Directory anfügen	2017-12-13 13:32:00 +01:00
Website	deleted: Installation/install.html	2018-06-01 17:13:05 +02:00
.gitignore	Ordner manually/ in .gitignore hinzugefügt	2018-02-25 13:20:19 +01:00
pom.xml	TPHExtractor verbessert, Transivitat-Algortmus ergaenzt und JUnit Tests dazu geschrieben. FacultyTest funktioniert	2018-11-15 20:52:27 +01:00