AluAli
42bb787195
Merge branch 'bytecodeGenericsSecond' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecodeGenericsSecond
2021-01-29 18:22:39 +01:00
AluAli
cd135c3962
modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
2021-01-29 18:22:04 +01:00
pl@gohorb.ba-horb.de
59adfd6c59
Merge branch 'bytecodeGenericsSecond' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecodeGenericsSecond
2021-01-29 18:13:09 +01:00
pl@gohorb.ba-horb.de
604300a07e
modified: src/main/java/de/dhbwstuttgart/syntaxtree/AbstractASTWalker.java
...
new file: src/test/java/insertGenerics/TestTwoArgs.java
new file: src/test/java/insertGenerics/TestTwoArgs2.java
new file: src/test/resources/insertGenericsJav/TestTwoArgs.jav
new file: src/test/resources/insertGenericsJav/TestTwoArgs2.jav
2021-01-29 18:12:44 +01:00
AluAli
0bc0e4c722
modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
...
deleted: src/test/java/insertGenerics/MethodsTest.java
deleted: src/test/java/insertGenerics/TryTest.java
2021-01-29 18:03:43 +01:00
pl@gohorb.ba-horb.de
ebfc3dedbe
Merge branch 'bytecodeGenericsSecond' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecodeGenericsSecond
2021-01-29 12:29:24 +01:00
pl@gohorb.ba-horb.de
e07e5e9b42
modified: src/main/java/de/dhbwstuttgart/syntaxtree/AbstractASTWalker.java
2021-01-29 12:29:08 +01:00
AluAli
8fb7a23279
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
...
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
modified: src/test/java/insertGenerics/TestExample42.java
modified: src/test/java/insertGenerics/TestExample42_allInOneMethod.java
2021-01-29 12:24:16 +01:00
pl@gohorb.ba-horb.de
8706882388
modified: src/main/java/de/dhbwstuttgart/bytecode/TPHExtractor.java
...
new file: src/test/java/insertGenerics/TestGGFinder.java
2021-01-29 10:55:04 +01:00
pl@gohorb.ba-horb.de
918d0db799
modified: src/main/java/de/dhbwstuttgart/bytecode/TPHExtractor.java
2021-01-29 09:25:10 +01:00
pl@gohorb.ba-horb.de
4b99b38b47
Merge branch 'bigRefactoringUnifyComment' into bytecodeGenericsSecond
2021-01-28 16:18:42 +01:00
pl@gohorb.ba-horb.de
1236ca2953
modified: src/main/java/de/dhbwstuttgart/syntaxtree/AbstractASTWalker.java
...
modified: src/test/resources/insertGenericsJav/TestGGFinder.jav
2021-01-28 16:12:17 +01:00
AluAli
1348a7a4b6
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
2021-01-23 00:07:05 +01:00
AluAli
3f4aa7bbd5
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
...
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
modified: src/test/java/insertGenerics/TestExample42.java
modified: src/test/java/insertGenerics/TestExample42_allInOneMethod.java
2021-01-22 23:49:25 +01:00
AluAli
bb900af6bf
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
2021-01-22 15:52:14 +01:00
AluAli
cfacc6235c
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
2021-01-22 15:13:03 +01:00
AluAli
1a135ebe5c
modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
...
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
2021-01-22 15:07:03 +01:00
AluAli
c15953bbac
modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
2021-01-18 19:15:36 +01:00
AluAli
404bbbf746
Merge branch 'bytecodeGenericsSecond' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecodeGenericsSecond
2021-01-18 19:11:33 +01:00
AluAli
a8f04a25cd
modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
2021-01-18 19:10:04 +01:00
pl@gohorb.ba-horb.de
1242252cde
modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
2021-01-18 13:46:06 +01:00
pl@gohorb.ba-horb.de
5e9e774d1e
Merge branch 'bytecodeGenericsSecond' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecodeGenericsSecond
2021-01-18 13:41:44 +01:00
pl@gohorb.ba-horb.de
bd6d74c74d
modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
2021-01-18 13:40:20 +01:00
AluAli
3d8275c676
modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
2021-01-16 16:34:31 +01:00
pl@gohorb.ba-horb.de
3ef15d814d
Merge branch 'bytecodeGenericsSecond' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecodeGenericsSecond
2021-01-16 09:16:25 +01:00
pl@gohorb.ba-horb.de
842b85cfd7
modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
2021-01-16 09:12:34 +01:00
AluAli
fc8f11ebb1
modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
...
new file: src/test/java/insertGenerics/TestAny.java
new file: src/test/java/insertGenerics/TestTPHsAndGenerics2.java
new file: src/test/resources/insertGenericsJav/TestAny.jav
modified: src/test/resources/insertGenericsJav/TestReturnVar.jav
modified: src/test/resources/insertGenericsJav/TestSecondLineOfClassConstraints.jav
new file: src/test/resources/insertGenericsJav/TestTPHsAndGenerics2.jav
2021-01-16 00:35:12 +01:00
AluAli
eb97dd810f
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
...
new file: src/test/java/insertGenerics/TestClassField.java
new file: src/test/java/insertGenerics/TestReturnVar.java
new file: src/test/java/insertGenerics/TestSecondLineOfClassConstraints.java
new file: src/test/java/insertGenerics/TestTPHsAndGenerics.java
new file: src/test/java/insertGenerics/TestVoidMeth.java
new file: src/test/resources/insertGenericsJav/TestClassField.jav
new file: src/test/resources/insertGenericsJav/TestReturnVar.jav
new file: src/test/resources/insertGenericsJav/TestSecondLineOfClassConstraints.jav
new file: src/test/resources/insertGenericsJav/TestTPHsAndGenerics.jav
new file: src/test/resources/insertGenericsJav/TestVoidMeth.jav
2021-01-15 13:18:09 +01:00
AluAli
ab850edae8
modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
2021-01-15 01:12:13 +01:00
pl@gohorb.ba-horb.de
95f48ffcb7
modified: ../src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
ckeckA druch checkNoContradiction ersetzt
2021-01-14 15:29:06 +01:00
pl@gohorb.ba-horb.de
163f0f3047
modified: ../src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
vor Loeschung von checkA
2021-01-14 14:59:20 +01:00
pl@gohorb.ba-horb.de
1cf22d2602
modified: ../src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
remaingSet entfernt
fstElems in oneElems umbenannt
2021-01-14 11:27:19 +01:00
pl@gohorb.ba-horb.de
d8ac25234f
modified: ../src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
vor entfernung von Remaining
2021-01-14 10:38:32 +01:00
pl@gohorb.ba-horb.de
e00d76ce3b
Occurs-Check mit Abbruch eingebaut
...
finalResult zum Attribut der Klasse gemacht
2021-01-13 19:39:01 +01:00
pl@gohorb.ba-horb.de
fec83c3a62
modified: src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
...
Fuer den Receiver wieder = eingefuegt.
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
Kommentierung begonnen
2021-01-12 21:27:44 +01:00
AluAli
3f5f51df5b
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
2021-01-08 22:05:09 +01:00
AluAli
dce7ac8262
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
...
new file: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/PairMethodAndConstraint.java
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
2021-01-08 21:43:06 +01:00
AluAli
2f37bb7313
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
...
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
2020-12-29 01:03:55 +01:00
AluAli
a04316f629
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
...
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
modified: src/test/java/insertGenerics/TestExample42.java
modified: src/test/java/insertGenerics/TestExample42_allInOneMethod.java
2020-12-29 00:22:36 +01:00
AluAli
3b062de612
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
...
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
modified: src/test/java/insertGenerics/TestExample42.java
modified: src/test/java/insertGenerics/TestExample42_allInOneMethod.java
2020-12-28 15:37:45 +01:00
AluAli
c32ef1e31f
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
...
modified: src/test/java/insertGenerics/TestExample42.java
new file: src/test/java/insertGenerics/TestExample42_allInOneMethod.java
2020-12-28 00:29:08 +01:00
AluAli
5ed6a4617a
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
2020-12-22 16:11:24 +01:00
AluAli
7139a1709e
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
...
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
2020-12-22 16:08:01 +01:00
AluAli
e9bcea4b9e
modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
...
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
2020-12-21 14:06:47 +01:00
AluAli
d671e74fcf
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
2020-12-04 16:44:46 +01:00
AluAli
c2f0368d2e
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
2020-12-04 14:59:09 +01:00
AluAli
d06c6abb5a
modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
...
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/PositionFinder.java
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
modified: src/test/java/insertGenerics/TestExample42.java
2020-12-04 14:25:37 +01:00
AluAli
f7101da621
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
...
new file: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/PairTphMethod.java
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/PositionFinder.java
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
2020-12-04 13:17:31 +01:00
AluAli
c0c24eed3b
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
...
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
2020-12-04 11:00:12 +01:00
AluAli
af36b43786
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
2020-11-30 12:32:35 +01:00
AluAli
997d3b9bea
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
...
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
2020-11-27 15:52:31 +01:00
AluAli
ed7cc55139
modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
...
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
2020-11-27 15:29:07 +01:00
AluAli
29a7f2e7fb
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
...
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
2020-11-27 14:10:31 +01:00
AluAli
4ac67120a4
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
...
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
2020-11-13 17:24:41 +01:00
AluAli
f0db6cb901
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
2020-11-13 16:22:23 +01:00
AluAli
2e5581ab6e
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
...
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
2020-11-13 15:29:01 +01:00
AluAli
e8ac8e3c5a
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
2020-11-13 13:50:36 +01:00
AluAli
a4bc49f5c4
modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
...
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
2020-11-13 00:43:49 +01:00
AluAli
9cf7cec37b
modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
...
renamed: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/ClassConstraint.java -> src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/ClassConstraint.java
renamed: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/FamilyOfGeneratedGenerics.java -> src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
renamed: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/GGenerics.java -> src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/GGenerics.java
renamed: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/MethodConstraint.java -> src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/MethodConstraint.java
renamed: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/PositionFinder.java -> src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/PositionFinder.java
renamed: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/preGGenerics.java -> src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/preGGenerics.java
modified: src/test/java/constraintSimplify/FamilyOfGenerics.java
modified: src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
modified: src/test/java/insertGenerics/TestExample42.java
modified: src/test/java/insertGenerics/TestTransitiveClosure.java
2020-11-06 18:13:21 +01:00
JanUlrich
531b1ccd22
Merge branch 'bytecodeGenerics' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecodeGenerics
2020-11-06 16:34:42 +01:00
JanUlrich
7ced6338cb
Add Test case for FamilyOfGenerics
2020-11-06 16:34:32 +01:00
AluAli
0550f73ef7
modified: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/FamilyOfGeneratedGenerics.java
2020-11-06 16:33:05 +01:00
JanUlrich
b91aadf24a
Merge branch 'bytecodeGenerics' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecodeGenerics
2020-11-06 15:26:25 +01:00
AluAli
70b6c35731
modified: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/FamilyOfGeneratedGenerics.java
...
modified: src/test/java/insertGenerics/TestExample42.java
new file: src/test/java/insertGenerics/TestTransitiveClosure.java
2020-11-06 15:22:36 +01:00
AluAli
e617a0911a
modified: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/ClassConstraint.java
...
modified: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/FamilyOfGeneratedGenerics.java
2020-11-06 11:51:04 +01:00
AluAli
7cf46b02b7
modified: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/FamilyOfGeneratedGenerics.java
2020-11-06 11:24:21 +01:00
JanUlrich
8cf57ba35b
Merge branch 'bytecodeGenerics' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecodeGenerics
2020-11-06 10:45:50 +01:00
AluAli
486d7d9011
modified: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/FamilyOfGeneratedGenerics.java
2020-11-06 00:58:04 +01:00
AluAli
8402d18f83
modified: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/FamilyOfGeneratedGenerics.java
...
new file: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/PositionFinder.java
modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
modified: src/test/java/constraintSimplify/FamilyOfGenerics.java
new file: src/test/java/insertGenerics/TestExample42.java
2020-11-01 14:09:27 +01:00
JanUlrich
8d25920a87
Add Hashcode methods
2020-10-30 15:44:46 +01:00
AluAli
ab9e9e16bd
Merge branch 'bytecodeGenerics' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecodeGenerics
2020-10-30 10:52:39 +01:00
JanUlrich
b45964ed5f
Template für FamilyOfGenerics Test
2020-10-30 10:52:03 +01:00
AluAli
0ecd3916f8
modified: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/ClassConstraint.java
...
modified: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/FamilyOfGeneratedGenerics.java
2020-10-30 09:41:09 +01:00
AluAli
c86fe95da5
modified: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/FamilyOfGeneratedGenerics.java
2020-10-29 19:43:50 +01:00
AluAli
d677d053d6
modified: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/FamilyOfGeneratedGenerics.java
...
modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
2020-10-29 19:40:46 +01:00
AluAli
5060cca6db
modified: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/ClassConstraint.java
...
modified: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/FamilyOfGeneratedGenerics.java
modified: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/MethodConstraint.java
modified: src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
new file: src/test/java/insertGenerics/MethodsTest.java
new file: src/test/java/insertGenerics/TryTest.java
new file: src/test/resources/insertGenericsJav/TestGGFinder.jav
2020-10-23 10:42:24 +02:00
AluAli
7900449897
modified: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/FamilyOfGeneratedGenerics.java
2020-10-23 00:11:54 +02:00
AluAli
f6154b8f2c
deleted: src/de/dhbwstuttgart/bytecode/gGenericsAli/FamilyOfGeneratedGenerics.java
...
new file: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/ClassConstraint.java
new file: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/FamilyOfGeneratedGenerics.java
renamed: src/de/dhbwstuttgart/bytecode/gGenericsAli/GGenerics.java -> src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/GGenerics.java
new file: src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/MethodConstraint.java
renamed: src/de/dhbwstuttgart/bytecode/gGenericsAli/preGGenerics.java -> src/main/java/de/dhbwstuttgart/bytecode/gGenericsAli/preGGenerics.java
2020-10-22 22:13:05 +02:00
pl@gohorb.ba-horb.de
1d7c894f39
modified: ../../../../main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
2020-10-16 15:55:22 +02:00
AluAli
61f35f8f8b
Merge branch 'bigRefactoring' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecodeGenerics
2020-10-16 15:37:53 +02:00
AluAli
1e7c25805e
new file: src/de/dhbwstuttgart/bytecode/gGenericsAli/FamilyOfGeneratedGenerics.java
...
new file: src/de/dhbwstuttgart/bytecode/gGenericsAli/GGenerics.java
new file: src/de/dhbwstuttgart/bytecode/gGenericsAli/preGGenerics.java
2020-10-16 15:13:50 +02:00
pl@gohorb.ba-horb.de
5a00b70ea8
modified: ../../../../main/java/de/dhbwstuttgart/bytecode/TPHExtractor.java
...
modified: ../../../../main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
modified: ../../../java/AllgemeinTest.java
modified: ../../bytecode/javFiles/FieldTphConsMeth.jav
2020-10-16 14:54:36 +02:00
JanUlrich
6e91e5c683
Merge addPackages, simplifyRes und bigRefactoring
2020-10-01 10:11:20 +02:00
JanUlrich
e4908557f4
Merge addPackages and simplifyRes and clear project
2020-09-30 03:45:01 +02:00
JanUlrich
ed550b1097
Aufräumen
2020-09-30 03:32:57 +02:00
JanUlrich
5fa1cf11ef
Merge branch 'simplifyRes' into bigRefactoring
2020-09-25 18:48:28 +02:00
pl@gohorb.ba-horb.de
653901ef32
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
...
alten Code geloescht
2020-05-13 14:07:22 +02:00
pl@gohorb.ba-horb.de
2e03b5b10c
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
auskommentierten Code geloescht
2020-05-12 17:35:28 +02:00
pl@gohorb.ba-horb.de
670e3ed99f
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
nextSetasListRest = oup.minElements(nextSetasListRest);
nextSetasListRest = oup.maxElements(nextSetasListRest);
eingefuegt
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java
2020-05-12 17:25:04 +02:00
pl@gohorb.ba-horb.de
c8ece0a010
new file: ../../../java/bytecode/InheritTest2.java
...
modified: AA.jav
modified: CC.jav
new file: Inherit2.jav
2020-05-12 10:02:41 +02:00
pl@gohorb.ba-horb.de
c27e1fa4e1
modified: ../../../java/bytecode/InheritTest.java
...
modified: Inherit.jav
Funktioniert soweit
2020-05-11 17:54:37 +02:00
pl@gohorb.ba-horb.de
b3b25b7869
Merge branch 'addPackages' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into addPackages
2020-05-11 13:47:16 +02:00
pl@gohorb.ba-horb.de
9240b0d163
Changes to be committed:
...
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
modified: src/test/java/bytecode/InheritTest.java
modified: src/test/resources/bytecode/javFiles/Inherit.jav
2020-05-11 13:45:19 +02:00
JanUlrich
a0a813f87c
Inherit Test update
2020-05-08 11:35:21 +02:00
JanUlrich
60b182b9b1
Kleiner Hack für Inherit test
2020-05-08 11:26:07 +02:00
pl@gohorb.ba-horb.de
8e2d4e1c70
modified: ../src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
new file: ../src/main/java/de/dhbwstuttgart/typeinference/unify/model/OrderingExtend.java
2020-05-08 11:04:05 +02:00
pl@gohorb.ba-horb.de
907ab2fcec
modified: ../../../java/bytecode/InheritTest.java
...
modified: ../../bytecode/javFiles/Inherit.jav
2020-05-08 10:19:00 +02:00
pl@gohorb.ba-horb.de
eb27003515
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/model/Node.java
Fehler in der Transitivaet der Finit Closure gefixt
modified: ../../../java/bytecode/InheritTest.java
modified: ../../bytecode/javFiles/AA.jav
modified: ../../bytecode/javFiles/CC.jav
modified: ../../bytecode/javFiles/Inherit.jav
Noch Probl;em in der Reflections
2020-05-07 16:29:00 +02:00
pl@gohorb.ba-horb.de
71c801c19c
modified: ../src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
2020-05-06 19:25:19 +02:00
pl@gohorb.ba-horb.de
ba750187ba
modified: ../src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: ../src/main/java/de/dhbwstuttgart/typeinference/constraints/Constraint.java
modified: ../src/test/java/bytecode/InheritTest.java
new file: ../src/test/resources/bytecode/javFiles/AA.jav
new file: ../src/test/resources/bytecode/javFiles/BB.jav
new file: ../src/test/resources/bytecode/javFiles/CC.jav
new file: ../src/test/resources/bytecode/javFiles/DD.jav
modified: ../src/test/resources/bytecode/javFiles/Inherit.jav
Inherit funktioniert noch nicht ganz
2020-05-06 19:22:08 +02:00
pl@gohorb.ba-horb.de
ccf5df1f1e
new file: ../../../java/bytecode/InheritTest.java
...
modified: ../../../java/bytecode/PutTest.java
new file: ../../bytecode/javFiles/Inherit.jav
2020-05-05 18:43:39 +02:00
pl@gohorb.ba-horb.de
3de735ebe3
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
new file: ../../../java/bytecode/PutTest.java
new file: ../../bytecode/javFiles/Put.jav
2020-05-05 18:06:05 +02:00
pl@gohorb.ba-horb.de
fd3d4e97a1
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
...
isInherited für ? extends wieder mit gleich gesetzt
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
Variance = -1 und Oderconstraints Vererbung eingebaut
Variance = 0 min/max eingebaut
2020-05-05 17:14:52 +02:00
pl@gohorb.ba-horb.de
6deeb4105f
modified: ../../../../main/java/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
...
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/constraints/Constraint.java
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/constraints/ConstraintSet.java
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/RuleSet.java
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java
Fuer Variance = 1 neue Version korrekt, konnte aber noch Fehler entbhalten
2020-05-04 17:02:15 +02:00
pl@gohorb.ba-horb.de
9d4980d9a1
modified: ../src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: ../src/main/java/de/dhbwstuttgart/typeinference/constraints/Constraint.java
modified: ../src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
modified: ../src/main/java/de/dhbwstuttgart/typeinference/unify/RuleSet.java
modified: ../src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
modified: ../src/main/java/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java
2020-05-01 22:55:25 +02:00
pl@gohorb.ba-horb.de
b83e2c10e3
modified: ../../../../main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/RuleSet.java
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
Call-graph weiter umgesetzt, aber noch Fehler in MatrixOP
2020-04-27 22:17:37 +02:00
pl@gohorb.ba-horb.de
4f10e789d4
modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: src/main/java/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java
modified: src/main/java/de/dhbwstuttgart/syntaxtree/Method.java
modified: src/main/java/de/dhbwstuttgart/syntaxtree/factory/ASTFactory.java
modified: src/main/java/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
modified: src/main/java/de/dhbwstuttgart/typeinference/assumptions/MethodAssumption.java
modified: src/main/java/de/dhbwstuttgart/typeinference/constraints/Constraint.java
modified: src/main/java/de/dhbwstuttgart/typeinference/constraints/ConstraintSet.java
modified: src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/RuleSet.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify2Task.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/interfaces/IRuleSet.java
modified: src/test/java/AllgemeinTest.java
Erster Ansatz Call-Graph zu beruecksichtigen
2020-04-24 23:05:42 +02:00
pl@gohorb.ba-horb.de
8b9f0d6376
modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
log-Files abgeschaltet
modified: src/test/java/AllgemeinTest.java
File ergaenzt
2020-04-20 14:29:15 +02:00
pl@gohorb.ba-horb.de
723eca8658
modified: src/test/java/typeinference/JavaTXCompilerTest.java
...
modified: src/test/resources/javFiles/IfTest.jav
modified: src/test/resources/javFiles/ListenerOverload.jav
modified: src/test/resources/javFiles/fc.jav
2020-04-14 18:28:16 +02:00
pl@gohorb.ba-horb.de
071f4cd9ca
modified: src/test/java/typeinference/JavaTXCompilerTest.java
...
modified: src/test/java/typeinference/Meth_GenTest.java
modified: src/test/java/typeinference/UnifyTest.java
Tests angepasst
2020-04-14 16:47:25 +02:00
pl@gohorb.ba-horb.de
cdc6a3f2dd
Merge branch 'simplifyRes' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into simplifyRes
2020-04-13 16:23:09 +02:00
pl@gohorb.ba-horb.de
cc6156695d
modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
INSTANCE auf sich selber geloescht
2020-04-13 16:22:10 +02:00
pl@gohorb.ba-horb.de
1b6af9ab7e
modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: src/main/java/de/dhbwstuttgart/typedeployment/TypeInsertFactory.java
modified: src/main/java/de/dhbwstuttgart/typedeployment/TypeInsertPlacer.java
Bug 180 - Andere Einsetzung als im Bytecode geloest
2020-04-13 16:08:42 +02:00
michael
0861f74ce7
Bug 171: Beim Typeinsert werden Marker jetzt richtig verschoben.
2020-04-02 22:20:31 +02:00
pl@gohorb.ba-horb.de
3f919be1bf
new file: ../../../java/AllgemeinTest.java
...
new file: ../../../java/bytecode/mathStrucMatrixOPTest.java.txt
new file: ../../../java/bytecode/mathStrucVectorAddTest.java.txt
new file: ../../../java/packages/mathStrucMatrixOPTest.java.txt
new file: ../../AllgemeinTest/FCTest1.jav
new file: ../../AllgemeinTest/FCTest2.jav
new file: ../../AllgemeinTest/FCTest3.jav
new file: ../../AllgemeinTest/GenTest.jav
new file: ../../AllgemeinTest/Generics.jav
new file: ../../AllgemeinTest/OverloadingMain.jav
new file: ../../AllgemeinTest/Overloading_Generics.jav
new file: ../../AllgemeinTest/OverrideMain.jav
new file: ../../AllgemeinTest/OverrideMainRet.jav
new file: ../../AllgemeinTest/Pair.java
2020-03-30 16:17:52 +02:00
pl@gohorb.ba-horb.de
97bdfe1d3a
modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
wenn nicht wildcardable dann receiver ? extends geloescht
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java
kleiner Fehler in compare
2020-03-30 13:28:13 +02:00
pl@gohorb.ba-horb.de
7c7dbf3769
modified: ../../../../main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/model/UnifyPair.java
Das fehlerveruraschende Paar wird auch zu abhSubst hingefuegt.
2020-03-29 11:05:52 +02:00
pl@gohorb.ba-horb.de
577faa88af
modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
Reihenfolge geaendert, so dass bei Variance 1 (x <. theta) vorne und bei Variance -1 (theta <. x) vorne
2020-03-28 00:16:43 +01:00
pl@gohorb.ba-horb.de
8bdb7e7b13
modified: ../src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: ../src/main/java/de/dhbwstuttgart/typeinference/unify/RuleSet.java
modified: ../src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
modified: ../src/main/java/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java
noch Fehler bei mathStruc<Integer> und Matrix laeuft sehr lange vll. terminiert es nicht.
2020-03-26 17:23:56 +01:00
pl@gohorb.ba-horb.de
eca187da79
modified: src/main/java/de/dhbwstuttgart/syntaxtree/visual/OutputGenerator.java
...
modified: src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/model/UnifyPair.java
2020-03-26 12:44:56 +01:00
pl@gohorb.ba-horb.de
850af6a6ae
modified: ../src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: ../src/main/java/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java
modified: ../src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
Vererbung korrigiert
2020-03-19 18:36:20 +01:00
pl@gohorb.ba-horb.de
ed1bb44089
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java
variance = 2 umgesetzt auf variance = 1, variance = -1, variance = 0
2020-03-19 17:03:54 +01:00
pl@gohorb.ba-horb.de
592de5310e
modified: ../src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: ../src/main/java/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java
modified: ../src/main/java/de/dhbwstuttgart/syntaxtree/SourceFile.java
modified: ../src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
modified: ../src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
modified: ../src/main/java/de/dhbwstuttgart/typeinference/unify/model/UnifyPair.java
2020-03-18 17:36:10 +01:00
pl@gohorb.ba-horb.de
e4e3704c7b
modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
Umbau TYPEStmt Methods begonnen
2020-03-17 14:06:21 +01:00
pl@gohorb.ba-horb.de
21bc3e5193
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
Reigenfolge der der nextSets angepasst
2020-03-13 15:57:27 +01:00
pl@gohorb.ba-horb.de
44368f2a2a
modified: ../src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
modified: ../src/main/java/de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java
weitere Logausgaben bei a <. theta'
2020-03-13 14:04:57 +01:00
pl@gohorb.ba-horb.de
aa94ce8ad9
modified: src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
...
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java
Fehler korrigiert in compare
2020-03-12 10:18:48 +01:00
pl@gohorb.ba-horb.de
d63c27579c
modified: ../../../../main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
...
Typen der Methoden der Oder-Constraiunts benutzen wieder rueckgaenig gemacht
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
wieder alle grArg im a <. theta' benutzen
modified: ../../bytecode/javFiles/MatrixOP.jav
2020-03-09 18:30:36 +01:00
pl@gohorb.ba-horb.de
b38340fc60
modified: ../../../../main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/constraints/ConstraintSet.java
toString veraendert
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/Match.java
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
Fall A <. theta' veraendert.
modified: ../../bytecode/javFiles/MatrixOP.jav
2020-03-09 14:06:41 +01:00
pl@gohorb.ba-horb.de
df0d02cdea
Revert " modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java"
...
This reverts commit 47ec1dca5a
.
2020-03-06 13:57:01 +01:00
pl@gohorb.ba-horb.de
900a487d8a
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
Aufruf von isCanceled an verschiedenen Stellen ergaenzt, so dass jetzt alle Prozesse angehalten werden sollten
2020-03-03 14:52:11 +01:00
michael
e07df035ea
Check for null list. Crash fix.
2020-03-03 10:27:13 +01:00
pl@gohorb.ba-horb.de
47ec1dca5a
modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify2Task.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/UnifyTaskModel.java
new file: src/main/java/de/dhbwstuttgart/typeinference/unify/controlCancel.java
controlCancel.java kann durch IProgressMonitor aus Eclipse implementiert werden.
So lässt sich das Cancel-Problem des Eclipse-Plugins loesen.
2020-02-29 22:22:37 +01:00
pl@gohorb.ba-horb.de
e913bfa768
modified: ../../../main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
...
modified: ../../../main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
Im Bytecode werden MethpdCaltypen bereits beim TYPEen angelegt.
2020-02-07 18:17:58 +01:00
pl@gohorb.ba-horb.de
98997d686f
modified: ../../../main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
...
Lokale Variablen eingefuegt
Wildcards korrigiert
logFiule off
modified: ../../../main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java
modified: ../../../main/java/de/dhbwstuttgart/syntaxtree/Constructor.java
modified: ../../../main/java/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java
modified: ../../../main/java/de/dhbwstuttgart/syntaxtree/statement/NewClass.java
modified: ../../../main/java/de/dhbwstuttgart/syntaxtree/statement/SuperCall.java
modified: ../../../main/java/de/dhbwstuttgart/syntaxtree/statement/ThisCall.java
Typeargumente von Receiver und Argumenten in Methodcall eingefuegt.
2020-02-07 17:46:11 +01:00
pl@gohorb.ba-horb.de
5c97d80eb0
modified: src/main/java/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java
...
modified: src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
2020-02-06 18:35:33 +01:00
pl@gohorb.ba-horb.de
23384f413d
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/model/UnifyPair.java
variance von Pairs geloescht.
2020-02-06 15:27:51 +01:00
pl@gohorb.ba-horb.de
a5662cdd9a
modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
Nachtraegliches Einfuegen von Variance in OderConstraints auskommentiert.
modified: src/main/java/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
Variance im konvertieren eingefuegt
modified: src/main/java/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java
Variace eingefuegt
modified: src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
In OderConstraints Variance bei der Erstellung eingefuegt
2020-02-06 11:39:27 +01:00
pl@gohorb.ba-horb.de
28400c8bde
modified: ../../../../main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
Variance aller Argumente in Oderconstraints auf 1 gesetzt muss nochmals ueberarbeitet werden
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
Returntypen von Operatoren sind \doteq gestezt
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
Bei Variance = 2 parallel abgearbeitet geloescht, dass nicht nochmals bearbeitet werden.
2020-02-06 08:51:30 +01:00
pl@gohorb.ba-horb.de
b68004a214
modified: ../../../../main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
Weiter Ausgave der abstrakten Syntax auf die Console
Fehler bei der Auswahl der Varianz behoben.
2020-01-31 10:03:33 +01:00
pl@gohorb.ba-horb.de
8d72b58fcc
modified: ../../../../main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
...
Methode unbenannt in unbox
2020-01-21 19:48:31 +01:00
pl@gohorb.ba-horb.de
e581050a61
modified: ../../../java/packages/LoadDefaultPackageClassesTest.java
...
modified: ../../../java/packages/OLOneFileTest.java
2020-01-21 18:22:40 +01:00
pl@gohorb.ba-horb.de
1ec7a78b14
modified: ../../../../main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
...
basetype und RefType Fehler korrigiert
Methode basetypeComp eingefuegt.
2020-01-21 18:04:56 +01:00
pl@gohorb.ba-horb.de
8ec1c5148b
new file: OLTest.txt
...
new file: UseOLMain.java
Test für die ComandLine-Version
2020-01-21 14:34:09 +01:00
pl@gohorb.ba-horb.de
bf80361c1f
new file: ../../../java/packages/OLOneFileTest.java
...
new file: OLOneFile.jav
2020-01-21 14:12:48 +01:00
pl@gohorb.ba-horb.de
a9d6e08a20
modified: ../../../../main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
2020-01-21 14:10:38 +01:00
pl@gohorb.ba-horb.de
d55e6b3b75
modified: ../../../../main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
...
fehlerhafter Aufruf getMethod korrigiert.
modified: ../../../java/packages/OLTest.java
modified: OLMain.jav
new file: OLextends.jav
renamed: OL.jav -> de/test/OL.jav
OL-Beispiel mit doppelter Vererbung eingefuegt.
2020-01-21 12:27:41 +01:00
JanUlrich
a6287b1551
Work with File instead of Strings when specifying output als classpath
2020-01-17 16:06:51 +01:00
pl@gohorb.ba-horb.de
5500180c6b
modified: ../../../../main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
2020-01-15 20:47:39 +01:00
JanUlrich
0c1ca3d200
Fehler beheben und DirecotryClassLoader anfügen
2020-01-12 22:49:51 +01:00
JanUlrich
f3d6fcb417
add -classpath to ConsoleInterface. Fix bug
2020-01-11 20:19:23 +01:00
pl@gohorb.ba-horb.de
647c9e6c21
modified: ../../../main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
...
.replace("/", ".")); anegfuegt, damit auch bei packages superklassen gefunden erden.
2020-01-08 14:47:03 +01:00
pl@gohorb.ba-horb.de
6779f10b08
modified: ../../../../main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
...
Bug "." wird in replaceAll nicht ersetzt, deshalb "/" durch "." und nicht "." durch "/" ersetzt.
modified: ../../../java/packages/OLTest.java
modified: ../../../java/packages/mathStrucVectorTest.java
renamed: de/test/OL.jav -> OL.jav
renamed: de/test/OLMain.jav -> OLMain.jav
OL ins default-Package verschoben
2020-01-07 18:37:43 +01:00
pl@gohorb.ba-horb.de
ac3f8ece0e
Merge branch 'addPackages' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into addPackages
2020-01-07 11:20:31 +01:00
JanUlrich
f63346649b
Fix loading packages from same package
2020-01-06 22:04:29 +01:00
JanUlrich
abdff6c8d2
Fixed bug #184
2020-01-03 01:12:58 +01:00
JanUlrich
691d31df5e
Die getRegistry Methode der CompilationEnvironment Klasse beachtet jetzt auch alle .class Files, welche sich im gleichen Ordner befinden
2020-01-03 01:08:00 +01:00
JanUlrich
2e421cccaa
Merge branch 'addPackages' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into addPackages
2019-12-30 19:20:46 +01:00
pl@gohorb.ba-horb.de
bd0b2e6058
new file: ../../../../../../../../java/packages/OLTest.java
...
new file: ../../../OL.jav
new file: ../../../OLMain.jav
2019-12-30 10:45:32 +01:00
pl@gohorb.ba-horb.de
0c9c8ef321
modified: ../../../../../../../../../main/java/de/dhbwstuttgart/syntaxtree/factory/ASTFactory.java
...
Bug 182 fixed
modified: ../../../mathStrucVector.jav
modified: ../../../vectorAdd.jav
kleine Aenderungen
2019-12-29 19:42:40 +01:00
JanUlrich
4b4087ae24
Trying to add Names that are not imported to availableClasses (unfinished)
2019-12-27 18:51:04 +01:00
JanUlrich
19989bfe11
Add Console Interface parameters, output directory and classpath
2019-12-26 19:43:00 +01:00
JanUlrich
f59a7d221e
Fix bug #181
2019-12-26 15:22:40 +01:00
pl@gohorb.ba-horb.de
c1c12fa33c
new file: mathStrucVectorTest.java
...
new file: ../../resources/javFiles/packageTest/de/test/mathStruc.jav
new file: ../../resources/javFiles/packageTest/de/test/mathStrucVector.jav
new file: ../../resources/javFiles/packageTest/de/test/vectorAdd.jav
2019-12-23 16:34:07 +01:00
pl@gohorb.ba-horb.de
7fd03d505e
Merge branch 'addPackages' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into addPackages
2019-12-23 11:25:36 +01:00
pl@gohorb.ba-horb.de
4391adfb0f
modified: src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
...
modified: src/test/resources/bytecode/javFiles/OL.jav
2019-12-23 11:25:07 +01:00
JanUlrich
d0b6dbcd30
Tests anfügen und Bugs fixen
2019-12-22 23:23:10 +01:00
JanUlrich
306af907c5
Nicht mit mehreren Eingabedateien testen
2019-12-22 22:32:40 +01:00
JanUlrich
75eaee6644
Abgabeprotokoll
2019-12-22 17:59:40 +01:00
JanUlrich
0378c17e7d
ClassLoader austauschen gegen den Classloader, welcher in JavaCompilerCore erstellt wird
2019-12-22 14:27:54 +01:00
JanUlrich
afd2c21ca8
Add classPath option to JavaTXCompiler and parse with URLClassLoader
2019-12-16 00:54:00 +01:00
JanUlrich
bb75fca0d7
Add ImportTest
2019-12-15 14:57:12 +01:00
JanUlrich
c82abcaae5
Generate Package names in .class files
2019-12-15 14:55:49 +01:00
JanUlrich
a3b4ea9b1c
[Bytecde] Generate new directory if given output path doesnt exist yet
2019-12-14 17:50:23 +01:00
JanUlrich
af5b23e31a
Use JavaClassName instead of Strings
2019-12-14 16:30:14 +01:00
pl@gohorb.ba-horb.de
084b54d295
modified: ../src/main/java/de/dhbwstuttgart/syntaxtree/visual/OutputGenerator.java
...
modified: ../src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
einige Korrekturen
2019-12-09 15:54:22 +01:00
michael
e305c3cb55
[MINOR]: Optimized imports.
2019-12-09 13:52:37 +01:00
michael
835f0755da
Merge branch 'simplifyRes' of uhl@gohorb.ba-horb.de:/bahome/projekt/git/JavaCompilerCore into simplifyRes
2019-12-06 20:22:52 +01:00
michael
14b127390e
[MINOR]: Umlaute in Kommentaren korrigiert.
2019-12-06 20:22:33 +01:00
pl@gohorb.ba-horb.de
0c1337f84b
Merge branch 'simplifyRes' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into simplifyRes
2019-12-06 13:09:55 +01:00
pl@gohorb.ba-horb.de
5c1015b51e
modified: src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java
...
- fieldType = TypePlaceholder.fresh(fieldDeclarationContext.getStart());
+ fieldType = TypePlaceholder.fresh(fieldDeclarationContext.variableDeclaratorList().getStart()); //PL 2019-12-06: variableDeclaratorList() eingefuegt, um als Token nicht die Modifier zu bekommen
2019-12-06 12:57:07 +01:00
michael
c52da7951a
Bug 176 - Argumente mit Typvariabelen werden die Generics einschließlich
...
Bounds immer bei den Argumenten eingefügt
2019-12-05 21:51:53 +01:00
michael
6cbabee65a
Merge remote-tracking branch 'origin/bigRefactoring' into simplifyRes
2019-12-02 20:15:33 +01:00
michael
c18daad047
Korrektur der Ersetzung.
2019-12-02 15:32:18 +01:00
JanUlrich
09a6aec65d
Erste Tests und die Möglichkeit generateBytecode null als Pfad zu übergeben
2019-11-24 17:52:02 +01:00
JanUlrich
766e71bb3a
Beginn mit Werksvertrag: Package Support
2019-11-19 21:53:53 +01:00
JanUlrich
802d7726d4
Merge branch 'bigRefactoring' into addPackages
2019-11-19 21:51:14 +01:00
pl@gohorb.ba-horb.de
c68d773486
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify2Task.java
...
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
Threadsteuerung veranendert, so dass möglichst veile Threads gleichzeitig laufen.
Müsste noch verbessert werden können.
2019-11-18 14:37:59 +01:00
Michael Uhl
52b3498dfb
Vor Fertigstellung Ersetzung Generics.
2019-11-14 14:04:09 +01:00
pl@gohorb.ba-horb.de
00bbd5279f
modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
log-File-Ausgabe etwas ergaenzt
modified: src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java
Fehler korrigiert, dass alle Fieldinitializer bei mehreren Klassen additiv hinzugefuegt werden
modified: src/main/java/de/dhbwstuttgart/syntaxtree/statement/This.java
toString veranedert
modified: src/test/resources/bytecode/javFiles/mathStruc.jav
leichte Korrektur
new file: src/test/java/bytecode/mathStrucIntegerTest.java
new file: src/test/resources/bytecode/javFiles/mathStrucInteger.jav
mathStruc auf Integer angewandt
new file: src/test/resources/bytecode/javFiles/mathStrucMatrixOP.jav
mathStruc auf MatrixOP angewandt, laeuft noch nicht durch, des halb Test noch nicht eingecheckt
2019-10-24 17:47:51 +02:00
pl@gohorb.ba-horb.de
6c783a18c7
new file: ../../../../../PlugInBau.txt
...
modified: ../../bytecode/javFiles/Faculty.jav
modified: ../../bytecode/javFiles/OL.jav
modified: ../../bytecode/javFiles/Y.jav
modified: ../../bytecode/javFiles/mathStruc.jav
2019-10-22 16:44:38 +02:00
Fayez Abu Alia
8c195601d5
Fixed signature problem for FunN
2019-10-12 11:32:56 +02:00
pl@gohorb.ba-horb.de
37f8f2e1e0
modified: ../../bytecode/javFiles/Y.jav
...
Anwendung von Y eingefuegt.
2019-09-19 13:57:49 +02:00
Fayez Abu Alia
0903efda0d
Fixed bug 115
2019-09-19 13:00:35 +02:00
Michael Uhl
6e9eae38ca
Compile fix.
2019-09-17 09:46:47 +02:00
Michael Uhl
0138e4fe2d
Merge branch 'bytecode2' into simplifyRes
2019-09-17 09:41:08 +02:00
Michael Uhl
9741b5e14e
Merge remote-tracking branch 'origin/bytecode2' into simplifyRes
...
Conflicts:
src/main/java/de/dhbwstuttgart/bytecode/simplifyRes/GenericGenratorResultForSourceFile.java
src/main/java/de/dhbwstuttgart/bytecode/simplifyRes/GenericsGeneratorResultForClass.java
2019-09-17 09:36:56 +02:00
Fayez Abu Alia
c2030123d5
Fixed bugs 163 and 169
2019-09-17 09:33:18 +02:00
Michael Uhl
25fb7a2e28
Plugin: Additional generic insert points.
2019-09-16 11:52:34 +02:00
Fayez Abu Alia
d1637b8eb9
Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecode2
2019-08-29 11:50:23 +02:00
Fayez Abu Alia
9abda637a1
Generic generator algorithm - fixed bug
2019-08-29 10:49:18 +02:00
pl@gohorb.ba-horb.de
82c0837d1f
mathStruc.jav hinzugefügt
2019-08-23 15:06:54 +02:00
Fayez Abu Alia
a41e9804a0
Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecode2
2019-07-31 13:18:07 +02:00
Fayez Abu Alia
25c685c705
Merged with simplifyRes and cleaned up code
2019-07-31 13:16:14 +02:00
Fayez Abu Alia
3ecb202a90
Generic generator algorithm v1
2019-07-31 11:55:24 +02:00
Fayez Abu Alia
efdb58e67c
Added throw Exception to method getSimplifyResultsByName
2019-07-31 10:33:43 +02:00
Fayez Abu Alia
eed8f32cb7
Merge branch 'simplifyRes' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into simplifyRes
2019-07-31 10:27:43 +02:00
Fayez Abu Alia
87d0a46ba5
Generic generator algorithm v0.1
2019-07-31 10:24:58 +02:00
Michael Uhl
5b75250fcf
Merge branch 'bigRefactoring' into simplifyRes
...
# Conflicts:
# src/main/java/de/dhbwstuttgart/bytecode/utilities/SimplifyResult.java
# src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
2019-07-29 16:21:25 +02:00
Michael Uhl
7f29b39195
Generic Method inserts.
2019-07-26 10:12:53 +02:00
Fayez Abu Alia
7a4bc32974
Generic generator algorithm v0.1
2019-07-25 22:24:06 +02:00
Fayez Abu Alia
dfddc44f29
Separated the algorithm into two parts. Part 1 is the simplification of
...
the constraints and part 2 is generation of generics.
2019-07-12 19:50:46 +02:00
Fayez Abu Alia
347d86a379
Genericsgenerator step 2 and 3
2019-07-11 15:52:38 +02:00
Fayez Abu Alia
d77f2176f2
Generics generator step 1
2019-07-10 15:26:16 +02:00
Fayez Abu Alia
4f39eccecb
Removed an old getter method
2019-07-05 13:45:24 +02:00
Fayez Abu Alia
669e7f111f
Separated the generation of bytecode and the calculation of simplify
...
results from each other
2019-07-05 13:29:34 +02:00
pl@gohorb.ba-horb.de
32d12677bf
Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecode2
2019-06-28 11:41:47 +02:00
pl@gohorb.ba-horb.de
92b2f5c9cc
modified: src/test/resources/bytecode/javFiles/Faculty.jav
...
} eingefuegt
2019-06-28 11:41:19 +02:00
Fayez Abu Alia
c1e6526b43
Removed unnecessary tests
2019-06-26 12:18:49 +02:00
Fayez Abu Alia
0194e30206
Fixed Bug 150.
2019-06-26 12:16:47 +02:00
Fayez Abu Alia
3c36c61077
Fixed Bugs 159, 162 and 163
2019-06-13 14:01:32 +02:00
Fayez Abu Alia
857d63322e
Fixed Bug 152 Faculty Probleme
2019-06-07 10:28:48 +02:00
Fayez Abu Alia
b801e144c3
Merged with bigRefactoring. Added method to generate signature to
...
FunN-Interfaces. Adapted jav-Files.
2019-06-06 12:15:51 +02:00
Martin Plümicke
f6669f8c13
new file: ../../../java/bytecode/VectorAddTest.java
2019-06-05 10:28:51 +02:00
Martin Plümicke
2b7aef5e87
modified: ../../../../main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
Pfad fuer logFile nach JavaCompilerCore/logFiles verlegt.
modified: ../../bytecode/javFiles/OL.jav
modified: ../../bytecode/javFiles/VectorAdd.jav
2019-06-05 10:21:25 +02:00
Michael Uhl
0233426979
Merge remote-tracking branch 'origin/bigRefactoring' into bigRefactoring
2019-05-14 21:54:41 +02:00
Michael Uhl
3d0d11adb7
Code aufgeräumt.
2019-05-14 21:43:32 +02:00
Martin Plümicke
212144db86
renamed: test/java/bytecode/FunOLTest.java -> test/java/bytecode/OLFunTest.java
...
new file: test/resources/bytecode/javFiles/OLFun.jav
2019-05-14 20:30:32 +02:00
Martin Plümicke
bd0517ae29
modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
log-File in anderen Pfad
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/model/UnifyPair.java
substitutions gekapselt
2019-05-14 19:54:51 +02:00
Martin Plümicke
f210dd3c25
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
try der Nullpointer-Exception erweitert.
2019-05-13 11:11:47 +02:00
Martin Plümicke
4602e95f09
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
2019-05-12 20:00:03 +02:00
Martin Plümicke
1ef228a045
modified: ../../../main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
public volatile UnifyTaskModel usedTasks = new UnifyTaskModel();
auf publich gesetzt
2019-05-12 19:54:30 +02:00
Martin Plümicke
c3c0a11572
Debugabfrage entfernt, die Exception ausgeloest hat
...
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/UnifyTaskModel.java
Methoden synchronized gemacht
2019-05-12 19:15:26 +02:00
Martin Plümicke
d14406e474
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
modified: ../../resources/bytecode/javFiles/MatrixOP.jav
2019-05-10 21:23:28 +02:00
Martin Plümicke
a149b0c391
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify2Task.java
...
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/UnifyTaskModel.java
Eigenen Cancel-Mechanismus implementiert
2019-05-10 21:02:24 +02:00
pl@gohorb.ba-horb.de
bfbce81409
Abbruch aller Threads eingebaut
...
modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify2Task.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
new file: src/main/java/de/dhbwstuttgart/typeinference/unify/UnifyTaskModel.java
2019-05-10 16:30:55 +02:00
Martin Plümicke
985704c0b0
modified: src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
...
Wen kein Import für die Addition vorhanden ist, wird Fehler ausgegeben
2019-05-08 08:58:19 +02:00
Michael Uhl
1f20fecfee
ResultPair durchgeschleift.
2019-05-07 10:38:25 +02:00
Michael Uhl
4b8b0ec362
ConcurrentModificationException umgangen.
2019-05-05 22:33:16 +02:00
Michael Uhl
e48f2b2fd5
Merge remote-tracking branch 'origin/bigRefactoring' into bigRefactoring
...
# Conflicts:
# src/main/java/de/dhbwstuttgart/bytecode/BytecodeGen.java
2019-04-27 16:33:20 +02:00
Michael Uhl
11bee80969
Bytecode-Generierung generiert jetzt wieder Bytecode für alle möglichen Typen.
2019-04-27 16:29:38 +02:00
Martin Plümicke
448c489a49
modified: src/main/java/de/dhbwstuttgart/typeinference/result/ResultSet.java
...
modified: src/test/resources/bytecode/javFiles/Lambda.jav
modified: src/test/resources/bytecode/javFiles/MatrixOP.jav
modified: src/test/resources/bytecode/javFiles/OL.jav
2019-04-27 15:44:21 +02:00
pl@gohorb.ba-horb.de
1e1eb2a2f2
geändert: src/main/java/de/dhbwstuttgart/typeinference/result/ResultSet.java
2019-04-27 14:51:25 +02:00
pl@gohorb.ba-horb.de
4a7c124fd6
Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bigRefactoring
2019-04-27 09:51:22 +02:00
pl@gohorb.ba-horb.de
7d01c866a9
modified: ../src/test/resources/bytecode/javFiles/Id.jav
...
modified: ../src/test/resources/bytecode/javFiles/Matrix.jav
modified: ../src/test/resources/bytecode/javFiles/MatrixOP.jav
modified: ../src/test/resources/bytecode/javFiles/OL.jav
2019-04-26 14:12:46 +02:00
Fayez Abu Alia
73f412d22d
Klassendatei fuer FunN beim Methodaufruf wird erzeugt, wenn der Receiver
...
den Typ FunN besitzt.
Die Loesung vom Duplicate Field Problem wird angepasst.
2019-04-26 11:56:58 +02:00
Fayez Abu Alia
9ffc74467b
Wenn ein Attribut mehrere Loesungen bekommt, wird die Bytecodeerzeugung
...
abgebrochen und ensprechende Exception geworfen.
2019-04-26 10:27:15 +02:00
Fayez Abu Alia
5950fcc0a9
Neue Klasse MethodCallHelper und Exceptions definiert, die fuer die
...
Uebersetzung von MethodCalls verwendet werden
2019-04-24 15:43:00 +02:00
Martin Plümicke
d2fb17ad4e
Merge branch 'bcGenerics' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bcGenerics
2019-04-21 22:32:20 +02:00
Martin Plümicke
d9f084cd0f
modified: ../../bytecode/javFiles/Faculty.jav
...
neue Imports hinzugefuegt
2019-04-21 22:31:55 +02:00