JavaTX/JavaCompilerCore
2
0
Fork 3
Code Issues 99 Pull Requests Actions Packages Projects Releases Wiki Activity
1,711 Commits 57 Branches 0 Tags 257 MiB
plugin
Commit Graph

1711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Plümicke
4490de575c Merge branch 'bytecode2' into unify-test 2019-01-11 15:16:29 +01:00
Michael Uhl
21c92d4cab Merge branch 'bytecode2' into plugin 2019-01-11 14:51:18 +01:00
Martin Plümicke
752b68d447 new file: ../../java/bytecode/Tph6Test.java 2019-01-11 14:50:19 +01:00
Michael Uhl
a373aa7313 Merge branch 'bytecode2' into plugin 2019-01-11 14:47:10 +01:00
Martin Plümicke
edd263ac15 bytecodeJavFiles in bytecode/javFiles geanedert 
Please enter the commit message for your changes. Lines starting
 2019-01-11 14:45:12 +01:00
Martin Plümicke
d0a261f55c modified: ../../../main/java/de/dhbwstuttgart/core/JavaTXCompiler.java 
modified:   ../../../main/java/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
	modified:   ../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
Set<UnifyType> fBounded = new HashSet<>(pair.getfBounded()); //PL 2019-01-09 new HashSet eingefuegt

	modified:   ../../../main/java/de/dhbwstuttgart/typeinference/unify/interfaces/IFiniteClosure.java
	modified:   ../../../main/java/de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java
	modified:   ../../../main/java/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java
	modified:   ../../../main/java/de/dhbwstuttgart/typeinference/unify/model/PlaceholderType.java
	modified:   ../../../main/java/de/dhbwstuttgart/typeinference/unify/model/UnifyPair.java
	modified:   ../../resources/bytecode/javFiles/Matrix.jav
 2019-01-09 00:40:24 +01:00
Michael Uhl
898aedcb4a Merge branch 'bytecode2' into plugin 2019-01-04 21:26:29 +01:00
Martin Plümicke
72a84323de modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/Match.java 
modified:   ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
im Fall 1 die Substitutionen der Typeplaceholders der Muster entfernt

	modified:   ../../../../main/java/de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java
	modified:   ../../../../main/java/de/dhbwstuttgart/typeinference/unify/model/PlaceholderType.java
	modified:   ../../../../main/java/de/dhbwstuttgart/typeinference/unify/model/UnifyType.java
	modified:   ../../../../main/java/de/dhbwstuttgart/typeinference/unify/model/WildcardType.java
	modified:   ../../bytecode/javFiles/MatrixOP.jav
	modified:   ../../bytecode/javFiles/Merge.jav
 2019-01-04 01:19:31 +01:00
Fayez Abu Alia
9e0a6151fd Bug in der Implemintierung von Simplify Algorithmus gefixt 2019-01-03 21:05:36 +01:00
Martin Plümicke
013539e7e8 modified: ../../../../main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java 
Throwable wieder in Exception zurückgewandelt

	modified:   ../../../../main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
Log-Files um Name des jeweiligen Jav-Files ergaenzt

	modified:   ../../javFiles/Faculty.jav
 2018-12-30 19:02:40 +01:00
Fayez Abu Alia
e07b189ba4 MatrixOP funktioniert (mit JUnit wird class file erzeugt) und dann mit TestBytecode.java getestet 2018-12-29 21:49:01 +01:00
Michael Uhl
f9c0ea8b52 Methode"writeLog" auskommentiert. 2018-12-29 19:45:08 +01:00
Martin Plümicke
531b484c53 modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java 
Pfad des log-Files angepasst
Error-Ausgabe in der log-File Exception eingefuegt.
 2018-12-29 10:20:19 +01:00
Martin Plümicke
cbe77d3722 modified: src/main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java 
In Zeile 833 catch Exception durch catch Throwable ersetzt, da der UnsupportedClassVersionError geworfen wurde

	modified:   src/test/java/bytecode/FacTest.java
	modified:   src/test/java/bytecode/FacultyTest.java
	modified:   src/test/java/bytecode/FieldTest.java
	modified:   src/test/java/bytecode/FieldTph.java
	modified:   src/test/java/bytecode/FieldTph2Test.java
	modified:   src/test/java/bytecode/FunOLTest.java
	modified:   src/test/java/bytecode/GenTest.java
	modified:   src/test/java/bytecode/GreaterEqualTest.java
	modified:   src/test/java/bytecode/GreaterThanTest.java
	modified:   src/test/java/bytecode/LambdaCapturetest.java
	modified:   src/test/java/bytecode/LambdaTest.java
	modified:   src/test/java/bytecode/LambdaVoidTest.java
	modified:   src/test/java/bytecode/LessEqualTest.java
	modified:   src/test/java/bytecode/LessThanTest.java
	modified:   src/test/java/bytecode/MatrixOpTest.java
	modified:   src/test/java/bytecode/MergeTest.java
	modified:   src/test/java/bytecode/OLTest.java
	modified:   src/test/java/bytecode/OpTest.java
	modified:   src/test/java/bytecode/OverloadingSortingTest.java
	modified:   src/test/java/bytecode/OverloadingTest.java
	modified:   src/test/java/bytecode/PlusTest.java
	modified:   src/test/java/bytecode/PostIncTest.java
	modified:   src/test/java/bytecode/PreIncTest.java
	modified:   src/test/java/bytecode/RelOpsTest.java
	modified:   src/test/java/bytecode/SortingTest.java
	modified:   src/test/java/bytecode/SubMatTest.java
	modified:   src/test/java/bytecode/Tph2Test.java
	modified:   src/test/java/bytecode/Tph3Test.java
	modified:   src/test/java/bytecode/Tph5Test.java
	modified:   src/test/java/bytecode/TphTest.java
	modified:   src/test/java/bytecode/WhileTest.java
	modified:   src/test/java/bytecode/YTest.java
Pfade angepasst
 2018-12-28 23:39:59 +01:00
Martin Plümicke
20abd181b6 modified: ../../pom.xml 
modified:   ../../src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
Abfrage, ob OderConstraints empty sind, bei der Unify-Abbruchbedingungen eingefuegt

	modified:   ../../src/test/java/bytecode/BinaryTest.java
	modified:   ../../src/test/java/bytecode/MatrixTest.java
	modified:   ../../src/test/java/bytecode/applyLambdaTest.java
Pfadanpassungen
 2018-12-28 19:37:45 +01:00
Michael Uhl
d9cda2779f Merge branch 'bytecode2' into plugin 
Conflicts:
	pom.xml
	src/main/java/de/dhbwstuttgart/bytecode/BytecodeGen.java
	src/main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
	src/main/java/de/dhbwstuttgart/bytecode/descriptor/DescriptorToString.java
	src/main/java/de/dhbwstuttgart/bytecode/signature/Signature.java
	src/main/java/de/dhbwstuttgart/bytecode/utilities/Simplify.java
	src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
	src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
	src/main/java/de/dhbwstuttgart/typeinference/unify/RuleSet.java
	src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify.java
	src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
	src/main/java/de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java
	src/main/java/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java
	src/main/java/de/dhbwstuttgart/typeinference/unify/model/PlaceholderType.java
	src/test/java/asp/ClingoTest.java
	src/test/java/asp/gencay/GeneratorTest.java
	src/test/java/bytecode/BinaryTest.java
	src/test/java/bytecode/FacTest.java
	src/test/java/bytecode/FacultyTest.java
	src/test/java/bytecode/FieldTest.java
	src/test/java/bytecode/FunOLTest.java
	src/test/java/bytecode/GenTest.java
	src/test/java/bytecode/GreaterEqualTest.java
	src/test/java/bytecode/GreaterThanTest.java
	src/test/java/bytecode/LambdaTest.java
	src/test/java/bytecode/LambdaVoidTest.java
	src/test/java/bytecode/LessEqualTest.java
	src/test/java/bytecode/LessThanTest.java
	src/test/java/bytecode/MatrixOpTest.java
	src/test/java/bytecode/MatrixTest.java
	src/test/java/bytecode/MergeTest.java
	src/test/java/bytecode/OLTest.java
	src/test/java/bytecode/OpTest.java
	src/test/java/bytecode/OverloadingSortingTest.java
	src/test/java/bytecode/OverloadingTest.java
	src/test/java/bytecode/PlusTest.java
	src/test/java/bytecode/PostIncTest.java
	src/test/java/bytecode/PreIncTest.java
	src/test/java/bytecode/RelOpsTest.java
	src/test/java/bytecode/SortingTest.java
	src/test/java/bytecode/SubMatTest.java
	src/test/java/bytecode/Tph2Test.java
	src/test/java/bytecode/Tph3Test.java
	src/test/java/bytecode/Tph5Test.java
	src/test/java/bytecode/TphTest.java
	src/test/java/bytecode/WhileTest.java
	src/test/java/bytecode/YTest.java
	src/test/java/bytecode/applyLambdaTest.java
	src/test/java/parser/GeneralParserTest.java
	src/test/java/typeinference/UnifyTest.java
 2018-12-25 16:23:44 +01:00
Michael Uhl
aa662b58fe ? 2018-12-25 16:09:47 +01:00
Michael Uhl
90c0cd431f Removed compiler plugin with target 9, 2018-12-25 16:02:31 +01:00
Michael Uhl
2908613499 [MINOR]: Formatted. 2018-12-25 15:58:33 +01:00
Michael Uhl
a867231348 Merge remote-tracking branch 'origin/bytecode2' into plugin 
# Conflicts:
#	pom.xml
#	src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
#	src/test/resources/testBytecode/generatedBC/.gitignore
#	test/bytecode/FacultyTest.java
#	test/bytecode/LambdaTest.java
#	test/bytecode/MatrixOpTest.java
#	test/bytecode/YTest.java
 2018-12-25 15:52:46 +01:00
Michael Uhl
757c6e0ec1 Skipping tests (for now). 2018-12-25 15:27:02 +01:00
Martin Plümicke
f8d3263d24 Pfadumstellung 2018-12-21 15:27:29 +01:00
Martin Plümicke
ffa30e50c3 Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unify-test 2018-12-21 12:19:38 +01:00
Fayez Abu Alia
5798c47d62 Tests funktionieren 2018-12-20 15:19:51 +01:00
Fayez Abu Alia
f21959fef8 Neue Umstellung 2018-12-20 12:26:37 +01:00
Fayez Abu Alia
85fcef8289 commit 2018-12-20 10:25:55 +01:00
Fayez Abu Alia
5a3145281e Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecode2 2018-12-19 14:21:27 +01:00
Fayez Abu Alia
5624af609c Simplify fuer TPH Method < TPH Field angepasst 2018-12-19 14:18:50 +01:00
Martin Plümicke
a4eaaa748e Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecode2 2018-12-19 14:09:48 +01:00
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
Fayez Abu Alia
b71efd65a0 Tphs einer Methode, die groesser als Tphs der Felder, werden als Class-Generics definiert 2018-12-19 13:20:09 +01:00
Fayez Abu Alia
e380c77ce6 Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecode2 2018-12-19 10:13:27 +01:00
Fayez Abu Alia
794412a402 Tph von Felder werden als Class-Generics definiert werden 2018-12-19 10:12:45 +01:00
Martin Plümicke
f256714223 modified: ../../src/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java 
Returntype der Binary korrigiert.
 2018-12-18 16:18:36 +01:00
Martin Plümicke
1931c61392 modified: src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java 
Loesung Fehler rausgemacht
 2018-12-14 17:46:09 +01:00
Martin Plümicke
c1a4617085 modified: ../../src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java 
Loeschen von Ueberzaehlugen Elementen eingefuegt.
 2018-12-14 16:51:02 +01:00
Martin Plümicke
a733f373a7 modified: ../../../../src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java 2018-12-14 12:09:12 +01:00
Martin Plümicke
9dbfbe9e6a modified: ../src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java 
modified:   ../src/de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java
 2018-12-14 09:31:58 +01:00
Martin Plümicke
6b33fdc5fb Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecode2 2018-12-12 16:50:38 +01:00
Martin Plümicke
2f9d44d0b0 modified: ../../src/de/dhbwstuttgart/core/JavaTXCompiler.java 
modified:   ../../src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
	modified:   ../../src/de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java
im Max den Fall a <.? ? extends a beruecksichtigt
	modified:   ../../src/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java
	modified:   ../../src/de/dhbwstuttgart/typeinference/unify/model/PlaceholderType.java
; in der Schleife generate fresh Type Var entfernt
 2018-12-12 16:49:16 +01:00
Fayez Abu Alia
3bf45888e5 Simplify gefixt 2018-12-12 13:03:53 +01:00
Fayez Abu Alia
dab0dc180c Aenderung in Signature-Wildcars rueckgaengig gemacht 2018-12-06 11:08:03 +01:00
Martin Plümicke
2d73b4e47f modified: ../../src/de/dhbwstuttgart/core/JavaTXCompiler.java 
Argumente von Konstruktore auch mit Varaincen und not wildcardable versehen
 2018-12-06 10:43:46 +01:00
Michael Uhl
65e0a22477 Fixed 2018-12-05 22:34:33 +01:00
Michael Uhl
f79e4c6df0 Maven-Refactoring 
- [MINOR]: Rearranged.
 2018-12-05 22:34:24 +01:00
Michael Uhl
67e35ed8d9 Maven-Refactoring 
- localhost:8080/site with jetty.
 2018-12-05 12:52:45 +01:00
Michael Uhl
07c35fef10 Maven-Refactoring 
- Separated code and generated codeö.
 2018-12-05 11:23:35 +01:00
Michael Uhl
66b6bb7c5d Revert "Corrected format of pom.xml" 
This reverts commit 978f222dfa.
 2018-12-04 18:29:32 +01:00
Michael Uhl
978f222dfa Corrected format of pom.xml 
- Removed obsolete configuration of "Java compiler Plug-In"
 2018-12-04 18:21:21 +01:00
Michael Uhl
8e6b9a9ece Maven-Refactoring 
- Folder: "/src/main/java"
- Folder: "/src/test/java"
 2018-12-04 18:14:03 +01:00