Fix function declaration

README.md

@@ -1,7 +0,0 @@
-## Dependencies 
-- GLEW (OpenGL Extension Wrangler Library) - Version 2.1.0
-- GLFW (OpenGL Framework) - Version 3.3
-- GLM (OpenGL Mathematics) - Version 0.9.9.7
-- lodepng - Version 20160124
-
-*to be upgraded*

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(input);
+        std::shared_ptr<AstNode> tree = interpreter.buildTree();
 
         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(const std::string& text)
+std::shared_ptr<AstNode> Interpreter::buildTree()
 {
     return _parser.parse();
 }

interpreter/src/Interpreter.h

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

interpreter/src/Lexer.cpp

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

interpreter/src/Lexer.h

@@ -51,6 +51,8 @@ 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: