From ab6f62c27f49547084ff9dc592b47ca97defa5f6 Mon Sep 17 00:00:00 2001 From: Malte Schmitz Date: Sat, 26 Nov 2016 00:51:43 +0100 Subject: [PATCH] Revert "Add call to parser" This reverts commit 76da4a8e586c0396866f7aa4703b7a2592812e04. --- src/main/java/parser/Parser.java | 16 +-------------- src/main/java/program/Call.java | 38 ------------------------------------ src/test/java/parser/ParserTest.java | 15 -------------- 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 src/main/java/program/Call.java diff --git a/src/main/java/parser/Parser.java b/src/main/java/parser/Parser.java index 6c5ea79..bc44991 100644 --- a/src/main/java/parser/Parser.java +++ b/src/main/java/parser/Parser.java @@ -22,7 +22,6 @@ Der Parser nimmt einen String mit dem Quelltext entgegen und erzeugt daraus ein package parser; import expression.*; -import expression.Identifier; import expression.Int; import program.*; @@ -86,25 +85,12 @@ des Quelltextes geparsed wurden. statement = conditional(); } catch (SyntaxException se2) { position = start; - try { - statement = loop(); - } catch (SyntaxException se3) { - position = start; - statement = call(); - } + statement = loop(); } } return statement; } - Program call() { - Identifier name = identifier(); - consume("("); - Expression argument = expression(); - consume(")"); - return new Call(name, argument); - } - Program loop() { consume("while"); consume("("); diff --git a/src/main/java/program/Call.java b/src/main/java/program/Call.java deleted file mode 100644 index effb040..0000000 --- a/src/main/java/program/Call.java +++ /dev/null @@ -1,38 +0,0 @@ -package program; - -import expression.Expression; -import expression.Identifier; - -public class Call extends Program { - final Identifier name; - final Expression argument; - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - Call that = (Call) o; - - if (!name.equals(that.name)) return false; - return argument.equals(that.argument); - - } - - @Override - public String toString() { - return name + "(" + argument + ")"; - } - - @Override - public int hashCode() { - int result = name.hashCode(); - result = 31 * result + argument.hashCode(); - return result; - } - - public Call(Identifier name, Expression argument) { - this.name = name; - this.argument = argument; - } -} diff --git a/src/test/java/parser/ParserTest.java b/src/test/java/parser/ParserTest.java index a1fb186..cc219e6 100644 --- a/src/test/java/parser/ParserTest.java +++ b/src/test/java/parser/ParserTest.java @@ -52,15 +52,6 @@ public class ParserTest { assertEquals(loop, parser.statement()); } - final String callCode = "print(x + 36)"; - final Call call = new Call(new Identifier("print"), new Addition(new Identifier("x"), new Int(36))); - - @Test - public void testStatementCall() { - Parser parser = new Parser(callCode); - assertEquals(call, parser.statement()); - } - @Test public void testAssignment() { Parser parser = new Parser(assignmentCode); @@ -79,12 +70,6 @@ public class ParserTest { assertEquals(loop, parser.loop()); } - @Test - public void testCall() { - Parser parser = new Parser(callCode); - assertEquals(call, parser.call()); - } - final String expressionCode = "a+b - (c - 56) + -47"; final Expression expression = new Addition(new Subtraction(new Addition(new Identifier("a"), new Identifier("b")), new Subtraction(new Identifier("c"), new Int(56))), new Int(-47));