Commit Graph

763 Commits

Author SHA1 Message Date
JanUlrich
0896cf8236 StackMapTable funktioniert 2016-07-11 20:23:36 +02:00
JanUlrich
81c8764fc6 Aufräumen, neue BCEL-Version 2016-06-23 16:49:30 +02:00
JanUlrich
eb0da3c36a Aufräumen, neues Eclipse-Projekt anlegen 2016-06-22 20:29:16 +02:00
JanUlrich
e19dee4c99 Umstellung auf Intellij IDEA 2016-06-17 13:55:14 +02:00
JanUlrich
9d9526ae72 Testen von StackMapTable-Generator 2016-06-15 20:58:55 +02:00
JanUlrich
86a94dfae9 Merge branch 'unify' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into refactoring 2016-06-03 13:47:37 +02:00
JanUlrich
fe35a1f56d Merge mit bytecode 2016-06-03 13:47:22 +02:00
b6df854cc6 Stack wird pro Methode behandelt 2016-05-26 11:02:02 +02:00
JanUlrich
52b6f438b0 Merge mit Bytecode 2016-05-25 18:18:05 +02:00
JanUlrich
07ea25b5b7 Filtern von Constraints vor dem Karthesischen Produkt bilden 2016-05-25 17:46:33 +02:00
JanUlrich
0d51c3e94d Bug 49 und 52 fix 2016-05-24 00:36:59 +02:00
JanUlrich
b67816775e Merge branch 'refactoring' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into refactoring 2016-05-12 19:48:39 +02:00
JanUlrich
748f25a2fd gen-TPH richtig konvertieren 2016-05-12 19:48:19 +02:00
Florian Steurer
318f6e1cc5 code review todos erledigt 2016-05-06 16:59:59 +02:00
Martin Plümicke
223f6facc7 modified: ../../../src/de/dhbwstuttgart/bytecode/ClassGenerator.java
in addMethod :
String methodNameAndTypes = m.getName()+Arrays.toString(m.getArgumentTypes());
durch
String methodNameAndTypes = m.getReturnType().getSignature()+m.getName()+Arrays.toString(m.getArgumentTypes());
ersetzt
	modified:   OL.jav
Main-Klasse hinzugefuegt
2016-05-04 00:28:57 +02:00
JanUlrich
edda41f546 Generic Type Var werden zu PlaceholderTypen konvertiert 2016-05-03 22:43:43 +02:00
JanUlrich
5d760d4222 Aufruf im UnifyTest OverloadingVector ändern 2016-05-03 22:15:19 +02:00
Florian Steurer
005ed60c26 fixed vector 2016-05-03 21:07:52 +02:00
Florian Steurer
78794e377a fixed vector 2016-05-03 20:44:55 +02:00
ae01af7a40 Bugfix: OverloadingTest 2016-05-03 18:15:14 +02:00
JanUlrich
db93a1dfe1 Void Reference-Typen wieder zu Void RefTypes konvertieren 2016-05-03 13:58:54 +02:00
Florian Steurer
84176275be Merge branch 'unify' of ssh://i13029@gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unify 2016-05-03 13:43:16 +02:00
Florian Steurer
da49e42515 fixed long running times for lambda tests 2016-05-03 13:42:14 +02:00
JanUlrich
dc52dc5dec Merge branch 'bytecode' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into bytecode 2016-05-03 12:47:35 +02:00
JanUlrich
ca8952a43c Void Reference-Typen wieder zu Void RefTypes konvertieren 2016-05-03 12:46:32 +02:00
JanUlrich
4a6a8d62e3 Merge branch 'unify' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into refactoring 2016-05-03 12:42:04 +02:00
Florian Steurer
4f265b56a4 big refactoring of smaller and greater 2016-04-30 19:35:34 +02:00
e5fc8c8288 - Div und MulOperatoren für alle numerischen Datentypen implementiert (Nur wenn beide Operanten den gleichen Typ haben) 2016-04-30 11:14:24 +02:00
JanUlrich
c2d3fce75e FormalParameter getDiscription Fix 2016-04-29 16:52:35 +02:00
JanUlrich
8134bbb297 Merge branch 'bytecode' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into refactoring 2016-04-29 16:03:50 +02:00
JanUlrich
46f1134bad Aufräumen 2016-04-29 16:03:38 +02:00
32741f41e9 - Addition für alle Typen implementiert
- Mehrere Klassen in einer jav Datei möglich
- OLTest läuft
2016-04-29 15:52:20 +02:00
JanUlrich
d03e20df90 FunN Typen konvertieren. FunVoidN Typen werden nicht mehr benutzt 2016-04-29 15:23:42 +02:00
JanUlrich
d19414c513 Merge mit Bytecode 2016-04-29 14:05:25 +02:00
ba6ae74ad1 -Tests für for und While Schleife korrigiert
- While teilweise implementiert
2016-04-29 10:00:33 +02:00
JanUlrich
324864f8d8 FunN Typen werden zu den entsprechenden UnifyTypen konvertiert 2016-04-29 04:00:46 +02:00
JanUlrich
f2410154aa Merge branch 'unify' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into refactoring 2016-04-29 03:09:31 +02:00
Florian Steurer
b39dedb9aa added application of funN Rules 2016-04-28 21:33:33 +02:00
Florian Steurer
7c0a91e624 unitTest for lambda6, alternative sequential execution, minor bugs 2016-04-28 21:24:52 +02:00
Florian Steurer
c043717c06 removed todo 2016-04-28 21:04:58 +02:00
JanUlrich
9a51e79f2a Merge branch 'unify' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into refactoring 2016-04-28 16:42:16 +02:00
JanUlrich
a31e7b1108 BCEL Framework aktualisiert. FunN Typen implementieren 2016-04-28 15:32:12 +02:00
b3e13d09b9 - Alle Operatoren implementiert
- Tests für Sub, Mul, Div
2016-04-27 15:08:17 +02:00
5ac19d7a59 - args_size bugfix 2016-04-26 16:15:53 +02:00
8bda352bc9 - Method refactored 2016-04-25 14:58:52 +02:00
Florian Steurer
856f5da86b Parallelisierung mit Fork-Join Pool 2016-04-22 16:52:16 +02:00
Florian Steurer
7d75f18319 Parallelisierung mit Fork-Join Pool 2016-04-22 16:51:05 +02:00
Florian Steurer
8fa8fc8758 comment 2016-04-22 16:11:18 +02:00
Florian Steurer
752723020e pipe execution 2016-04-22 15:45:20 +02:00
Florian Steurer
6eb7f2d1bb removed creation of new strings 2016-04-22 10:24:33 +02:00
Florian Steurer
7b6b720b57 memory optimization 2016-04-21 22:31:36 +02:00
Florian Steurer
bb8df92cba equals / hashcode optimization 2016-04-21 22:19:48 +02:00
Florian Steurer
b8415b122b stringbuilder in logger 2016-04-21 20:26:33 +02:00
JanUlrich
629d2dcc4d Merge branch 'unify' into refactoring 2016-04-21 14:27:49 +02:00
JanUlrich
16cbf8e1b7 Fehler bei TPH Generierung behoben 2016-04-21 14:27:32 +02:00
JanUlrich
0ca4f16c49 Merge branch 'unify' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unify 2016-04-21 13:25:04 +02:00
Florian Steurer
1a32ea9ce9 size of unify result 2016-04-20 18:38:20 +02:00
JanUlrich
1afe2d4d5c Unnötige Kommentare löschen 2016-04-20 18:04:28 +02:00
Florian Steurer
d8feb04938 time log 2016-04-20 17:10:26 +02:00
JanUlrich
e08485740f Merge branch 'unify' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into refactoring 2016-04-20 14:48:03 +02:00
Florian Steurer
8780d5d47a option for parallelization 2016-04-20 12:15:04 +02:00
Florian Steurer
863bfa40d3 performance opt 2016-04-20 11:34:40 +02:00
Florian Steurer
6a42c8ef11 performance optimization 2016-04-20 11:25:45 +02:00
JanUlrich
07d63a9586 Merge mit bytecode 2016-04-19 16:59:59 +02:00
JanUlrich
fcbd05fa9c Im Unify generierte TPH beachten 2016-04-19 15:27:46 +02:00
JanUlrich
a8f18e77be Merge branch 'unify' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unify 2016-04-19 12:58:00 +02:00
Florian Steurer
904ca01207 cleaned up 2016-04-19 11:42:15 +02:00
JanUlrich
b70dc71a62 Convert zu FunNTypen hinzufügen 2016-04-18 15:38:47 +02:00
Florian Steurer
afc6bc7b89 neue abbruchbedingung 2016-04-14 15:15:21 +02:00
Florian Steurer
fbcd0cd8a5 Merge branch 'unify' of ssh://i13029@gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unify 2016-04-14 14:56:24 +02:00
Florian Steurer
12abb0b34d reduced cases of cart product 2016-04-14 14:54:59 +02:00
65a1038574 - Speichern einer lokalen Variable unter Verwenung der InstructionFactory 2016-04-14 14:53:18 +02:00
JanUlrich
9e114207ce Fehler mit SMALLER und SMALLERDOT behoben 2016-04-14 14:50:31 +02:00
a23f77c337 -Test für Variablen erstellt 2016-04-14 14:36:18 +02:00
JanUlrich
3cd7dba316 Merge branch 'unify' into refactoring 2016-04-14 14:03:15 +02:00
9a07201498 And, Or, Plus Operator implementiert 2016-04-14 12:00:15 +02:00
dfe79a8030 Equal Operator implementiert 2016-04-13 19:31:35 +02:00
Florian Steurer
e8c46dcdbd rename unify to typeUnify 2016-04-13 18:32:09 +02:00
Florian Steurer
558a873e68 commenting 2016-04-13 11:58:33 +02:00
Florian Steurer
b1febd7a50 commenting refactoring 2016-04-13 11:38:07 +02:00
Florian Steurer
ae9220c04b made the ruleSet interface functional (added fc in arguments) 2016-04-13 11:13:20 +02:00
11e149110a - OLTest verbessert, ist aber nicht positiv, da Autoboxing fehlt 2016-04-12 20:06:22 +02:00
Florian Steurer
d8e7df425d refactoring 2016-04-12 15:47:38 +02:00
Florian Steurer
27f6abefe8 commenting and refactoring 2016-04-12 15:43:32 +02:00
Florian Steurer
ba636e1da0 fixed bug in standard unify 2016-04-12 15:17:12 +02:00
JanUlrich
4173733ada Merge branch 'unify' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into refactoring 2016-04-12 14:00:53 +02:00
Florian Steurer
1b9a9c0841 commenting / refactoring 2016-04-12 13:39:08 +02:00
Florian Steurer
ff0d1e907f fixed flattening of sets 2016-04-12 13:21:17 +02:00
JanUlrich
7a47de7bfa Merge branch 'bytecode' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into refactoring 2016-04-12 12:14:38 +02:00
JanUlrich
b0aeaae80e Merge branch 'unify' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into refactoring 2016-04-12 11:54:46 +02:00
Florian Steurer
f8d7a95731 commenting 2016-04-12 11:36:43 +02:00
Florian Steurer
8b6a4d1746 refactoring and commenting 2016-04-12 11:28:07 +02:00
Florian Steurer
a16e62f4bd refactoring and commenting 2016-04-12 11:18:55 +02:00
Florian Steurer
ea32cd5680 commenting and refactoring 2016-04-12 11:12:57 +02:00
Florian Steurer
1e96811127 refactoring and commenting 2016-04-12 10:54:17 +02:00
JanUlrich
f630f93a3d Debug Ausgabe anfügen 2016-04-12 10:06:58 +02:00
JanUlrich
3bb2153b6a Java Parser an umbenennung anpassen 2016-04-11 18:36:43 +02:00
JanUlrich
6cc0d462ab Merge branch 'unify' into refactoring 2016-04-11 18:35:50 +02:00
JanUlrich
df1881bf41 Merge branch 'bytecode' into refactoring 2016-04-11 18:35:44 +02:00
JanUlrich
de238b90df Assumptions erweitern 2016-04-11 18:35:18 +02:00
Florian Steurer
55f288022a commenting, refactoring 2016-04-11 16:31:55 +02:00
Florian Steurer
0313d297e1 comments and refactoring 2016-04-11 16:26:59 +02:00
Florian Steurer
044e6fbc3f comments & refactoring 2016-04-11 16:05:36 +02:00
Florian Steurer
aa692c2f25 comments 2016-04-11 15:30:01 +02:00
Florian Steurer
6616d78dcb . 2016-04-11 09:56:29 +02:00
Florian Steurer
5dd90cb30c refactored standard unification 2016-04-11 09:56:06 +02:00
Florian Steurer
64247b689b signature from getLeftHandedType from type to string 2016-04-10 14:52:07 +02:00
Florian Steurer
23e0be2572 extended all cases / fixed random placeholder generation 2016-04-09 15:07:41 +02:00
Florian Steurer
d080eb4a0a extended case 6 2016-04-08 18:48:35 +02:00
Florian Steurer
41b3e4f6c2 extended case 5 2016-04-08 18:28:34 +02:00
Florian Steurer
5c73224f8f support for extended case 1 // tests // bugfix in "big" cases 2016-04-08 18:04:11 +02:00
Florian Steurer
b7f41c4d13 funN greater 2016-04-07 22:30:30 +02:00
Florian Steurer
53cfb4b046 Support for FunN in FC added // swap for unifiers 2016-04-07 22:24:35 +02:00
b707a0f03e Bugfix: Methodenparameter 2016-04-07 15:44:29 +02:00
JanUlrich
d3ebee1b3c Merge branch 'bytecode' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into refactoring 2016-04-07 14:55:46 +02:00
45cad9f675 - getDescription ist nicht die Descripiton im Bytecode 2016-04-07 14:53:29 +02:00
JanUlrich
74c2b5e323 Merge branch 'bytecode' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into refactoring 2016-04-07 14:52:04 +02:00
JanUlrich
e537a76cd9 Merge branch 'unify' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into refactoring 2016-04-07 14:39:15 +02:00
JanUlrich
44318ee5d8 Aufräumen 2016-04-07 14:39:07 +02:00
Florian Steurer
8d69f6c82b adapt rule fixed 2016-04-07 14:30:23 +02:00
7b78cf8471 Bugfix: Store and Load 2016-04-07 12:19:42 +02:00
JanUlrich
3a8f1252a4 Merge branch 'bytecode' into refactoring 2016-04-06 14:23:26 +02:00
JanUlrich
e1c925b9bc Unnötige Kommentare löschen 2016-04-06 12:42:15 +02:00
Florian Steurer
6793b0bd24 rename mpair to unify pair / refactoring 2016-04-04 11:23:14 +02:00
Florian Steurer
2e30429252 added wildcardtype 2016-04-04 10:18:34 +02:00
Florian Steurer
20d1106e07 refactored Types // 2016-04-03 22:43:55 +02:00
Florian Steurer
6c2d71d005 random with seed 2016-04-03 17:36:44 +02:00
Florian Steurer
0d5b515a47 added extra set level / fixed subst rule bug / 2016-04-03 16:53:45 +02:00
Florian Steurer
b12f301656 Merge branch 'unify' of ssh://i13029@gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unify 2016-04-02 11:29:43 +02:00
Florian Steurer
0be7534b98 . 2016-04-02 11:29:31 +02:00
JanUlrich
a3e7b4567a Merge mit refactoring 2016-04-01 18:21:51 +02:00
JanUlrich
4cdcde8fef Neuen Unify Algorithmus eingebaut 2016-04-01 16:12:30 +02:00
Florian Steurer
d89d06797e isInSolvedForm(), Unit-Tests, removed PairOp.Equals 2016-03-31 22:09:46 +02:00
098cafac00 - IdentityFieldTest erstellt 2016-03-31 18:08:48 +02:00
JanUlrich
4deb91b99f Merge branch 'bytecode' into refactoring 2016-03-31 11:50:53 +02:00
8d8e27c84c - Bugfix new Statement, Deskription darf nicht mit Semikolon enden 2016-03-31 08:52:23 +02:00
JanUlrich
e2d384e7f9 Merge mit Unify und Einbinden der neuen Unifizierung. Nich lauffähige Version 2016-03-30 18:16:27 +02:00
Florian Steurer
304a5693a6 wc regeln angepasst, triviale tests fertig 2016-03-30 16:25:26 +02:00
5b07d58093 - Klassenvariable ohne Wert 2016-03-30 10:14:05 +02:00
b51079280e - New Statement, Problem Syntax des Klassennamens 2016-03-30 10:09:17 +02:00
Florian Steurer
23142adc70 reduce rules 2016-03-29 17:52:38 +02:00
JanUlrich
43a8c9e647 Umstellung auf MPair beginnen 2016-03-29 13:23:15 +02:00
JanUlrich
fa337c5546 Umstellung auf MPair beginnen 2016-03-29 13:23:05 +02:00
Florian Steurer
639ac8430c adapted adaptRules 2016-03-28 20:56:24 +02:00
Florian Steurer
332dd57de3 greater und testy 2016-03-28 15:00:34 +02:00
Florian Steurer
ac3ce7d214 smaller 2016-03-28 11:40:21 +02:00
b4d7ab02eb - UnitTest für MultiExtends Problem
- Verhindern von doppelten Methoden von Class -> ClassGen
2016-03-28 10:33:04 +02:00
Florian Steurer
26cc9b85ef smalller und neue testcases 2016-03-28 01:01:46 +02:00
Florian Steurer
5e18496847 smaller and test cases 2016-03-26 12:59:38 +01:00
Florian Steurer
bbfd8699e8 smaller / smArg / grArg / TODO: greater 2016-03-26 00:03:26 +01:00
JanUlrich
ad2804fab9 Umstellung auf MPair beginnen 2016-03-24 11:57:31 +01:00
JanUlrich
1e9d0517f2 Umstellung auf MPair beginnen 2016-03-24 11:57:17 +01:00
Florian Steurer
a5b86dc84c freshPlaceholder / implemented funn rules 2016-03-23 11:44:31 +01:00
Florian Steurer
11bcf5735a freshPlaceholder Method // funN rules (not implemented yet) 2016-03-23 10:59:41 +01:00
Florian Steurer
88726ccb70 added funN 2016-03-23 09:45:36 +01:00
Florian Steurer
14e00913e8 application of new rules 2016-03-22 20:47:39 +01:00
Florian Steurer
0e524caae7 Added missing rules 2016-03-22 20:41:24 +01:00
JanUlrich
f788b74f26 Merge mit Unify und Bytecode 2016-03-22 15:13:51 +01:00
JanUlrich
47c9be5488 Aufräumen 2016-03-22 13:17:56 +01:00
c80dc162d9 - Verhindern von der Generierung von doppelte Methoden 2016-03-20 18:55:36 +01:00
Florian Steurer
21c6aef7fd cartesische produkte überarbeitet 2016-03-20 18:05:34 +01:00
Florian Steurer
299f8f56ca added missing cases 2016-03-20 15:09:12 +01:00
JanUlrich
1f825360df Test GenerateFiniteClosure anfügen 2016-03-17 16:54:43 +01:00
Florian Steurer
fa9627b883 unify case 1 2016-03-17 16:35:33 +01:00
Florian Steurer
d19a79bd63 finite closure greater smaller funktioniert jetzt auch mit wildcards
(muss noch getestet werden)
2016-03-16 23:27:45 +01:00
JanUlrich
1762101330 Type Factory in unifyNew bewegen 2016-03-16 14:56:02 +01:00
JanUlrich
e061dea7f5 Aufräumen SourceFile 2016-03-16 14:54:41 +01:00
JanUlrich
a8d8dec899 Merge branch 'unify' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into refactoring 2016-03-15 13:57:21 +01:00
Florian Steurer
6acc3c1366 step 4 rule 1 2016-03-14 14:46:10 +01:00
Florian Steurer
863904a4e8 unifier fixed (no iterated application necessary anymore) 2016-03-14 12:59:31 +01:00
Florian Steurer
6778160315 various 2016-03-13 23:01:28 +01:00
Florian Steurer
27acee3385 standard martelli montanari unifiy fixed 2016-03-13 16:00:00 +01:00
JanUlrich
b1d6b44fb9 BCEL Library aktualisiert, Stackmaptable angefügt, Tests angepasst 2016-03-10 15:28:03 +01:00
JanUlrich
a4ea466fe6 Methode generiert StackMapTable 2016-02-18 18:28:08 +01:00
JanUlrich
7c00940cba Merge branch 'unify' into refactoring 2016-01-12 13:32:45 +01:00
Florian Steurer
bdd018d922 regel 4 für paare (a <. Theta') (funktioniert zu 99 Prozent noch nicht
richtig)
2015-12-27 15:01:59 +01:00
Florian Steurer
98cbe9b389 package rename + Mapping Klasse 2015-12-27 00:29:23 +01:00
Florian Steurer
039dd3b3f4 step 5 and 6 implemented 2015-12-26 18:49:11 +01:00
Florian Steurer
8eecda2a8f subst rule 2015-12-26 16:52:18 +01:00
Florian Steurer
3ff45a01de fixed cartesian products in step 4 2015-12-26 16:22:35 +01:00
Florian Steurer
264910bfa4 tests 2015-12-23 22:53:24 +01:00
Florian Steurer
89b53351ce martelli montanari unifikation 2015-12-23 13:25:43 +01:00
Florian Steurer
ab7f56db6f martelli montanari unification (unfinished) 2015-12-21 15:44:13 +01:00
JanUlrich
ac42bdf0a2 Merge mit Unify und Bytecode 2015-12-11 15:44:44 +01:00
JanUlrich
bb165e007d Filter entfernen 2015-12-08 15:48:35 +01:00
JanUlrich
5f428894ea Merge mit bytecode 2015-12-08 13:34:16 +01:00
116232df57 AutoOverloadingVector Test hinzugefügt 2015-12-05 15:15:28 +01:00
Florian Steurer
53dd7b019e cartesian products 2015-11-27 19:52:59 +01:00
3c80cb275b Doppelte Methodengenerierungen verhindert 2015-11-27 18:10:46 +01:00
JanUlrich
1017b02704 Fehler in Bytecodegen der Methode beheben 2015-11-27 16:53:01 +01:00
dd478961e2 TypeinferenceResultSet von ClassGenerator getrennt 2015-11-27 16:10:35 +01:00
JanUlrich
141e952c7a Merge mit refactoring 2015-11-27 15:47:09 +01:00
8ae7bda535 Mehrere Lösungen in einer Classfile 2015-11-25 10:41:57 +01:00
a27b4f9d3b Mehrere Lösungen in einer Classfile 2015-11-25 10:23:06 +01:00
e4374c06fd Mehrere Lösungen in einer Classfile 2015-11-25 09:41:26 +01:00
Florian Steurer
97e0e2fc72 unifyTest 2015-11-23 01:03:01 +01:00
Florian Steurer
7ff9554d78 application of adaptRules 2015-11-23 00:15:12 +01:00
Florian Steurer
4576efe3ec implemented step 4 (some cases still missing) 2015-11-23 00:12:08 +01:00
Florian Steurer
e2ba4490b1 step 4 grundgerüst 2015-11-22 21:57:16 +01:00
Florian Steurer
6fd382580a Fixed AdaptSup 2015-11-22 15:58:10 +01:00