Commit Graph

1875 Commits

Author SHA1 Message Date
Victorious3
99c46bf37f Fix console interface 2023-02-14 11:36:08 +01:00
Vic Nightfall
29f654279b Fix codegen a bit, and add missing constraints 2023-02-10 14:54:44 +01:00
pl@gohorb.ba-horb.de
239698c8d6 modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
modified:   src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPE.java
	modified:   src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
	modified:   src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
etwas aufgeraeumt
2023-02-08 17:39:45 +01:00
pl@gohorb.ba-horb.de
4074273ecb Merge branch 'targetBytecode' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into targetBytecode 2023-02-08 16:53:30 +01:00
pl@gohorb.ba-horb.de
2d117e24cf modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify2Task.java
modified:   src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
methodsignature so eingerichtet, dass die Constraints erst am Ende hinzugefuegt werden.
2023-02-08 16:52:23 +01:00
Victorious3
1c2e868589 Fix removing inner type variables 2023-02-07 12:22:37 +01:00
pl@gohorb.ba-horb.de
d39fd64f0f Merge branch 'targetBytecode' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into targetBytecode 2023-02-02 14:50:18 +01:00
pl@gohorb.ba-horb.de
e699fc36ae modified: src/main/java/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
modified:   src/main/java/de/dhbwstuttgart/syntaxtree/visual/OutputGenerator.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/constraints/Pair.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/TypeUnify2Task.java
	modified:   src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
2023-02-02 14:49:30 +01:00
Victorious3
64ec7989b4 Continue with eliminating inner type variables 2023-01-31 15:39:12 +01:00
Victorious3
5243b160f5 Didn't want to remove this 2023-01-31 15:00:09 +01:00
Victorious3
62fad15b6f We actually need the signature of the class 2023-01-31 14:53:02 +01:00
Victorious3
21fb477ee1 These are the defaults, actually 2023-01-31 14:25:37 +01:00
Victorious3
baec9999db Don't append new class files, overwrite them 2023-01-31 14:21:16 +01:00
Victorious3
a7720fbf20 Don't append new class files, overwrite them 2023-01-31 13:49:19 +01:00
pl@gohorb.ba-horb.de
0c9612a2ea modified: ../../../main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java 2023-01-31 11:18:52 +01:00
Victorious3
dabe7f269c Consider nested type variables for signature (usage) 2023-01-24 16:24:24 +01:00
Victorious3
a9f69ead5c Use signature in methodcall 2023-01-24 15:11:31 +01:00
pl@gohorb.ba-horb.de
04508a85f1 Bei NewClass ReturnType hinzuefuegt
modified:   src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java
	modified:   src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
2023-01-24 14:35:51 +01:00
Victorious3
9dca8ccdaa Fix parameter types in super call 2023-01-24 12:27:30 +01:00
Victorious3
8250f0cb51 Didn't mean to remove that 2023-01-24 12:17:21 +01:00
Victorious3
a26f466471 Fix 2023-01-24 12:16:34 +01:00
pl@gohorb.ba-horb.de
dc4b1c7b4f Merge branch 'targetBytecode' of gohorb.ba-horb.de:/bahome/projekt/git/JavaCompilerCore into targetBytecode 2023-01-24 12:06:16 +01:00
pl@gohorb.ba-horb.de
2448969426 In MethodCall argTypes durch signature ersetzt und ReturnType eingefuegt.
modified:   src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java
	modified:   src/main/java/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java
	modified:   src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
2023-01-24 12:05:26 +01:00
Victorious3
5e89ceeee8 Merge branch 'targetBytecode' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into targetBytecode 2023-01-24 11:55:55 +01:00
Victorious3
1ce180ce74 Change tests to umatch updated generics 2023-01-24 11:55:40 +01:00
pl@gohorb.ba-horb.de
2ab3becf44 Merge branch 'targetBytecode' of gohorb.ba-horb.de:/bahome/projekt/git/JavaCompilerCore into targetBytecode 2023-01-24 11:32:05 +01:00
pl@gohorb.ba-horb.de
3b77a1271b modified: src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java 2023-01-24 11:31:55 +01:00
Victorious3
9d20c0564c Get rid of inner type variables for methods 2023-01-23 16:04:19 +01:00
pl@gohorb.ba-horb.de
8be7f3d790 modified: ../../../src/main/java/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java 2023-01-23 15:14:39 +01:00
pl@gohorb.ba-horb.de
9e6b2e9ced modified: ../../../src/main/java/de/dhbwstuttgart/typeinference/assumptions/MethodAssumption.java
modified:   ../../../src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
2023-01-23 15:13:51 +01:00
Victorious3
69bdb4aa5b Consider environment of type variables in method call 2023-01-23 13:56:21 +01:00
pl@gohorb.ba-horb.de
8aa67594d9 modified: ../../../src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
argTypes in MethodCall werden gesetzt
2023-01-23 13:49:11 +01:00
pl@gohorb.ba-horb.de
8dfce15850 new file: ../../AllgemeinTest/VectorNotObject.jav
new file:   ../../AllgemeinTest/WildcardCaptureConversionTest.jav
	modified:   ../../../src/test/java/AllgemeinTest.java
2023-01-23 11:51:05 +01:00
pl@gohorb.ba-horb.de
d1fd65fad7 modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
Loeschungen angezeigt

	modified:   src/main/java/de/dhbwstuttgart/target/generate/ASTToTargetAST.java
Ansatz fuer Veraenderung des Algorithmus bei Generated Generics eingefuegt.

	modified:   src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPE.java
Loeschungen angezeigt

	modified:   src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
Loeschungen angezeigt

	modified:   src/test/java/targetast/TestComplete.java
tphTest eingfuegt
2023-01-18 18:11:45 +01:00
JanUlrich
752faaca86 Add jar-building to pom-file. Fix ConsoleInterface 2023-01-17 19:31:15 +01:00
pl@gohorb.ba-horb.de
a2d8ab35ae Merge branch 'targetBytecode' of gohorb.ba-horb.de:/bahome/projekt/git/JavaCompilerCore into targetBytecode 2023-01-17 17:22:46 +01:00
pl@gohorb.ba-horb.de
0944cf59fb modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
modified:   src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPE.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/FiniteClosure.java
	modified:   src/main/java/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java
	new file:   src/main/java/de/dhbwstuttgart/util/BiRelation.java
	renamed:    src/main/java/de/dhbwstuttgart/typeinference/unify/model/Pair.java -> src/main/java/de/dhbwstuttgart/util/Pair.java
2023-01-17 17:22:22 +01:00
Victorious3
abe7553c37 Add missing object bounds 2023-01-17 15:57:41 +01:00
Victorious3
43e8837308 Simplify tests by adding BoundsChain 2023-01-17 12:42:20 +01:00
Victorious3
268f2b72eb Merge branch 'targetBytecode' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into targetBytecode 2023-01-17 11:59:19 +01:00
Victorious3
d9bb0037b8 Improve genericcs tests 2023-01-17 11:58:59 +01:00
pl@gohorb.ba-horb.de
f0f3a91e27 Constraints fuer Generated Generics erzeugt und schreibt diese als Attribute methCallargTypesRetType in den Klassen TYPE, TypeStmt und JavaTXCompiler
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/TYPE.java
	modified:   src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
2023-01-11 18:51:55 +01:00
pl@gohorb.ba-horb.de
b9c7b888c1 Changes to be committed:
deleted:    src/test/java/targetast/Fun1$$.java
2023-01-11 11:14:49 +01:00
Victorious3
7aa7f94110 Add user defined generics to methods 2023-01-10 16:06:57 +01:00
Victorious3
229c6c523d Change file path to make the tests happy 2023-01-10 13:48:21 +01:00
Vic Nightfall
96ffc12ebc Merge with bigRefactoring 2023-01-04 16:07:48 +01:00
Vic Nightfall
f714589728 Remove unused imports 2023-01-04 15:47:04 +01:00
Vic Nightfall
f3e7fc0dc3 Test generics 2023-01-04 15:46:25 +01:00
Vic Nightfall
9f27d0d0fa Work on the generics tests 2022-12-06 17:44:39 +01:00
Andreas Stadelmeier
b41680dc84 Merge with targetBytecode, Set language level to Java 19 + preview-features 2022-11-28 13:38:31 +01:00