Merge branch 'bigRefactoring' into sat

This commit is contained in:
JanUlrich 2018-01-21 11:17:46 +01:00
commit 311d7ee63a
2 changed files with 7 additions and 2 deletions

View File

@ -5,7 +5,7 @@ import org.antlr.v4.runtime.Token;
import java.util.ArrayList; import java.util.ArrayList;
public class Field extends SyntaxTreeNode implements TypeScope{ public class Field extends SyntaxTreeNode {
private String name; private String name;
private RefTypeOrTPHOrWildcardOrGeneric type; private RefTypeOrTPHOrWildcardOrGeneric type;

View File

@ -22,7 +22,7 @@ import de.dhbwstuttgart.syntaxtree.statement.Block;
* @author janulrich * @author janulrich
* *
*/ */
public class Method extends Field implements IItemWithOffset public class Method implements IItemWithOffset, TypeScope
{ {
public final Block block; public final Block block;
private ParameterList parameterlist = new ParameterList(new ArrayList<>(), new NullToken()); private ParameterList parameterlist = new ParameterList(new ArrayList<>(), new NullToken());
@ -54,4 +54,9 @@ public class Method extends Field implements IItemWithOffset
public void accept(ASTVisitor visitor) { public void accept(ASTVisitor visitor) {
visitor.visit(this); visitor.visit(this);
} }
@Override
public Token getOffset() {
return null;
}
} }