diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/RefType.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/RefType.html
index 03ee44159..b83e05f4f 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/RefType.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/RefType.html
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
de.dhbwstuttgart.syntaxtree.type.ObjectType
-- de.dhbwstuttgart.syntaxtree.type.RefType
+- de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/Void.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/Void.html
index dd492ebc9..2c016df1b 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/Void.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/Void.html
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
de.dhbwstuttgart.syntaxtree.type.ObjectType
-- de.dhbwstuttgart.syntaxtree.type.RefType
+- de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH
-
- de.dhbwstuttgart.syntaxtree.type.Void
@@ -219,7 +219,7 @@ extends
--
+
-
Methods inherited from class de.dhbwstuttgart.syntaxtree.type.RefType
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/RefType.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/RefType.html
index 4232cfd7c..d80da0afc 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/RefType.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/RefType.html
@@ -3,7 +3,7 @@
-Uses of Class de.dhbwstuttgart.syntaxtree.type.RefType
+Uses of Class de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH
@@ -70,7 +70,7 @@
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/typeinference/FunN.html b/doc/LambdaJavadoc/de/dhbwstuttgart/typeinference/FunN.html
index 8daa377cb..7e8465fea 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/typeinference/FunN.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/typeinference/FunN.html
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
- de.dhbwstuttgart.syntaxtree.type.ObjectType
-
-- de.dhbwstuttgart.syntaxtree.type.RefType
+- de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH
-
- de.dhbwstuttgart.typeinference.FunN
@@ -245,7 +245,7 @@ extends
--
+
-
Methods inherited from class de.dhbwstuttgart.syntaxtree.type.RefType
diff --git a/src/de/dhbwstuttgart/parser/JavaTXParser.java b/src/de/dhbwstuttgart/parser/JavaTXParser.java
index abfb54955..5931ef6f3 100644
--- a/src/de/dhbwstuttgart/parser/JavaTXParser.java
+++ b/src/de/dhbwstuttgart/parser/JavaTXParser.java
@@ -10,16 +10,35 @@ import org.antlr.v4.runtime.ANTLRInputStream;
import org.antlr.v4.runtime.CommonTokenStream;
import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
public class JavaTXParser {
public SourceFile parse(File sourceFile) throws IOException {
- InputStream stream = new FileInputStream(sourceFile);
- ANTLRInputStream input = new ANTLRInputStream(stream);
- Java8Lexer lexer = new Java8Lexer(input);
- CommonTokenStream tokens = new CommonTokenStream(lexer);
- Java8Parser parser = new Java8Parser(tokens);
- Java8Parser.CompilationUnitContext tree = parser.compilationUnit();
- SyntaxTreeGenerator generator = new SyntaxTreeGenerator(new JavaClassRegistry());
- return generator.convert(tree);
+ InputStream stream = new FileInputStream(sourceFile);
+ ANTLRInputStream input = new ANTLRInputStream(stream);
+ Java8Lexer lexer = new Java8Lexer(input);
+ CommonTokenStream tokens = new CommonTokenStream(lexer);
+ Java8Parser parser = new Java8Parser(tokens);
+ Java8Parser.CompilationUnitContext tree = parser.compilationUnit();
+
+
+ SyntaxTreeGenerator generator = new SyntaxTreeGenerator(new JavaClassRegistry(generateJavaLangNames()));
+ return generator.convert(tree);
+ }
+
+ private List generateJavaLangNames(){
+ List ret = new ArrayList<>();
+
+ //TODO: Eigentlich sind es noch viele mehr:
+ ret.add("java.lang.String");
+ ret.add("java.lang.Boolean");
+ ret.add("java.lang.Integer");
+ ret.add("java.lang.Double");
+ ret.add("java.lang.Float");
+ ret.add("java.lang.Long");
+ ret.add("java.lang.Byte");
+
+ return ret;
}
}
diff --git a/src/de/dhbwstuttgart/parser/RunParser.java b/src/de/dhbwstuttgart/parser/RunParser.java
index 7412bb423..eea0412ce 100644
--- a/src/de/dhbwstuttgart/parser/RunParser.java
+++ b/src/de/dhbwstuttgart/parser/RunParser.java
@@ -7,6 +7,7 @@ import org.antlr.v4.runtime.CommonTokenStream;
import de.dhbwstuttgart.syntaxtree.*;
import de.dhbwstuttgart.syntaxtree.modifier.*;
+import java.util.ArrayList;
import java.util.Scanner;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -24,7 +25,7 @@ public class RunParser{
CommonTokenStream tokens = new CommonTokenStream(lexer);
Java8Parser parser = new Java8Parser(tokens);
Java8Parser.CompilationUnitContext tree = parser.compilationUnit();
- SyntaxTreeGenerator generator = new SyntaxTreeGenerator(new JavaClassRegistry());
+ SyntaxTreeGenerator generator = new SyntaxTreeGenerator(new JavaClassRegistry(new ArrayList<>()));
SourceFile f = generator.convert((Java8Parser.CompilationUnitContext) tree);
String pkgName = f.getPkgName();
System.out.println(pkgName);
diff --git a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator.java b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator.java
index d16da9f3a..4c8347a02 100644
--- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator.java
+++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator.java
@@ -7,14 +7,16 @@ import de.dhbwstuttgart.syntaxtree.modifier.fieldModifier.FieldModifier;
import de.dhbwstuttgart.syntaxtree.modifier.methodModifier.MethodModifier;
import de.dhbwstuttgart.syntaxtree.statement.Block;
import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
import de.dhbwstuttgart.typecheck.*;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.tree.TerminalNode;
+import sun.reflect.generics.reflectiveObjects.NotImplementedException;
+
public class SyntaxTreeGenerator{
private JavaClassRegistry reg;
private String pkgName = "";
@@ -44,6 +46,12 @@ public class SyntaxTreeGenerator{
else{
nameString = typeDecl.interfaceDeclaration().normalInterfaceDeclaration().Identifier().toString();
}
+ //Die Generic TypeParameter Definitionen ebenfalls an die JavaClassName-Registry anfügen:
+ if(typeDecl.classDeclaration().normalClassDeclaration().typeParameters() != null){
+ for(Java8Parser.TypeParameterContext tp : typeDecl.classDeclaration().normalClassDeclaration().typeParameters().typeParameterList().typeParameter()){
+ this.reg.add(tp.Identifier().toString());
+ }
+ }
this.reg.add(nameString);
}
}
@@ -55,12 +63,18 @@ public class SyntaxTreeGenerator{
else{
nameString = typeDecl.classDeclaration().normalClassDeclaration().Identifier().toString();
}
+ //Die Generic TypeParameter Definitionen ebenfalls an die JavaClassName-Registry anfügen:
+ if(typeDecl.classDeclaration().normalClassDeclaration().typeParameters() != null){
+ for(Java8Parser.TypeParameterContext tp : typeDecl.classDeclaration().normalClassDeclaration().typeParameters().typeParameterList().typeParameter()){
+ this.reg.add(tp.Identifier().toString());
+ }
+ }
this.reg.add(nameString);
}
}
}
}
-
+
public JavaClassRegistry getReg(){
return this.reg;
}
@@ -82,7 +96,7 @@ public class SyntaxTreeGenerator{
}
private ClassOrInterface convertClass(Java8Parser.ClassDeclarationContext ctx) {
- ClassOrInterface newClass = null;
+ ClassOrInterface newClass;
if(ctx.normalClassDeclaration() != null){
newClass = convertNormal(ctx.normalClassDeclaration());
}
@@ -107,9 +121,9 @@ public class SyntaxTreeGenerator{
List fielddecl = convertFields(ctx.classBody());
GenericDeclarationList genericClassParameters = null;
Token offset = ctx.getStart();
- RefType superClass = null;
+ RefTypeOrTPH superClass = null;
Boolean isInterface = false;
- List implementedInterfaces = null;
+ List implementedInterfaces = null;
return new ClassOrInterface(modifiers, name, fielddecl, genericClassParameters, superClass, isInterface, implementedInterfaces, offset);
}
@@ -132,7 +146,7 @@ public class SyntaxTreeGenerator{
Java8Parser.MethodHeaderContext header = methodDeclarationContext.methodHeader();
String name = header.methodDeclarator().Identifier().getText();
- RefType retType;
+ RefTypeOrTPH retType;
if(header.result() != null){
if(header.result().unannType() != null)
retType = convert(header.result().unannType());
@@ -184,7 +198,7 @@ public class SyntaxTreeGenerator{
for(Java8Parser.FieldModifierContext fieldModifierContext : fieldDeclarationContext.fieldModifier()){
//TODO
}
- RefType fieldType = convert(fieldDeclarationContext.unannType());
+ RefTypeOrTPH fieldType = convert(fieldDeclarationContext.unannType());
for(Java8Parser.VariableDeclaratorContext varCtx : fieldDeclarationContext.variableDeclaratorList().variableDeclarator()){
String fieldName = varCtx.variableDeclaratorId().getText();
if(varCtx.variableInitializer() != null){
@@ -198,11 +212,27 @@ public class SyntaxTreeGenerator{
return ret;
}
- private RefType convert(Java8Parser.UnannTypeContext unannTypeContext) {
- //TODO
- return null;
+ private RefTypeOrTPH convert(Java8Parser.UnannTypeContext unannTypeContext) {
+ if(unannTypeContext.unannPrimitiveType()!=null){
+ throw new NotImplementedException();
+ }else
+ if(unannTypeContext.unannReferenceType().unannArrayType()!=null){
+ throw new NotImplementedException();
+ }else
+ if(unannTypeContext.unannReferenceType().unannTypeVariable()!=null){
+ JavaClassName name = reg.getName(unannTypeContext.unannReferenceType().unannTypeVariable().Identifier().toString());
+ return new RefType(name, unannTypeContext.getStart());
+ }
+ return convert(unannTypeContext.unannReferenceType().unannClassOrInterfaceType());
}
+ private RefTypeOrTPH convert(Java8Parser.UnannClassOrInterfaceTypeContext unannClassOrInterfaceTypeContext) {
+ String name = unannClassOrInterfaceTypeContext.getText();
+
+ return new RefType(reg.getName(name), unannClassOrInterfaceTypeContext.getStart());
+ }
+
+
private Modifier convert(Java8Parser.ClassModifierContext ctx){
Modifier newModifier = null;
if(ctx.annotation() == null){
diff --git a/src/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java b/src/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java
index d7c9748b0..9d280aff6 100755
--- a/src/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java
+++ b/src/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java
@@ -3,9 +3,7 @@ package de.dhbwstuttgart.syntaxtree;
import de.dhbwstuttgart.core.IItemWithOffset;
import de.dhbwstuttgart.typecheck.JavaClassName;
import de.dhbwstuttgart.syntaxtree.modifier.Modifiers;
-import de.dhbwstuttgart.syntaxtree.statement.Block;
-import de.dhbwstuttgart.syntaxtree.statement.Expr;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
import org.antlr.v4.runtime.Token;
import java.util.ArrayList;
@@ -20,12 +18,12 @@ public class ClassOrInterface extends GTVDeclarationContext implements IItemWith
private List fielddecl = new ArrayList<>();
private GenericDeclarationList genericClassParameters;
private Token offset;
- private RefType superClass;
+ private RefTypeOrTPH superClass;
protected boolean isInterface;
- private List implementedInterfaces;
+ private List implementedInterfaces;
- public ClassOrInterface(Modifiers modifiers, JavaClassName name, List fielddecl, GenericDeclarationList genericClassParameters,
- RefType superClass, Boolean isInterface, List implementedInterfaces, Token offset){
+ public ClassOrInterface(Modifiers modifiers, JavaClassName name, List fielddecl, GenericDeclarationList genericClassParameters,
+ RefTypeOrTPH superClass, Boolean isInterface, List implementedInterfaces, Token offset){
if(modifiers != null){
this.modifiers = modifiers;
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/Constructor.java b/src/de/dhbwstuttgart/syntaxtree/Constructor.java
index 074a08b48..774e43b87 100644
--- a/src/de/dhbwstuttgart/syntaxtree/Constructor.java
+++ b/src/de/dhbwstuttgart/syntaxtree/Constructor.java
@@ -1,12 +1,9 @@
package de.dhbwstuttgart.syntaxtree;
import de.dhbwstuttgart.syntaxtree.modifier.methodModifier.MethodModifier;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
import org.antlr.v4.runtime.Token;
-import org.apache.bcel.Constants;
-import org.apache.bcel.generic.InstructionList;
-import de.dhbwstuttgart.typecheck.JavaClassName;
import de.dhbwstuttgart.syntaxtree.statement.Block;
import java.util.List;
@@ -14,7 +11,7 @@ import java.util.List;
public class Constructor extends Method {
- public Constructor(String name, RefType returnType, List modifiers, ParameterList parameterList, Block block, GenericDeclarationList gtvDeclarations, Token offset) {
+ public Constructor(String name, RefTypeOrTPH returnType, List modifiers, ParameterList parameterList, Block block, GenericDeclarationList gtvDeclarations, Token offset) {
super(name, returnType, modifiers, parameterList, block, gtvDeclarations, offset);
}
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/ExceptionList.java b/src/de/dhbwstuttgart/syntaxtree/ExceptionList.java
index 1b6694f5d..d28faa608 100755
--- a/src/de/dhbwstuttgart/syntaxtree/ExceptionList.java
+++ b/src/de/dhbwstuttgart/syntaxtree/ExceptionList.java
@@ -1,14 +1,14 @@
package de.dhbwstuttgart.syntaxtree;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
import java.util.List;
public class ExceptionList
{
- private List exceptions;
+ private List exceptions;
- public ExceptionList(List exceptions){
+ public ExceptionList(List exceptions){
this.exceptions = exceptions;
}
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/Field.java b/src/de/dhbwstuttgart/syntaxtree/Field.java
index f6a0210f2..9eaf79420 100644
--- a/src/de/dhbwstuttgart/syntaxtree/Field.java
+++ b/src/de/dhbwstuttgart/syntaxtree/Field.java
@@ -1,7 +1,7 @@
package de.dhbwstuttgart.syntaxtree;
import de.dhbwstuttgart.syntaxtree.modifier.fieldModifier.FieldModifier;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
import org.antlr.v4.runtime.Token;
import java.util.List;
@@ -9,12 +9,14 @@ import java.util.List;
public class Field extends GTVDeclarationContext implements Generic {
private String name;
+ private RefTypeOrTPH type;
private GenericDeclarationList genericParameters;
- public Field(String name, RefType type, List modifier, Token offset){
+ public Field(String name, RefTypeOrTPH type, List modifier, Token offset){
this.name = name;
+ this.type = type;
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/FieldDeclaration.java b/src/de/dhbwstuttgart/syntaxtree/FieldDeclaration.java
index f0aafb3c5..aa24508ae 100644
--- a/src/de/dhbwstuttgart/syntaxtree/FieldDeclaration.java
+++ b/src/de/dhbwstuttgart/syntaxtree/FieldDeclaration.java
@@ -1,17 +1,10 @@
package de.dhbwstuttgart.syntaxtree;
-import com.sun.org.apache.xpath.internal.operations.Mod;
import de.dhbwstuttgart.syntaxtree.modifier.fieldModifier.FieldModifier;
import org.antlr.v4.runtime.Token;
-import org.apache.bcel.generic.FieldGen;
-import org.apache.bcel.generic.FieldInstruction;
-import org.apache.bcel.generic.InstructionList;
-import org.apache.bcel.generic.ObjectType;
-import org.apache.bcel.Const;
-import org.apache.bcel.generic.ClassGen;
import de.dhbwstuttgart.syntaxtree.statement.Expr;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
import java.util.List;
@@ -29,7 +22,7 @@ public class FieldDeclaration extends Field{
* Dieser Konstruktor der FieldDeclaration erstellt den Syntaxknoten vollständig.
* Kein nachträgliches hinzfügen von Informationen oder aufrufen von parserPostProcessing ist notwendig.
*/
- public FieldDeclaration(String name, RefType typ, List modifier, Expr value, Token offset){
+ public FieldDeclaration(String name, RefTypeOrTPH typ, List modifier, Expr value, Token offset){
super(name, typ, modifier, offset);//Dieser Deklarator wird nicht vom Parser aufgerufen. Dadurch gibt es auch keinen Offset
this.wert = value;
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/FormalParameter.java b/src/de/dhbwstuttgart/syntaxtree/FormalParameter.java
index 2b632bc9e..8fc1132ad 100755
--- a/src/de/dhbwstuttgart/syntaxtree/FormalParameter.java
+++ b/src/de/dhbwstuttgart/syntaxtree/FormalParameter.java
@@ -1,13 +1,13 @@
package de.dhbwstuttgart.syntaxtree;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
public class FormalParameter extends SyntaxTreeNode
{
- private RefType type;
+ private RefTypeOrTPH type;
private String name;
- public FormalParameter(String name, RefType type, int offset){
+ public FormalParameter(String name, RefTypeOrTPH type, int offset){
this.name = name;
this.type = type;
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/GenericTypeVar.java b/src/de/dhbwstuttgart/syntaxtree/GenericTypeVar.java
index 7e180b990..d3056ce6d 100755
--- a/src/de/dhbwstuttgart/syntaxtree/GenericTypeVar.java
+++ b/src/de/dhbwstuttgart/syntaxtree/GenericTypeVar.java
@@ -1,6 +1,6 @@
package de.dhbwstuttgart.syntaxtree;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
import java.util.ArrayList;
import java.util.List;
@@ -20,14 +20,14 @@ public class GenericTypeVar extends SyntaxTreeNode
/**
* Hier sind die Bounds in Form von Type-Objekten abgespeichert
*/
- List bounds=new ArrayList();
+ List bounds=new ArrayList();
private int endOffset;
private String name;
- public GenericTypeVar(String s, List bounds, int offset, int endOffset)
+ public GenericTypeVar(String s, List bounds, int offset, int endOffset)
{
name = s;
- if(bounds != null)for(RefType t : bounds){
+ if(bounds != null)for(RefTypeOrTPH t : bounds){
//if(t!=null)this.extendVars.add(t);
}
//this.genericTypeVar = new RefType(s,offset);
@@ -39,7 +39,7 @@ public class GenericTypeVar extends SyntaxTreeNode
return this.endOffset;
}
- public List getBounds()
+ public List getBounds()
{
return bounds;
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/Method.java b/src/de/dhbwstuttgart/syntaxtree/Method.java
index 2a5953f76..bf1d0b7ce 100755
--- a/src/de/dhbwstuttgart/syntaxtree/Method.java
+++ b/src/de/dhbwstuttgart/syntaxtree/Method.java
@@ -3,17 +3,12 @@ package de.dhbwstuttgart.syntaxtree;
import java.util.ArrayList;
import java.util.List;
-import de.dhbwstuttgart.syntaxtree.modifier.fieldModifier.FieldModifier;
import de.dhbwstuttgart.syntaxtree.modifier.methodModifier.MethodModifier;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
import org.antlr.v4.runtime.Token;
-import org.apache.bcel.Constants;
-import org.apache.bcel.generic.InstructionList;
import de.dhbwstuttgart.core.IItemWithOffset;
-import de.dhbwstuttgart.typecheck.JavaClassName;
import de.dhbwstuttgart.syntaxtree.modifier.Modifiers;
-import de.dhbwstuttgart.syntaxtree.modifier.Static;
import de.dhbwstuttgart.syntaxtree.statement.Block;
/**
@@ -34,7 +29,7 @@ public class Method extends Field implements IItemWithOffset
private List types_in_parameterlist = new ArrayList<>();
private Modifiers modifiers;
- public Method(String name, RefType returnType, List modifiers, ParameterList parameterList, Block block,
+ public Method(String name, RefTypeOrTPH returnType, List modifiers, ParameterList parameterList, Block block,
GenericDeclarationList gtvDeclarations, Token offset) {
super(name, returnType, modifiers, offset);
this.name = name;
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Assign.java b/src/de/dhbwstuttgart/syntaxtree/statement/Assign.java
index 9e4bbdae1..ed0717c0a 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/Assign.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/Assign.java
@@ -1,14 +1,13 @@
package de.dhbwstuttgart.syntaxtree.statement;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import org.apache.bcel.generic.InstructionList;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
public class Assign extends ExprStmt
{
- public Assign(RefType type, int offset) {
+ public Assign(RefTypeOrTPH type, int offset) {
super(type, offset);
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/CastExpr.java b/src/de/dhbwstuttgart/syntaxtree/statement/CastExpr.java
index 4b2c85151..d116f9a77 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/CastExpr.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/CastExpr.java
@@ -1,16 +1,11 @@
package de.dhbwstuttgart.syntaxtree.statement;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.InstructionList;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
public class CastExpr extends Expr
{
- public CastExpr(RefType castType, Expr expr, int offset)
+ public CastExpr(RefTypeOrTPH castType, Expr expr, int offset)
{
super(null, 0);
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.java b/src/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.java
index b214fc32d..bfb183b68 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.java
@@ -1,17 +1,4 @@
package de.dhbwstuttgart.syntaxtree.statement;
-import java.util.Hashtable;
-
-import org.apache.bcel.generic.BIPUSH;
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.ConstantPoolGen;
-import org.apache.bcel.generic.InstructionFactory;
-import org.apache.bcel.generic.InstructionList;
-import org.apache.bcel.generic.LDC;
-import org.apache.bcel.generic.LDC2_W;
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-
-
public class DoubleLiteral extends Literal
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Executeable.java b/src/de/dhbwstuttgart/syntaxtree/statement/Executeable.java
index db6501fa9..699a4b2b1 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/Executeable.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/Executeable.java
@@ -1,17 +1,14 @@
package de.dhbwstuttgart.syntaxtree.statement;
-import java.util.Iterator;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import org.apache.bcel.generic.InstructionList;
-import de.dhbwstuttgart.core.MyCompiler;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
public abstract class Executeable extends SyntaxTreeNode
{
- private RefType type;
+ private RefTypeOrTPH type;
- public Executeable(RefType type, int offset) {
+ public Executeable(RefTypeOrTPH type, int offset) {
this.type = type;
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Expr.java b/src/de/dhbwstuttgart/syntaxtree/statement/Expr.java
index 33b43e859..9b0e93d6c 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/Expr.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/Expr.java
@@ -1,19 +1,13 @@
package de.dhbwstuttgart.syntaxtree.statement;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.InstructionList;
-
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
public abstract class Expr extends Executeable
{
- public Expr(RefType type, int offset) {
+ public Expr(RefTypeOrTPH type, int offset) {
super(type, offset);
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/ExprStmt.java b/src/de/dhbwstuttgart/syntaxtree/statement/ExprStmt.java
index ca7a2d637..ee088c16e 100644
--- a/src/de/dhbwstuttgart/syntaxtree/statement/ExprStmt.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/ExprStmt.java
@@ -1,10 +1,10 @@
package de.dhbwstuttgart.syntaxtree.statement;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
public abstract class ExprStmt extends Executeable{
- public ExprStmt(RefType type, int offset) {
+ public ExprStmt(RefTypeOrTPH type, int offset) {
super(type, offset);
}
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java b/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java
index 25879c224..16b915f64 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java
@@ -1,18 +1,13 @@
package de.dhbwstuttgart.syntaxtree.statement;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.InstructionList;
-
-import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
public class InstanceOf extends BinaryExpr
{
public Expr expr;
- private RefType reftype;
+ private RefTypeOrTPH reftype;
// private boolean is_instance = false;
@@ -27,7 +22,7 @@ public class InstanceOf extends BinaryExpr
this.expr = exp;
}
- public void set_Type(RefType typ)
+ public void set_Type(RefTypeOrTPH typ)
{
this.reftype = typ;
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java b/src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java
index f0c45e2ed..2dfc862a1 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java
@@ -1,23 +1,7 @@
package de.dhbwstuttgart.syntaxtree.statement;
-import java.util.ArrayList;
-
-import org.apache.bcel.Const;
-import org.apache.bcel.classfile.BootstrapMethod;
-import org.apache.bcel.classfile.ConstantMethodHandle;
-import org.apache.bcel.classfile.ConstantMethodType;
-import org.apache.bcel.classfile.InnerClass;
-import org.apache.bcel.generic.InstructionFactory;
-import org.apache.bcel.generic.InstructionList;
-
-import de.dhbwstuttgart.typecheck.JavaClassName;
-import de.dhbwstuttgart.syntaxtree.FormalParameter;
import de.dhbwstuttgart.syntaxtree.ParameterList;
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
import de.dhbwstuttgart.syntaxtree.type.FunN;
-import de.dhbwstuttgart.syntaxtree.type.FunVoidN;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
/**
* @author A10023 - Andreas Stadelmeier
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Literal.java b/src/de/dhbwstuttgart/syntaxtree/statement/Literal.java
index 2c68c6d2c..b38396286 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/Literal.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/Literal.java
@@ -1,7 +1,7 @@
package de.dhbwstuttgart.syntaxtree.statement;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
public abstract class Literal extends Expr
{
@@ -11,7 +11,7 @@ public abstract class Literal extends Expr
private boolean primitiveFlag=true;
- public Literal(RefType o, int i) {
+ public Literal(RefTypeOrTPH o, int i) {
super(null, i);
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/NewArray.java b/src/de/dhbwstuttgart/syntaxtree/statement/NewArray.java
index abf7efb07..38b385910 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/NewArray.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/NewArray.java
@@ -1,14 +1,7 @@
package de.dhbwstuttgart.syntaxtree.statement;
-import java.util.Hashtable;
import java.util.List;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.InstructionFactory;
-import org.apache.bcel.generic.InstructionList;
-
-
-
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
public class NewArray extends Expr
@@ -17,7 +10,7 @@ public class NewArray extends Expr
{
super(null,variableLength);
}
- private RefType type;
+ private RefTypeOrTPH type;
public List expr;
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/NewClass.java b/src/de/dhbwstuttgart/syntaxtree/statement/NewClass.java
index ac26117a8..63d9ce4ec 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/NewClass.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/NewClass.java
@@ -1,16 +1,8 @@
package de.dhbwstuttgart.syntaxtree.statement;
import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
-import org.apache.bcel.Constants;
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.InstructionConstants;
-
-import org.apache.bcel.generic.InstructionList;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
@@ -24,7 +16,7 @@ public class NewClass extends Expr
private ArgumentList arglist;
private boolean isStatement = false;
- private List parameterList = new ArrayList<>();
+ private List parameterList = new ArrayList<>();
public ArgumentList getArgumentList()
diff --git a/src/de/dhbwstuttgart/syntaxtree/statement/Statement.java b/src/de/dhbwstuttgart/syntaxtree/statement/Statement.java
index ecb72a2ac..625608308 100755
--- a/src/de/dhbwstuttgart/syntaxtree/statement/Statement.java
+++ b/src/de/dhbwstuttgart/syntaxtree/statement/Statement.java
@@ -1,22 +1,13 @@
package de.dhbwstuttgart.syntaxtree.statement;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import org.apache.bcel.generic.ClassGen;
-import org.apache.bcel.generic.ConstantPoolGen;
-import org.apache.bcel.generic.InstructionFactory;
-import org.apache.bcel.generic.InstructionList;
-
-
+import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPH;
public abstract class Statement extends Executeable
{
- public Statement(RefType type, int offset)
+ public Statement(RefTypeOrTPH type, int offset)
{
super(type,offset);
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.java b/src/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.java
index 69835d0aa..c50330319 100755
--- a/src/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.java
+++ b/src/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.java
@@ -17,7 +17,7 @@ public class ExtendsWildcardType extends WildcardType{
* Author: Arne Lüdtke
* Standard Konstruktor für eine ExtendsWildcard
*/
- public ExtendsWildcardType ( RefType extendsType,Token offset)
+ public ExtendsWildcardType (RefType extendsType, Token offset)
{
super(extendsType, offset);
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/FunN.java b/src/de/dhbwstuttgart/syntaxtree/type/FunN.java
index b07e6d5a5..59c70c126 100755
--- a/src/de/dhbwstuttgart/syntaxtree/type/FunN.java
+++ b/src/de/dhbwstuttgart/syntaxtree/type/FunN.java
@@ -1,11 +1,8 @@
package de.dhbwstuttgart.syntaxtree.type;
-import java.util.ArrayList;
import java.util.List;
-import de.dhbwstuttgart.typecheck.JavaClassName;
-
/**
* @see Spezifikation "Complete Typeinference in Java 8" von Martin Plümicke
* "interface FunN { R apply(T1 arg1, T2 arg2, ... , TN argN); }"
@@ -17,8 +14,8 @@ import de.dhbwstuttgart.typecheck.JavaClassName;
*/
public class FunN extends RefType {
- private RefType R;
- private List T;
+ private RefTypeOrTPH R;
+ private List T;
/**
* @author Andreas Stadelmeier, a10023
@@ -28,7 +25,7 @@ public class FunN extends RefType {
* @param T
* @return
*/
- public FunN(RefType R, List T) {
+ public FunN(RefTypeOrTPH R, List T) {
super(null,null);
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/FunVoidN.java b/src/de/dhbwstuttgart/syntaxtree/type/FunVoidN.java
index 1e767b986..91a9a29b8 100644
--- a/src/de/dhbwstuttgart/syntaxtree/type/FunVoidN.java
+++ b/src/de/dhbwstuttgart/syntaxtree/type/FunVoidN.java
@@ -4,8 +4,6 @@ package de.dhbwstuttgart.syntaxtree.type;
import java.util.ArrayList;
import java.util.List;
-import de.dhbwstuttgart.typecheck.JavaClassName;
-
/**
* FunVoid {
* void apply(T1 arg1, ... TN argN);
@@ -15,8 +13,8 @@ import de.dhbwstuttgart.typecheck.JavaClassName;
*/
public class FunVoidN extends FunN {
- private RefType R;
- private List T;
+ private RefTypeOrTPH R;
+ private List T;
/**
* @author Andreas Stadelmeier, a10023
@@ -25,7 +23,7 @@ public class FunVoidN extends FunN {
* @param T
* @return
*/
- public FunVoidN(List T) {
+ public FunVoidN(List T) {
super(null,T);
}
@@ -36,7 +34,7 @@ public class FunVoidN extends FunN {
* Dabei werden bestimmte, von RefType geerbte, Parameter angepasst. Dies ist wichtig für den Typinferenzalgorithmus.
*/
private void calculateNewParalist(){
- List t = new ArrayList<>();
+ List t = new ArrayList<>();
if(T!=null)t.addAll(T);
this.parameter = t;
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/RefType.java b/src/de/dhbwstuttgart/syntaxtree/type/RefType.java
index f5a245585..33ea9ab5a 100755
--- a/src/de/dhbwstuttgart/syntaxtree/type/RefType.java
+++ b/src/de/dhbwstuttgart/syntaxtree/type/RefType.java
@@ -1,27 +1,28 @@
package de.dhbwstuttgart.syntaxtree.type;
+
+import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
+import de.dhbwstuttgart.typecheck.JavaClassName;
+import org.antlr.v4.runtime.Token;
+
import java.util.ArrayList;
import java.util.List;
-import de.dhbwstuttgart.typecheck.JavaClassName;
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import org.antlr.v4.runtime.Token;
-
-public class RefType extends SyntaxTreeNode
-{
+public class RefType extends RefTypeOrTPH
+{
/**
- * Ist IsArray auf true, muss beim Codegen ein Zeichen [ gesetzt werden
+ * Ist IsArray auf true, muss beim Codegen ein Zeichen [ gesetzt werden
* Bsp.: 15| tag = CONSTANT_Utf8, length = 22, ([Ljava/lang/String;)V
- * Ist IsArray auf false, muss beim Codegen ein Zeichen [ gesetzt werden
+ * Ist IsArray auf false, muss beim Codegen ein Zeichen [ gesetzt werden
* Bsp.: 9| tag = CONSTANT_Utf8, length = 21, (Ljava/lang/String;)V
*/
private boolean IsArray = false;
protected JavaClassName name;
- protected List parameter = null;
+ protected List parameter = null;
/**
* Ist primitiveFlag auf true, muss beim Codegen dieser Reftype durch
* den primitiven Datentyp ersetzt werden
- *
+ *
* Bsp: java.lang.Integer mit Flag wird dann zu [int]
*/
private boolean primitiveFlag=false;
@@ -30,7 +31,7 @@ public class RefType extends SyntaxTreeNode
{
this.name = (fullyQualifiedName);
}
-
+
@Override
public int hashCode() {
int hash = 0;
@@ -39,7 +40,7 @@ public class RefType extends SyntaxTreeNode
return hash;
}
- public RefType(JavaClassName fullyQualifiedName, List parameter, Token offset)
+ public RefType(JavaClassName fullyQualifiedName, List parameter, Token offset)
{
this(fullyQualifiedName, offset);
if(parameter != null && parameter.size()>0)this.parameter = parameter;
@@ -50,7 +51,7 @@ public class RefType extends SyntaxTreeNode
return name;
}
- public List getParaList(){
+ public List getParaList(){
if(this.parameter==null)return new ArrayList<>();
return this.parameter;
}
@@ -93,5 +94,6 @@ public class RefType extends SyntaxTreeNode
}
}
+
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/RefTypeOrTPH.java b/src/de/dhbwstuttgart/syntaxtree/type/RefTypeOrTPH.java
new file mode 100755
index 000000000..ee485a0e2
--- /dev/null
+++ b/src/de/dhbwstuttgart/syntaxtree/type/RefTypeOrTPH.java
@@ -0,0 +1,12 @@
+package de.dhbwstuttgart.syntaxtree.type;
+import java.util.ArrayList;
+import java.util.List;
+
+import de.dhbwstuttgart.typecheck.JavaClassName;
+import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
+import org.antlr.v4.runtime.Token;
+
+
+public abstract class RefTypeOrTPH extends SyntaxTreeNode
+{ }
+
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.java b/src/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.java
index 23f4829a6..656a6c671 100755
--- a/src/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.java
+++ b/src/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.java
@@ -28,7 +28,7 @@ public class SuperWildcardType extends WildcardType{
* Beispiel: ? super Integer.
* Integer wird zurückgegeben.
*/
- public RefType get_SuperType()
+ public RefTypeOrTPH get_SuperType()
{
return this.innerType;
}
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java b/src/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java
index 41788d636..e06298fe2 100755
--- a/src/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java
+++ b/src/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java
@@ -12,7 +12,7 @@ import org.antlr.v4.runtime.Token;
* @author J�rg B�uerle
* @version $Date: 2013/06/19 12:45:37 $
*/
-public class TypePlaceholder extends RefType
+public class TypePlaceholder extends RefTypeOrTPH
{
private static Hashtable m_TypePlaceholdersRegistry = new Hashtable();
@@ -25,11 +25,9 @@ public class TypePlaceholder extends RefType
* Privater Konstruktor - Eine TypePlaceholder-Variable wird �ber die
* Factory-Methode fresh() erzeugt.
*
Author: J�rg B�uerle
- * @param typeName Der Name der TypePlaceholder-Variablen
*/
private TypePlaceholder(String name)
{
- super(null,null);
this.name = name;
}
@@ -61,7 +59,6 @@ public class TypePlaceholder extends RefType
* @author Andreas Stadelmeier, a10023
* Ruft die TypePlaceholder.fresh()-Methode auf.
* Fügt zusätzlich einen Replacementlistener hinzu.
- * @param listener
* @return
*/
public static TypePlaceholder fresh(Token position){
@@ -71,7 +68,6 @@ public class TypePlaceholder extends RefType
/**
* Author: J�rg B�uerle
- * @param Object
* @return
*/
public boolean equals(Object obj)
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/Void.java b/src/de/dhbwstuttgart/syntaxtree/type/Void.java
index a9ecdd808..444c62647 100755
--- a/src/de/dhbwstuttgart/syntaxtree/type/Void.java
+++ b/src/de/dhbwstuttgart/syntaxtree/type/Void.java
@@ -1,12 +1,8 @@
package de.dhbwstuttgart.syntaxtree.type;
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
import de.dhbwstuttgart.typecheck.JavaClassName;
import org.antlr.v4.runtime.Token;
-import java.util.ArrayList;
-import java.util.List;
-
public class Void extends RefType
{
diff --git a/src/de/dhbwstuttgart/syntaxtree/type/WildcardType.java b/src/de/dhbwstuttgart/syntaxtree/type/WildcardType.java
index 4a0f8cc15..2d5cb54d0 100755
--- a/src/de/dhbwstuttgart/syntaxtree/type/WildcardType.java
+++ b/src/de/dhbwstuttgart/syntaxtree/type/WildcardType.java
@@ -9,9 +9,9 @@ import org.antlr.v4.runtime.Token;
*
*/
-public abstract class WildcardType extends RefType{
+public abstract class WildcardType extends RefType {
- protected RefType innerType = null;
+ protected RefTypeOrTPH innerType = null;
/**
* Author: Arne Lüdtke
@@ -37,7 +37,7 @@ public abstract class WildcardType extends RefType{
* Author: Arne Lüdtke
* Die Allgemeine Wildcard enthält keinen Typen.
*/
- public RefType GetWildcardType()
+ public RefTypeOrTPH GetWildcardType()
{
return null;
}
diff --git a/src/de/dhbwstuttgart/typecheck/JavaClassRegistry.java b/src/de/dhbwstuttgart/typecheck/JavaClassRegistry.java
index 96176bb2e..e8914ae0e 100644
--- a/src/de/dhbwstuttgart/typecheck/JavaClassRegistry.java
+++ b/src/de/dhbwstuttgart/typecheck/JavaClassRegistry.java
@@ -9,6 +9,12 @@ import java.util.List;
public class JavaClassRegistry {
public List existingClasses = new ArrayList<>();
+ public JavaClassRegistry(List initialNames){
+ for(String name : initialNames){
+ existingClasses.add(new JavaClassName(name));
+ }
+ }
+
public void add(String className){
existingClasses.add(new JavaClassName(className));
}
diff --git a/test/parser/StructuralTypes.jav b/test/parser/StructuralTypes.jav
new file mode 100644
index 000000000..b3c210c84
--- /dev/null
+++ b/test/parser/StructuralTypes.jav
@@ -0,0 +1,5 @@
+
+class A {
+ mt(x, y, z) { return x.sub(y).add(z); }
+}
+