From f51b5d5b7cb78d58784849e029115d057f1f9aa8 Mon Sep 17 00:00:00 2001 From: JanUlrich Date: Thu, 17 Jul 2014 20:17:59 +0200 Subject: [PATCH] =?UTF-8?q?Class=20f=C3=BCgt=20Assumptions=20von=20Paralis?= =?UTF-8?q?t=20richtig=20hinzu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/.gitignore | 5 ----- src/mycompiler/myclass/Class.java | 5 ++++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/bin/.gitignore b/bin/.gitignore index 865e7f60..200b7277 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,6 +1 @@ -/bytecode /mycompiler -/plugindevelopment -/syntaxTree -/typinferenz -/parser diff --git a/src/mycompiler/myclass/Class.java b/src/mycompiler/myclass/Class.java index d096b77e..7f2e3334 100755 --- a/src/mycompiler/myclass/Class.java +++ b/src/mycompiler/myclass/Class.java @@ -665,7 +665,10 @@ public class Class extends SyntaxTreeNode implements AClassOrInterface, IItemWit assumptions.add(globalAssumptions); ConstraintsSet oderConstraints = new ConstraintsSet(); - + + for(Type gparam : this.paralist){ + if(gparam instanceof GenericTypeVar)assumptions.add(((GenericTypeVar)gparam).createAssumptions()); //Constraints für die Generischen Variablen erstellen und diese dem AssumptionsSet hinzufügen + } for(Type gparam : this.paralist){ if(gparam instanceof GenericTypeVar)oderConstraints.add(((GenericTypeVar)gparam).TYPE(assumptions)); //Constraints für die Generischen Variablen erstellen und diese dem AssumptionsSet hinzufügen }