Remove some more crud

Author: Borja Lorente

interpreter/src/core/model/ast/Statement.h

@@ -22,12 +22,11 @@ class Statement {
     int _line;
     int _col;
     bool _stoppable;
-    int _nextLine;
 
 public:
 
-    Statement() : _line{-1}, _col{-1}, _stoppable{false}, _nextLine{-1} {}
-    Statement(int line, int col) : _line{line}, _col{col}, _stoppable{false}, _nextLine{-1} {}
+    Statement() : _line{-1}, _col{-1}, _stoppable{false}{}
+    Statement(int line, int col) : _line{line}, _col{col}, _stoppable{false}{}
 
     virtual void accept(Evaluator &evaluator) = 0;
 
@@ -36,9 +35,6 @@ class Statement {
 
     bool stoppable() {return _stoppable;}
     void makeStoppable() {_stoppable = true;}
-
-    virtual void setLastLine(int line) {_nextLine = line;}
-    int lastLine() const {return _nextLine;}
 };
 
 }

interpreter/src/core/model/ast/declarations/ConstantDeclaration.cpp

@@ -24,10 +24,4 @@ const std::string & ConstantDeclaration::name() const {
 ExpressionPtr ConstantDeclaration::value() const {
     return _value;
 }
-
-void ConstantDeclaration::setLastLine(int line) {
-    Statement::setLastLine(line);
-    _value->setLastLine(line);
-}
-
 }

interpreter/src/core/model/ast/declarations/ConstantDeclaration.h

@@ -31,8 +31,6 @@ class ConstantDeclaration : public Declaration {
     const std::string &name() const;
 
     ExpressionPtr value() const;
-
-    void setLastLine(int line) override;
 };
 
 } // end namespace naylang

interpreter/src/core/model/ast/declarations/MethodDeclaration.cpp

@@ -31,8 +31,4 @@ const std::vector<DeclarationPtr> &MethodDeclaration::params() const {
     return _params;
 }
 
-void MethodDeclaration::setLastLine(int line) {
-    Statement::setLastLine(line);
-    _body.back()->setLastLine(line);
-}
 }

interpreter/src/core/model/ast/declarations/MethodDeclaration.h

@@ -35,8 +35,6 @@ class MethodDeclaration : public Declaration {
     const std::string &name() const override;
     const std::vector<DeclarationPtr> &params() const;
     const std::vector<StatementPtr> &body() const;
-
-    void setLastLine(int line) override;
 };
 
 } // end namespace naylang

interpreter/src/core/model/ast/declarations/VariableDeclaration.cpp

@@ -32,9 +32,4 @@ const ExpressionPtr &VariableDeclaration::value() const {
     return _initialValue;
 }
 
-void VariableDeclaration::setLastLine(int line) {
-    Statement::setLastLine(line);
-    _initialValue->setLastLine(line);
-}
-
 }

interpreter/src/core/model/ast/declarations/VariableDeclaration.h

@@ -28,7 +28,6 @@ class VariableDeclaration : public Declaration {
     const std::string &name() const;
     const ExpressionPtr &value() const;
 
-    void setLastLine(int line) override;
 };
 
 }

interpreter/src/core/model/ast/expressions/ObjectConstructor.cpp

@@ -24,8 +24,4 @@ const std::vector<StatementPtr> &ObjectConstructor::statements() const {
     return _statements;
 }
 
-void ObjectConstructor::setLastLine(int line) {
-    Statement::setLastLine(line);
-    _statements.back()->setLastLine(line);
-}
 }

interpreter/src/core/model/ast/expressions/ObjectConstructor.h

@@ -19,9 +19,7 @@ class ObjectConstructor : public Expression {
     ObjectConstructor(const std::vector<StatementPtr> &statements);
 
     virtual void accept(Evaluator &evaluator);
-
-    void setLastLine(int line) override;
-
+    
     const std::vector<StatementPtr> &statements() const;
 };
 } // end namespace naylang

interpreter/src/core/parser/NaylangParserVisitor.cpp

@@ -78,7 +78,6 @@ antlrcpp::Any NaylangParserVisitor::visitPrefixExp(GraceParser::PrefixExpContext
     ctx->rec->accept(this);
     auto rec = popPartialExp();
     auto req = make_node<ExplicitRequestNode>(opname, rec, getLine(ctx), getCol(ctx));
-    req->setLastLine(getLastLine(ctx));
     pushPartialExp(req);
     return 0;
 }
@@ -87,7 +86,6 @@ antlrcpp::Any NaylangParserVisitor::visitPrefixExp(GraceParser::PrefixExpContext
 antlrcpp::Any NaylangParserVisitor::visitNumber(GraceParser::NumberContext *ctx) {
     int lastLine = ctx->stop->getLine();
     auto num = make_node<NumberLiteral>(std::stod(ctx->getText()), getLine(ctx), getCol(ctx));
-    num->setLastLine(lastLine);
     pushPartialExp(num);
     return 0;
 }
@@ -99,7 +97,6 @@ antlrcpp::Any NaylangParserVisitor::visitMulDivExp(GraceParser::MulDivExpContext
     auto op = ctx->op->getText() + "(_)";
     std::vector<ExpressionPtr> params{param};
     auto req = make_node<ExplicitRequestNode>(op, reciever, params, getLine(ctx), getCol(ctx));
-    req->setLastLine(getLastLine(ctx));
     pushPartialExp(req);
     return 0;
 }
@@ -112,23 +109,20 @@ antlrcpp::Any NaylangParserVisitor::visitAddSubExp(GraceParser::AddSubExpContext
     auto op = ctx->op->getText() + "(_)";
     std::vector<ExpressionPtr> params{param};
     auto req = make_node<ExplicitRequestNode>(op, reciever, params, getLine(ctx), getCol(ctx));
-    req->setLastLine(getLastLine(ctx));
     pushPartialExp(req);
     return 0;
 }
 
 antlrcpp::Any NaylangParserVisitor::visitString(GraceParser::StringContext *ctx) {
     auto contents = ctx->content->getText();
     auto str = make_node<StringLiteral>(contents, getLine(ctx), getCol(ctx));
-    str->setLastLine(getLastLine(ctx));
     pushPartialExp(str);
     return 0;
 }
 
 antlrcpp::Any NaylangParserVisitor::visitBoolean(GraceParser::BooleanContext *ctx) {
     bool value = ctx->TRUE() != nullptr;
     auto bul = make_node<BooleanLiteral>(value, getLine(ctx), getCol(ctx));
-    bul->setLastLine(getLastLine(ctx));
     pushPartialExp(bul);
     return 0;
 }
@@ -140,7 +134,6 @@ antlrcpp::Any NaylangParserVisitor::visitConstantDeclaration(GraceParser::Consta
     ctx->expression()->accept(this);
     auto value = popPartialExp();
     auto decl = make_node<ConstantDeclaration>(name, value, getLine(ctx), getCol(ctx));
-    decl->setLastLine(lastLine);
     notifyBreakable(decl);
     pushPartialDecl(decl);
     return 0;
@@ -158,7 +151,6 @@ antlrcpp::Any NaylangParserVisitor::visitVariableDeclaration(GraceParser::Variab
     ctx->expression()->accept(this);
     auto value = popPartialExp();
     auto decl = make_node<VariableDeclaration>(name, value, getLine(ctx), getCol(ctx));
-    decl->setLastLine(lastLine);
     notifyBreakable(decl);
     pushPartialDecl(decl);
     return 0;
@@ -186,7 +178,6 @@ antlrcpp::Any NaylangParserVisitor::visitUserMethod(GraceParser::UserMethodConte
     }
 
     auto methodDeclaration = make_node<MethodDeclaration>(methodName, formalParams, body, getLine(ctx), getCol(ctx));
-    methodDeclaration->setLastLine(getLastLine(ctx));
     pushPartialDecl(methodDeclaration);
     return 0;
 }

tests/src/core/model/ast/Statement_test.cpp

@@ -30,11 +30,4 @@ TEST_CASE("Statements", "[AST]") {
         node->makeStoppable();
         REQUIRE(node->stoppable());
     }
-
-    SECTION("A Statement has the line number of the last line") {
-        StatementPtr node = make_node<NumberLiteral>(0.0);
-        REQUIRE(!node->stoppable());
-        node->setLastLine(1337);
-        REQUIRE(node->lastLine() == 1337);
-    }
 }

tests/src/core/parser/NaylangParserVisitor_test.cpp

@@ -304,24 +304,6 @@ TEST_CASE("Stoppable nodes", "[Naylang Parser Visitor]") {
             REQUIRE(line->stoppable());
         }
     }
-
-    SECTION("Every stoppable node has a lastLine") {
-        auto AST = translate("def obj = object {\ndef v1 = 1;\nvar v2 := 2;\nmethod add(n) {\n var m1 := n;\n}\n};");
-        auto decl = static_cast<ConstantDeclaration &>(*(AST[0]));
-        auto obj = static_cast<ObjectConstructor &>(*(decl.value()));
-        REQUIRE(decl.line() == 1);
-        REQUIRE(obj.statements()[0]->line() == 2);
-        REQUIRE(obj.statements()[0]->lastLine() == 2);
-        REQUIRE(obj.statements()[1]->line() == 3);
-        REQUIRE(obj.statements()[1]->lastLine() == 3);
-        REQUIRE(obj.statements()[2]->line() == 4);
-        REQUIRE(obj.statements()[2]->lastLine() == 7);
-        REQUIRE(decl.lastLine() == 7);
-
-        SECTION("The last line of the last stoppable inside a container is the last line of the container") {
-            REQUIRE(obj.statements().back()->lastLine() == obj.lastLine());
-        }
-    }
 }
 
 GraceAST translate(std::string line) {