From b395f6e137231249bb5603c8900ea88a7230d3c1 Mon Sep 17 00:00:00 2001 From: Jan-Elric Neumann Date: Tue, 30 May 2017 19:38:03 +0200 Subject: [PATCH 1/2] Fixed return type to make code parsable for ObjectiF --- .../parser/SyntaxTreeGenerator/StatementGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java index 409b4d4f..cfcd74c2 100644 --- a/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java +++ b/src/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java @@ -131,7 +131,7 @@ public class StatementGenerator { return new Block(statements, block.getStart()); } - private de.dhbwstuttgart.syntaxtree.statement.Statement convert(Java8Parser.BlockStatementContext statementContext) { + private Statement convert(Java8Parser.BlockStatementContext statementContext) { List ret = new ArrayList<>(); if(statementContext.localVariableDeclarationStatement() != null){ return convert(statementContext.localVariableDeclarationStatement()); From a48cbae5a5134a318bf5dea71ffe9d592bd4fd90 Mon Sep 17 00:00:00 2001 From: Jan-Elric Neumann Date: Tue, 30 May 2017 19:40:51 +0200 Subject: [PATCH 2/2] Removed faulty (and unused import), which prevented ObjectiF from parsing SyntaxTreeNode --- src/de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.java b/src/de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.java index 58155562..db762ef6 100644 --- a/src/de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.java +++ b/src/de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.java @@ -6,7 +6,7 @@ import java.util.List; import de.dhbwstuttgart.core.IItemWithOffset; import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation; import org.antlr.v4.runtime.Token; -import org.antlr.v4.runtime.misc.Pair; +//import org.antlr.v4.runtime.misc.Pair; public abstract class SyntaxTreeNode implements IItemWithOffset{ private final Token offset;