Martin Plümicke
aac113e12e
Merge branch 'plugin' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into strucTypesNew
...
src/de/dhbwstuttgart/core/JavaTXCompiler.java
src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java
src/de/dhbwstuttgart/syntaxtree/GenericDeclarationList.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.
2018-06-08 14:37:04 +02:00
Aldaron7
413cb48a96
updates to strukture.
2018-06-06 21:22:09 +02:00
Martin Plümicke
3f2558d21e
new file: Website/Installation/install.html
...
new file: Website/JavaTXExamples.zip
new file: Website/index.html
new file: Website/install/Restart.png
new file: Website/install/availableSoftware1.png
new file: Website/install/availableSoftware2.png
new file: Website/install/instal.html
new file: Website/install/install.html
new file: Website/install/installAnyway.png
new file: Website/install/installationDetails.png
new file: Website/install/licenseAgreement.png
new file: Website/install/newsoftware.png
new file: Website/install/selectInstallation.png
new file: Website/newJavaTXProject/addLibrary2.png
new file: Website/newJavaTXProject/buildPath1.png
new file: Website/newJavaTXProject/buildPath2.png
new file: Website/newJavaTXProject/buildPath3.png
new file: Website/newJavaTXProject/buildPath4.png
new file: Website/newJavaTXProject/newJavFile.png
new file: Website/newJavaTXProject/newJavFolder1.png
new file: Website/newJavaTXProject/newJavFolder2.png
new file: Website/newJavaTXProject/newJavaTXProject.html
new file: Website/newJavaTXProject/newJavaTXProject.png
new file: Website/usePlugin/usePlugin.html
new file: Website/usePlugin/usePlugin1.png
new file: Website/usePlugin/usePlugin2.png
modified: test/bytecode/javFiles/OL.jav
2018-06-01 16:57:35 +02:00
Aldaron7
24f93f0bcb
updated project structure. Implemented trans.
2018-05-31 15:13:39 +02:00
Aldaron7
f44f08b895
TYPEExpr fixed for newClass.
2018-05-30 23:50:32 +02:00
Aldaron7
7a5940ac65
cherrypick ee1fa17
Typegenerator
2018-05-30 15:51:25 +02:00
Aldaron7
25a5e79509
update solve (not fixed).
2018-05-30 15:36:28 +02:00
Aldaron7
7e1d6fad01
solve tNew generics superclass and interfaces added.
2018-05-30 12:39:11 +02:00
Aldaron7
23ae5d5745
returntypevisitor added. restructuring.
2018-05-30 09:00:46 +02:00
Martin Plümicke
bb26112a9b
modified: ../../../target/JavaTXcompiler-0.1-jar-with-dependencies.jar
...
modified: Fac.jav
modified: Faculty.jav
modified: OL.jav
modified: While.jav
modified: ../../javFiles/AddLong.jav
2018-05-30 00:27:20 +02:00
Martin Plümicke
97d893e66b
Merge branch 'plugin' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into plugin
...
merge
2018-05-28 16:36:46 +02:00
JanUlrich
63ac79f02c
Hotfix für Typparsen Problem
2018-05-28 16:21:52 +02:00
Martin Plümicke
66587a8f71
modified: src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
SMALERNEQDOT in Regel a <!=. Theta korrigiert
SMALERNEQDOT in Regel Theta <!=. a geloescht
2018-05-28 16:07:29 +02:00
Martin Plümicke
581e5e574e
Merge branch 'bytecode2' into plugin
2018-05-25 14:41:22 +02:00
Martin Plümicke
9d53d9d5d1
modified: src/de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java
...
kleiner Fehler korrigiert
modified: test/javFiles/Matrix.jav
2018-05-25 11:16:02 +02:00
Fayez Abu Alia
58f5e17ab5
FacTest.java
2018-05-25 10:01:44 +02:00
Fayez Abu Alia
6fce2760c5
While.jav
2018-05-25 09:53:30 +02:00
Fayez Abu Alia
f085f9f499
Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecode2
2018-05-24 16:44:28 +02:00
Fayez Abu Alia
a40d2b991f
kleine Änderung
2018-05-24 16:44:05 +02:00
Martin Plümicke
704415ae3b
Merge branch 'unifyOptimierung' into plugin
...
fixed test/javFiles/Matrix.jav
2018-05-24 16:43:31 +02:00
Martin Plümicke
65531ac12e
modified: ../../src/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
...
modified: ../../src/de/dhbwstuttgart/typeinference/constraints/Pair.java
modified: ../../src/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
modified: ../../src/de/dhbwstuttgart/typeinference/unify/RuleSet.java
modified: ../../src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
modified: ../../src/de/dhbwstuttgart/typeinference/unify/model/PairOperator.java
Einführung eines neuen Operators SMALLERNEQDOT um Ungleichungen a <!=. Number für die Relationsoperatoren einfuehren zu koennen.
modified: ../../test/javFiles/Matrix.jav
2018-05-24 16:20:57 +02:00
Martin Plümicke
34e632b872
modified: ../../src/de/dhbwstuttgart/core/JavaTXCompiler.java
...
Reduce ausgetauscht bei ArgPara und Returntype
modified: ../../src/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
modified: ../../src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
isUndefinedPair korrigiert.
modified: ../../test/bytecode/LambdaTest.java
modified: ../../test/bytecode/javFiles/Plus.jav
modified: ../../test/bytecode/javFiles/RelOps.jav
2018-05-24 14:11:04 +02:00
Martin Plümicke
3470215bae
Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecode2
2018-05-24 10:48:57 +02:00
Martin Plümicke
f5398fa8e9
deleted: ../../test/logFiles/log
2018-05-24 10:34:50 +02:00
Martin Plümicke
f617ad8946
modified: ../../src/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
...
Relationen auf verschiedene Numeric-Typen umgestellt
im equals Null abgefragt
2018-05-24 10:28:22 +02:00
Martin Plümicke
876ec6a4f6
Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unifyOptimierung
...
Conflicts:
src/de/dhbwstuttgart/core/JavaTXCompiler.java
solved
2018-05-24 09:41:15 +02:00
Martin Plümicke
26d9b1215f
modified: ../../src/de/dhbwstuttgart/typeinference/unify/RuleSet.java
...
modified: ../../src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
modified: ../../src/de/dhbwstuttgart/typeinference/unify/interfaces/IFiniteClosure.java
modified: ../../src/de/dhbwstuttgart/typeinference/unify/model/ExtendsType.java
modified: ../../src/de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java
modified: ../../src/de/dhbwstuttgart/typeinference/unify/model/FunNType.java
modified: ../../src/de/dhbwstuttgart/typeinference/unify/model/PlaceholderType.java
modified: ../../src/de/dhbwstuttgart/typeinference/unify/model/ReferenceType.java
modified: ../../src/de/dhbwstuttgart/typeinference/unify/model/SuperType.java
modified: ../../src/de/dhbwstuttgart/typeinference/unify/model/UnifyType.java
modified: ../../test/javFiles/Matrix.jav
F-Bounded angefangen
2018-05-24 09:17:31 +02:00
Fayez Abu Alia
0f29bc038a
Bugs gefixt. Tests für relationalen Operatoren(GreaterEqualTest, ...) laufen.
...
Für Typplaceholder werden Generics verwendet.
Neue Tests angefügt.
2018-05-23 15:38:41 +02:00
Martin Plümicke
a5ed5a2a46
Merge branch 'unifyOptimierung' into plugin
2018-05-22 17:29:44 +02:00
Martin Plümicke
c597b0430a
modified: ../../src/de/dhbwstuttgart/core/JavaTXCompiler.java
...
cardProd als Variable eingfuegt
modified: ../../src/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java
toString() eingfuegt
modified: ../../src/de/dhbwstuttgart/syntaxtree/GenericDeclarationList.java
toString() eingfuegt
modified: ../../src/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
BinaryOp <. statt =.
modified: ../../src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
Bei nicht importierten (result []) undefinPair gesetzt
modified: ../javFiles/Matrix.jav
falsche importe rausgenommen
2018-05-22 17:10:07 +02:00
Martin Plümicke
7ea6777906
modified: ../../src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
modified: ../javFiles/Lambda.jav
modified: ../typeinference/UnifyTest.java
2018-05-18 13:12:49 +02:00
Martin Plümicke
6b1896f58c
modified: src/de/dhbwstuttgart/typeinference/unify/RuleSet.java
...
modified: src/de/dhbwstuttgart/typeinference/unify/distributeVariance.java
greaterFUNN und smallFUNN fuer generierte TPHs Variance gesetzt
modified: test/javFiles/Lambda.jav
vom bytecode ruebergeholt
2018-05-18 09:55:45 +02:00
Martin Plümicke
8baff8f376
modified: ../../src/de/dhbwstuttgart/core/JavaTXCompiler.java
...
Variancenvererbung eingefuegt
modified: ../../src/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
Variancenvererbung geloescht
modified: ../../src/de/dhbwstuttgart/typeinference/unify/model/PlaceholderType.java
modified: ../../test/typeinference/UnifyTest.java
2018-05-17 22:51:41 +02:00
Aldaron7
427a87598c
solve added
2018-05-17 21:35:14 +02:00
Martin Plümicke
bc2cab8c95
modified: src/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: src/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
modified: src/de/dhbwstuttgart/typeinference/unify/model/PlaceholderType.java
modified: test/javFiles/Lambda.jav
modified: test/javFiles/Lambda3.jav
2018-05-17 18:07:21 +02:00
Martin Plümicke
51a2acdbaf
modified: src/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: test/typeinference/UnifyTest.java
2018-05-17 11:42:03 +02:00
Martin Plümicke
87dbcfdad4
Merge branch 'unifyOptimierung' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unifyOptimierung
...
Merge
2018-05-09 18:10:17 +02:00
Martin Plümicke
8048af2106
modified: ../../test/javFiles/Lambda2.jav
...
modified: ../../test/typeinference/UnifyTest.java
2018-05-09 18:10:08 +02:00
Martin Plümicke
da4c59f2cf
modified: ../../src/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
...
modified: ../../test/typeinference/UnifyTest.java
2018-05-09 16:24:28 +02:00
Martin Plümicke
1c22fc7d57
Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unifyOptimierung
...
merge bytecode2
2018-05-09 13:29:11 +02:00
Martin Plümicke
0b7aea21d9
modified: ../../test/bytecode/LambdaTest.java
...
modified: ../../test/bytecode/javFiles/Lambda2.jav
2018-05-08 18:52:43 +02:00
Fayez Abu Alia
521a1cbf3b
Bug 77 gefixt
2018-05-08 17:42:58 +02:00
Fayez Abu Alia
49ea4ee283
Pfad der erzeugten klassendateien angepasst
2018-05-08 10:19:13 +02:00
Martin Plümicke
225dc16a89
modified: test/typeinference/UnifyTest.java
2018-05-08 09:23:20 +02:00
Martin Plümicke
4738add4fc
modified: ../../../../../test/javFiles/Matrix.jav
...
modified: ../../../../../test/typeinference/UnifyTest.java
2018-05-07 15:31:31 +02:00
Aldaron7
ab46709390
Fixed Construct. Added Structure for TUnify. Implemented refl.
2018-05-06 19:06:41 +02:00
Fayez Abu Alia
a785c85d42
tests
2018-05-02 20:54:07 +02:00
Martin Plümicke
ec2b501e63
new file: test/javFiles/LambdaField.jav
...
modified: test/typeinference/UnifyTest.java
Lambda-Ausdruck als Attribute/field eingefuegt
2018-04-26 15:10:23 +02:00
Martin Plümicke
8be4f94edf
modified: test/javFiles/Matrix.jav
...
In Matrix.jav Binary-Operation eingefuegt.
new file: test/javFiles/Meth_Gen.jav
new file: test/typeinference/Meth_GenTest.java
Test zu Constraints ueber eine Methode hinaus
2018-04-25 23:32:12 +02:00
Fayez Abu Alia
1b6cae1be0
GenTest angefügt
2018-04-25 16:44:27 +02:00