Update to new code version

Author: Digit16

interpreter/main.cpp

@@ -62,7 +62,7 @@ int main(int argc, char* argv[])
         interpreter.registerBuiltInMethod("rotateRight()");
         interpreter.registerBuiltInMethod("push()");
 
-        std::shared_ptr<AstNode> tree = interpreter.buildTree();
+        std::shared_ptr<AstNode> tree = interpreter.buildTree(input);
 
         st::SymbolTable& stRef = interpreter.symbolTable();
         SymbolTableBuilder stb;

interpreter/src/Interpreter.cpp

@@ -618,7 +618,7 @@ std::vector<std::string> Interpreter::getSequence()
     return symbolTable().sequence();
 }
 
-std::shared_ptr<AstNode> Interpreter::buildTree()
+std::shared_ptr<AstNode> Interpreter::buildTree(const std::string& text)
 {
     return _parser.parse();
 }

interpreter/src/Interpreter.h

@@ -132,7 +132,7 @@ class Interpreter
 
     std::vector<std::string> getSequence();
 
-    std::shared_ptr<AstNode> buildTree();
+    std::shared_ptr<AstNode> buildTree(const std::string& text);
 
     std::shared_ptr<AstNode> interpret(std::shared_ptr<AstNode> tree);
 

interpreter/src/Lexer.cpp

@@ -160,23 +160,15 @@ char Lexer::peekNextChar()
     return this->_text[this->_pos + 1];
 }
 
-bool Lexer::isBuiltInFunction(const std::string& result)
+std::map<std::string, Token> Lexer::getReservedKeywords()
 {
+    if (_builtInMethods.empty()) {
+        std::cout << "chuj bombki szczelyl" << std::endl;
+    }
     for (const auto& fun : _builtInMethods) {
-        std::string function = fun;
-        function.pop_back();
-        function.pop_back();
-
-        if (result == function) {
-            return true;
-        }
+        std::cout << fun << std::endl;
     }
 
-    return false;
-}
-
-std::map<std::string, Token> Lexer::getReservedKeywords()
-{
     std::map<std::string, Token> RESERVED_KEYWORDS{
         {"START", Token("START", TokenType::START)               },
         {"END",   Token("END",   TokenType::END)                 },
@@ -205,7 +197,7 @@ Token Lexer::id()
         advance();
     }
 
-    if (_currentChar == '(' && peekNextChar() == ')' && isBuiltInFunction(result)) {
+    if (_currentChar == '(' && peekNextChar() == ')') {
         result += "()";
         advance();
         advance();

interpreter/src/Lexer.h

@@ -51,8 +51,6 @@ class Lexer
     int16_t getParsingLine() { return _parsingLine; }
     int16_t getParsingPosition() { return _parsingPosition; }
 
-    bool isBuiltInFunction(const std::string& result);
-
     std::map<std::string, Token> getReservedKeywords();
 
 private:

interpreter/tests/test_interpreter.h

@@ -1,16 +1,18 @@
 #pragma once
 
-#include "../CodeInterpreter.h"
+
 #include "tests/test_macros.h"
+#include "../CodeInterpreter.h"
 
 namespace TestInterpreter {
 
-TEST_CASE("[Interpreter] 2+2")
-{
-    CodeInterpreter interpreter{};
-    interpreter.interpret("START auto val1 = 2 + 2 END.");
 
-    CHECK(interpreter.getVariable("val1") == "4");
+TEST_CASE("[Interpreter] 2+2") {
+	CodeInterpreter interpreter{};
+	interpreter.interpret("START auto val1 = 2 + 2 END.");
+	
+	CHECK(interpreter.getVariable("val1") == "4");
 }
 
-} // namespace TestInterpreter
+
+}