Martin Plümicke
666bf26594
Merge branch 'bigRefactoring' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into plugin
2019-02-20 17:54:04 +01:00
Martin Plümicke
fcad60996c
modified: de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java
2019-02-20 17:53:45 +01:00
Martin Plümicke
29963dfbc3
Merge branch 'bigRefactoring' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into plugin
2019-02-20 17:51:57 +01:00
Martin Plümicke
82d8ecba74
BigRefacoring branch hard rueberkopiert
2019-02-20 17:50:06 +01:00
Martin Plümicke
9c648546e4
modified: de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
modified: de/dhbwstuttgart/typeinference/unify/RuleSet.java
modified: de/dhbwstuttgart/typeinference/unify/TypeUnify.java
modified: de/dhbwstuttgart/typeinference/unify/TypeUnify2Task.java
modified: de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
FileWriter durch Writer ersetzt
2019-02-20 17:36:07 +01:00
Martin Plümicke
926d911d21
modified: ../bytecode/MatrixTest.java
2019-02-20 15:08:06 +01:00
Pluemicke Martin
42aee3dbec
Merge branch 'bigRefactoring' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into plugin
...
modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.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/unify/RuleSet.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify.java
new file: 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/UnifyResultEvent.java
new file: src/main/java/de/dhbwstuttgart/typeinference/unify/UnifyResultListenerImpl.java
new file: src/main/java/de/dhbwstuttgart/typeinference/unify/UnifyResultModel.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/interfaces/IRuleSet.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java
2019-02-20 14:59:56 +01:00
Martin Plümicke
72705ac868
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify2Task.java
...
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
close log-Files
TypeUnifyTask in TypeUnify2Task bei Abarbeitung oderconstraints umgetauscht
2019-02-20 09:40:06 +01:00
Pluemicke Martin
87547fdcd6
modified: src/test/resources/bytecode/javFiles/Id.jav
...
modified: src/test/resources/bytecode/javFiles/Matrix.jav
modified: src/test/resources/bytecode/javFiles/OL.jav
2019-02-20 09:25:10 +01:00
Martin Plümicke
362e797b10
modified: ../../../main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
2019-02-19 17:51:11 +01:00
Martin Plümicke
1f12aaec82
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
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java
Einen Fall ? extends/super a <.? a ergaenzt bei dem compare falsches Ergbnis geliefret hat
2019-02-18 22:36:06 +01:00
Martin Plümicke
08d69ce6e3
modified: ../../../main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify.java
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/UnifyResultModel.java
zurueckumwandlung von den Unifytypen in UnifyResultModel verlegt.
2019-02-17 08:51:23 +01:00
Martin Plümicke
396efb52de
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/interfaces/IRuleSet.java
subst-Anwendung auf oderconstraints eingebaut
2019-02-15 00:00:41 +01:00
Martin Plümicke
db91e73750
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
aParDef wird auch ausgewertet
modified: src/test/resources/bytecode/javFiles/MatrixOP.jav
2019-02-06 18:15:39 +01:00
Martin Plümicke
e52181a0c7
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify2Task.java
...
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
modified: ../../resources/bytecode/javFiles/Matrix.jav
2019-02-04 23:32:52 +01:00
Michael Uhl
fde462eb16
Merge branch 'unify-Test' into plugin
...
# Conflicts:
# pom.xml
# src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
2019-02-01 21:18:52 +01:00
Martin Plümicke
33f2bf3d21
modified: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/UnifyResultListenerImpl.java
Asynchrone Variante soweit ok
2019-01-31 15:08:36 +01:00
Martin Plümicke
aa0b157374
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/TypeUnifyTask.java
new file: src/main/java/de/dhbwstuttgart/typeinference/unify/UnifyResultListenerImpl.java
modified: src/test/resources/bytecode/javFiles/MatrixOP.jav
Erster Ansatz asyncrone Threads
2019-01-30 09:11:33 +01:00
Pluemicke Martin
aaae762ca8
Merge branch 'unify-test' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unify-test
...
src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
solved
2019-01-29 15:02:59 +01:00
Martin Plümicke
9e1d58f4b1
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/model/FiniteClosure.java
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/model/OrderingUnifyPair.java
Threads soweit fertig
2019-01-29 14:51:19 +01:00
Pluemicke Martin
7f239d11ee
Merge branch 'unify-test' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unify-test
2019-01-29 14:48:54 +01:00
Pluemicke Martin
ca7c76a99a
geändert: src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
...
geändert: src/main/java/de/dhbwstuttgart/typeinference/constraints/ConstraintSet.java
geändert: src/main/java/de/dhbwstuttgart/typeinference/constraints/Pair.java
geändert: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify.java
geändert: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnify2Task.java
geändert: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
geändert: src/main/java/de/dhbwstuttgart/typeinference/unify/UnifyResultModel.java
2019-01-29 14:47:20 +01:00
Martin Plümicke
26634bb038
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/UnifyResultModel.java
2019-01-25 22:26:38 +01:00
Martin Plümicke
9dcb1f76ca
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/UnifyResultModel.java
2019-01-25 22:22:16 +01:00
Martin Plümicke
e0da6b3d31
Merge branch 'unify-test' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unify-test
2019-01-25 22:21:04 +01:00
Martin Plümicke
3c0beabc1b
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/RuleSet.java
...
reduce2 nochmals angepasst
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
- Fehler behoben
- In den Thread nur noch Element von nextSet verschieben, die auf alle Faele berechnet werdne muessen
2019-01-25 22:19:32 +01:00
Michael Uhl
e83d59d97d
Observer Pattern für ResultSet.
2019-01-24 11:16:26 +01:00
Michael Uhl
3ad51f952e
Observer Pattern für ResultSet.
2019-01-23 22:28:07 +01:00
Michael Uhl
449a11f433
Observer für TypeResults.
2019-01-23 22:25:30 +01:00
Martin Plümicke
25487469c7
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/RuleSet.java
...
reduceEq-Regel korrigiert
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
Threads soweit fertig
2019-01-23 01:31:25 +01:00
Martin Plümicke
188ea1f7f8
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
einige Aenderungen, die parallele Verarbeitung ermoeglicht
2019-01-20 21:49:22 +01:00
Martin Plümicke
cf951043ef
modified: src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
2019-01-18 00:54:43 +01:00
Martin Plümicke
38d4481756
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
Es muss noch geklaert werden, wann ein neuer Thread generiert werden darf.
modified: ../../resources/bytecode/javFiles/MatrixOP.jav
2019-01-16 22:57:24 +01:00
Pluemicke Martin
01891c9513
neue Datei: TypeUnify2Task.java
2019-01-16 20:25:54 +01:00
Martin Plümicke
aae2e5244b
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/TypeUnifyTask.java
Erster Ansatz Parallelisierung
2019-01-16 17:39:01 +01:00
Martin Plümicke
8c517e7f4a
new file: ../../../main/java/de/dhbwstuttgart/typeinference/unify/model/hashKeyType.java
...
modified: ../../resources/bytecode/javFiles/VectorSuper.jav
2019-01-16 10:27:15 +01:00
Martin Plümicke
b3622df2fd
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
2019-01-15 22:45:58 +01:00
Martin Plümicke
fa42a69374
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
...
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/model/FiniteClosure.java
- Hastables fuer greater und smaller eingefuehrt
- ? extends/super a <. a = -1 hinzugefuegt
2019-01-15 15:58:39 +01:00
Martin Plümicke
eb43a616e2
new file: ../../../java/bytecode/VectorSuperTest.java
...
new file: VectorSuper.jav
2019-01-13 19:22:48 +01:00
Martin Plümicke
faccdf5896
Ordnung fuer Variablen unterschieden, ob sie innere Typen sind oder nicht
...
modified: ../../core/JavaTXCompiler.java
modified: UnifyTypeFactory.java
Bestimmung welche Typevariablen innere Typen sind
modified: ../../typeinference/unify/TypeUnifyTask.java
modified: ../../typeinference/unify/model/OrderingUnifyPair.java
Ordnungsfunktion geaendert
modified: ../../typeinference/unify/model/PlaceholderType.java
modified: ../../typeinference/unify/model/UnifyPair.java
2019-01-13 00:42:33 +01:00
Martin Plümicke
6de1c50542
modified: ../../../../main/java/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
...
Auswahl des Tphs bei der Abfrage, ob ein größerer oder kleinerer Typ des vorherigen bestimmt wurde
korrigiert
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
modified: ../../../../main/java/de/dhbwstuttgart/typeinference/unify/model/PlaceholderType.java
innerType eingeführt
modified: ../../bytecode/javFiles/MatrixOP.jav
deleted: ../Field.java
deleted: ../Import.java
deleted: ../Lam1.java
deleted: ../LamRun.java
deleted: ../MethFieldVar.java
deleted: ../Subclass.java
deleted: ../SuperTest.java
deleted: ../Superclass.java
deleted: ../TestMyTest.java
deleted: ../testF.java
deleted: ../testTets.java
deleted: ../testTetsF.java
2019-01-12 18:19:16 +01:00
Martin Plümicke
58d757398d
modified: ../../../main/java/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
...
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/model/PlaceholderType.java
zurueck zum alten Zustand
2019-01-11 23:00:27 +01:00
Martin Plümicke
755fd5c821
modified: ../../../main/java/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
...
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/model/PlaceholderType.java
deleted: ../javFiles/AddLong.jav
deleted: ../javFiles/EmptyClass.jav
deleted: ../javFiles/EmptyMethod.jav
deleted: ../javFiles/Expressions.jav
deleted: ../javFiles/FC_Matrix.jav
deleted: ../javFiles/Faculty.jav
deleted: ../javFiles/FacultyIf.jav
deleted: ../javFiles/FacultyTyped.jav
deleted: ../javFiles/Fields.jav
deleted: ../javFiles/Generics.jav
deleted: ../javFiles/IfTest.jav
deleted: ../javFiles/Import.jav
deleted: ../javFiles/Lambda.jav
deleted: ../javFiles/Lambda2.jav
deleted: ../javFiles/Lambda3.jav
deleted: ../javFiles/LambdaField.jav
deleted: ../javFiles/LambdaRunnable.jav
deleted: ../javFiles/ListenerOverload.jav
deleted: ../javFiles/Matrix.jav
deleted: ../javFiles/Meth_Gen.jav
deleted: ../javFiles/MethodCallGenerics.jav
deleted: ../javFiles/Methods.jav
deleted: ../javFiles/MethodsEasy.jav
deleted: ../javFiles/Op1.jav
deleted: ../javFiles/Package.jav
deleted: ../javFiles/Sorting.jav
deleted: ../javFiles/Subclass.jav
deleted: ../javFiles/Superclass.jav
deleted: ../javFiles/Vector.jav
deleted: ../javFiles/fc.jav
deleted: ../javFiles/mathStruc.jav
deleted: ../javFiles/test.jav
deleted: ../javFiles/test1.jav
2019-01-11 22:52:39 +01:00
Martin Plümicke
c1e4f14fa4
Merge branch 'unify-test' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unify-test
2019-01-11 19:27:19 +01:00
Martin Plümicke
7d514d617c
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
modified: ../../../main/java/de/dhbwstuttgart/typeinference/unify/model/UnifyPair.java
Nur log-Ausgaben hinzugefuegt
2019-01-11 19:24:23 +01:00
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
