Commit Graph

2285 Commits

Author SHA1 Message Date
pl@gohorb.ba-horb.de
d6a79ea3a1 modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java 2023-04-11 22:45:15 +02:00
pl@gohorb.ba-horb.de
1f909f13ee modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java 2023-04-11 18:01:44 +02:00
pl@gohorb.ba-horb.de
be6f4bd578 Merge remote-tracking branch 'origin/targetBytecode' into unif23 2023-04-11 15:52:26 +02:00
pl@gohorb.ba-horb.de
478efd5649 Merge branch 'unif23' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unif23 2023-04-11 15:40:27 +02:00
pl@gohorb.ba-horb.de
c73e57cf2b new file: resources/bytecode/javFiles/Scalar.jav 2023-04-11 15:35:15 +02:00
pl@gohorb.ba-horb.de
ce29f4bcf1 Merge branch 'unif23' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into Unif23
Conflicts:
	src/test/java/targetast/TestComplete.java
2023-04-10 22:14:46 +02:00
pl@gohorb.ba-horb.de
42821f3215 modified: src/main/java/de/dhbwstuttgart/typeinference/unify/RuleSet.java
modified:   src/test/java/targetast/TestComplete.java
2023-04-10 22:07:47 +02:00
pl@gohorb.ba-horb.de
f68afc88a6 modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java 2023-04-06 17:58:32 +02:00
pl@gohorb.ba-horb.de
ed671aeb97 modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
modified:   src/main/java/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
	modified:   src/main/java/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java
	modified:   src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
	modified:   src/main/java/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java
	modified:   src/main/java/de/dhbwstuttgart/typeinference/unify/model/PlaceholderType.java

<. weider eingefuegt bei Return typen von Methodcalls und Return-Statements
Vergleich dementsprechend angepasst.
2023-04-05 17:48:15 +02:00
pl@gohorb.ba-horb.de
82061474b2 modified: resources/bytecode/javFiles/Scalar.jav
modified:   src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
2023-04-04 17:26:13 +02:00
pl@gohorb.ba-horb.de
d849bc127f Merge remote-tracking branch 'origin/targetBytecode' into unif23 2023-04-04 16:47:19 +02:00
pl@gohorb.ba-horb.de
f6a4fe8142 modified: resources/bytecode/javFiles/Scalar.jav 2023-04-04 16:00:54 +02:00
pl@gohorb.ba-horb.de
f6fe3a68aa new file: resources/bytecode/javFiles/Scalar.jav 2023-04-04 15:54:41 +02:00
pl@gohorb.ba-horb.de
86d229cac9 modified: resources/bytecode/javFiles/Matrix.jav
modified:   src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
	modified:   src/test/java/targetast/TestComplete.java
2023-04-04 15:54:03 +02:00
pl@gohorb.ba-horb.de
02c8dd9804 Merge branch 'targetBytecode' of gohorb.ba-horb.de:/bahome/projekt/git/JavaCompilerCore into targetBytecode 2023-04-04 13:16:41 +02:00
pl@gohorb.ba-horb.de
0908d512d9 modified: src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java 2023-04-04 13:16:25 +02:00
Victorious3
e231cf722b Fix type variable being declared twice 2023-04-04 13:09:28 +02:00
Victorious3
aa9782edd7 Fix test case 2023-04-04 13:09:05 +02:00
pl@gohorb.ba-horb.de
e55b9938dc modified: src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
Returntyp: Equaldot durch SMALLERDOT ersetzt
2023-04-04 10:30:38 +02:00
pl@gohorb.ba-horb.de
6815d8fc0a modified: Makefile
modified:   src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
2023-03-31 17:58:02 +02:00
pl@gohorb.ba-horb.de
317f8b1aad new file: Makefile
deleted:    Test.java
	modified:   src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
2023-03-31 15:54:17 +02:00
Victorious3
f7b60214fa Change tests 2023-03-28 16:40:06 +02:00
Victorious3
1ad5540500 Fix wrong class generics being used 2023-03-28 13:28:05 +02:00
Victorious3
3963baa9ce Fix equality 2023-03-28 12:02:08 +02:00
Victorious3
b9f19cc105 Write tx signature to constant pool 2023-03-24 15:14:17 +01:00
Victorious3
cf2d612870 Fix TX Signature by adding additional prameters to every method and constructor 2023-03-24 14:51:57 +01:00
Victorious3
b55fc71811 Let generateClassFiles accept multiple arguments 2023-03-24 13:27:29 +01:00
pl@gohorb.ba-horb.de
79335449d0 modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
Statistics fertig (Version 1)
2023-03-23 12:00:04 +01:00
pl@gohorb.ba-horb.de
14606a846e 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
2023-03-22 19:01:36 +01:00
Andreas Stadelmeier
2b67230a15 Consider public and standard constructors ones 2023-03-21 16:31:45 +01:00
pl@gohorb.ba-horb.de
29b05b56cc Merge branch 'targetBytecode' into unif23 2023-03-21 16:29:14 +01:00
pl@gohorb.ba-horb.de
08b9fc0ea3 modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
statistics eingefuegt
2023-03-21 16:23:18 +01:00
Victorious3
6b767bc09b Fix using the wrong constructor 2023-03-21 15:06:17 +01:00
Victorious3
2dff7909ed Remove test file 2023-03-21 14:00:58 +01:00
Victorious3
d93836d110 Fix incorrect generics for derived FunN 2023-03-21 12:12:42 +01:00
Victorious3
b5af3a42a8 Fix wrong generic parameter on FunN3336 base class 2023-03-21 10:34:34 +01:00
pl@gohorb.ba-horb.de
070dd16999 modified: src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java 2023-03-21 10:30:13 +01:00
pl@gohorb.ba-horb.de
9d7e46925d modified: src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java 2023-03-21 10:26:55 +01:00
pl@gohorb.ba-horb.de
d780d322f0 modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
modified:   src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
2023-03-20 18:33:58 +01:00
pl@gohorb.ba-horb.de
867f3d39e8 modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
modified:   src/test/java/targetast/TestComplete.java
2023-03-20 16:05:28 +01:00
pl@gohorb.ba-horb.de
303246adce modified: README_aktuelle_Branches 2023-03-17 16:16:28 +01:00
pl@gohorb.ba-horb.de
48daa9731f modified: resources/AllgemeinTest/Pair.jav 2023-03-17 16:05:47 +01:00
pl@gohorb.ba-horb.de
9d03080667 Merge branch 'targetBytecode' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into targetBytecode
resources/AllgemeinTest/Pair.jav
2023-03-08 16:54:00 +01:00
pl@gohorb.ba-horb.de
02e596ce7e modified: ../../AllgemeinTest/Pair.jav
modified:   ../../../src/test/java/AllgemeinTest.java
2023-03-08 16:51:48 +01:00
Victorious3
acf4569908 Merge branch 'targetBytecode' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into targetBytecode 2023-03-08 16:28:50 +01:00
Victorious3
a77c64cea2 Add new type placeholder to referenced set 2023-03-08 16:28:34 +01:00
pl@gohorb.ba-horb.de
034faf1f66 Merge branch 'targetBytecode' of gohorb.ba-horb.de:/bahome/projekt/git/JavaCompilerCore into targetBytecode 2023-03-08 16:02:50 +01:00
pl@gohorb.ba-horb.de
88db5016bf modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
modified:   src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
logFile auf false gesetzt
2023-03-08 16:02:24 +01:00
Victorious3
3a05912dfe Whoops 2023-03-08 15:05:53 +01:00
Victorious3
40b04a4877 Remove print statement 2023-03-08 15:03:59 +01:00