Use new parser for function

samples/test.brc

@@ -48,11 +48,11 @@ i u32 <- 0, rep text[i] != 0:
 
 ;*/
 
-main fun -> sint32
+main fun: a sint32, b sint32 -> sint32
     //printChar()
 
-    //res1 sint32 <- normAdd(4, 5)
+    res1 sint32 <- a - b
     //res2 sint32 <- rawAdd(4, 5)
 
-    ret 2-
+    ret res1
 ;

src/Parser/Parsee/ParseeGroup.cpp

@@ -2,8 +2,8 @@
 
 #include "Parsee.h"
 
-ParseeGroup::ParseeGroup(/*bool isRequired, */vector<Parsee> parsees, optional<ParseeGroup> repeatedGroup):
+ParseeGroup::ParseeGroup(vector<Parsee> parsees, optional<ParseeGroup> repeatedGroup):
-/*isRequired(isRequired), */parsees(parsees) {
+parsees(parsees) {
     if (repeatedGroup) {
         this->repeatedGroup = *repeatedGroup;
     } else {
@@ -11,10 +11,6 @@ ParseeGroup::ParseeGroup(/*bool isRequired, */vector<Parsee> parsees, optional<P
     }
  }
 
-/*bool ParseeGroup::getIsRequired() {
-    return isRequired;
-}*/
-
 vector<Parsee> ParseeGroup::getParsees() {
     return parsees;
 }

src/Parser/Parsee/ParseeGroup.h

@@ -10,13 +10,11 @@ using namespace std;
 
 class ParseeGroup {
 private:
-    //bool isRequired;
     vector<Parsee> parsees;
     optional<reference_wrapper<ParseeGroup>> repeatedGroup;
 
 public:
-    ParseeGroup(/*bool isRequired, */vector<Parsee> parsees, optional<ParseeGroup> repeatedGroup);
+    ParseeGroup(vector<Parsee> parsees, optional<ParseeGroup> repeatedGroup);
-    //bool getIsRequired();
     vector<Parsee> getParsees();
     optional<reference_wrapper<ParseeGroup>> getRepeatedGroup();
 };

src/Parser/Parser.cpp

@@ -159,24 +159,6 @@ shared_ptr<Statement> Parser::matchStatementMetaExternFunction() {
 }
 
 shared_ptr<Statement> Parser::matchStatementVariable() {
-    /*if (!tryMatchingTokenKinds({TokenKind::IDENTIFIER, TokenKind::TYPE}, true, false))
-        return nullptr;
-
-    shared_ptr<Token> identifierToken = tokens.at(currentIndex++);
-    shared_ptr<ValueType> valueType = matchValueType();
-
-    // Expect left arrow
-    if (!tryMatchingTokenKinds({TokenKind::LEFT_ARROW}, true, true)) {
-        markError(TokenKind::LEFT_ARROW, {});
-        return nullptr;
-    }
-
-    shared_ptr<Expression> expression = nextExpression();
-    if (expression == nullptr)
-        return nullptr;
-
-    return make_shared<StatementVariable>(identifierToken->getLexme(), valueType, expression);*/
-
     ParseeResultsGroup resultsGroup = parseeResultsGroupForParseeGroup(
         ParseeGroup(
             {
@@ -192,68 +174,105 @@ shared_ptr<Statement> Parser::matchStatementVariable() {
     if (resultsGroup.getKind() != ParseeResultsGroupKind::SUCCESS)
         return nullptr;
 
-    string name = resultsGroup.getResults().at(0).getToken()->getLexme();// tokens.at(currentIndex++);
+    string name = resultsGroup.getResults().at(0).getToken()->getLexme();
     shared_ptr<ValueType> valueType = resultsGroup.getResults().at(1).getValueType();
     shared_ptr<Expression> expression = resultsGroup.getResults().at(2).getExpression();
 
     return make_shared<StatementVariable>(name, valueType, expression);
-
-    /*optional<vector<ParseeResult>> parseeResults = parseeResultsForParseeGroup(
-        ParseeGroup(
-            false,
-            {
-                Parsee::tokenParsee(TokenKind::IDENTIFIER, true, true),
-                Parsee::valueTypeParsee(),
-                Parsee::tokenParsee(TokenKind::LEFT_ARROW, true, false),
-                Parsee::expressionParsee()
-            },
-            { }
-        )
-    );
-
-    optional<vector<ParseeResult>> parseeResults = parseeResultsForParseeGroup(parseeGroup);*/
 }
 
 shared_ptr<Statement> Parser::matchStatementFunction() {
-     if (!tryMatchingTokenKinds({TokenKind::IDENTIFIER, TokenKind::FUNCTION}, true, false))
+    bool hasError = false;
-        return nullptr;
+    ParseeResultsGroup resultsGroup;
 
     string name;
     vector<pair<string, shared_ptr<ValueType>>> arguments;
     shared_ptr<ValueType> returnType = ValueType::NONE;
     shared_ptr<Statement> statementBlock;
 
-    // name
+    // identifier
-    name = tokens.at(currentIndex++)->getLexme();
+    resultsGroup = parseeResultsGroupForParseeGroup(
-    currentIndex++; // skip fun
+        ParseeGroup(
+            {
+                Parsee::tokenParsee(TokenKind::IDENTIFIER, true, true),
+                Parsee::tokenParsee(TokenKind::FUNCTION, true, false)
+            },
+            {}
+        )
+    );
+
+    switch (resultsGroup.getKind()) {
+        case ParseeResultsGroupKind::SUCCESS:
+            name = resultsGroup.getResults().at(0).getToken()->getLexme();
+            break;
+        case ParseeResultsGroupKind::NO_MATCH:
+            return nullptr;
+            break;
+        case ParseeResultsGroupKind::FAILURE:
+            hasError = true;
+            break;
+    }
 
     // arguments
-    if (tryMatchingTokenKinds({TokenKind::COLON}, true, true)) {
+    if (!hasError) {
-        do {
+        resultsGroup = parseeResultsGroupForParseeGroup(
-            tryMatchingTokenKinds({TokenKind::NEW_LINE}, true, true); // skip new line
+            ParseeGroup(
-            if (!tryMatchingTokenKinds({TokenKind::IDENTIFIER, TokenKind::TYPE}, true, false)) {
+                {
-                markError({}, "Expected function argument");
+                    Parsee::tokenParsee(TokenKind::COLON, true, false),
-                return nullptr;
+                    Parsee::tokenParsee(TokenKind::NEW_LINE, false, false),
-            }
+                    Parsee::tokenParsee(TokenKind::IDENTIFIER, true, true),
-            shared_ptr<Token> identifierToken = tokens.at(currentIndex++);
+                    Parsee::valueTypeParsee(true)
-            shared_ptr<ValueType> argumentType = matchValueType();
+                },
-            if (argumentType == nullptr) {
+                ParseeGroup(
-                markError(TokenKind::TYPE, {});
+                    {
-                return nullptr;
+                        Parsee::tokenParsee(TokenKind::COMMA, true, false),
-            }
+                        Parsee::tokenParsee(TokenKind::NEW_LINE, false, false),
-            
+                        Parsee::tokenParsee(TokenKind::IDENTIFIER, true, true),
-            arguments.push_back(pair<string, shared_ptr<ValueType>>(identifierToken->getLexme(), argumentType));
+                        Parsee::valueTypeParsee(true)
-        } while (tryMatchingTokenKinds({TokenKind::COMMA}, true, true));
+                    },
+                    {}
+                )
+            )
+        );
+        switch (resultsGroup.getKind()) {
+            case ParseeResultsGroupKind::SUCCESS:
+                for (int i=0; i<resultsGroup.getResults().size(); i+=2) {
+                    pair<string, shared_ptr<ValueType>> arg;
+                    arg.first = resultsGroup.getResults().at(i).getToken()->getLexme();
+                    arg.second = resultsGroup.getResults().at(i+1).getValueType();
+                    arguments.push_back(arg);
+                }
+                break;
+            case ParseeResultsGroupKind::NO_MATCH:
+                break;
+            case ParseeResultsGroupKind::FAILURE:
+                hasError = true;
+                break;
+        }
     }
 
     // return type 
-    if (tryMatchingTokenKinds({TokenKind::RIGHT_ARROW}, true, true)) {
+    if (!hasError) {
-        tryMatchingTokenKinds({TokenKind::NEW_LINE}, true, true); // skip new line
+        resultsGroup = parseeResultsGroupForParseeGroup(
+            ParseeGroup(
+                {
+                    Parsee::tokenParsee(TokenKind::RIGHT_ARROW, true, false),
+                    Parsee::tokenParsee(TokenKind::NEW_LINE, false, false),
+                    Parsee::valueTypeParsee(true)
+                },
+                {}
+            )
+        );
 
-        returnType = matchValueType();
+        switch (resultsGroup.getKind()) {
-        if (returnType == nullptr) {
+            case ParseeResultsGroupKind::SUCCESS:
-            markError(TokenKind::TYPE, {});
+                returnType = resultsGroup.getResults().at(0).getValueType();
-            return nullptr;
+                break;
+            case ParseeResultsGroupKind::NO_MATCH:
+                break;
+            case ParseeResultsGroupKind::FAILURE:
+                hasError = true;
+                break;
         }
     }
 
@@ -268,6 +287,7 @@ shared_ptr<Statement> Parser::matchStatementFunction() {
     if (statementBlock == nullptr)
         return nullptr;
 
+    // closing semicolon
     if(!tryMatchingTokenKinds({TokenKind::SEMICOLON}, false, true)) {
         markError(TokenKind::SEMICOLON, {});
         return nullptr;
@@ -931,85 +951,21 @@ ParseeResultsGroup Parser::parseeResultsGroupForParseeGroup(ParseeGroup group) {
             currentIndex += (*result).getTokensCount();
     }
 
-    /*if (group.getRepeatedGroup()) {
+    if (group.getRepeatedGroup()) {
-        bool hasSubResults = false;
+        ParseeResultsGroup subResultsGroup;
-
-        optional<vector<ParseeResult>> subResults;
         do {
-            subResults = parseeResultsForParseeGroup(*group.getRepeatedGroup());
+            subResultsGroup = parseeResultsGroupForParseeGroup(*group.getRepeatedGroup());
-            if (!subResults)
+            if (subResultsGroup.getKind() == ParseeResultsGroupKind::FAILURE)
                 return ParseeResultsGroup::failure();
-                //return {};
 
-            for (ParseeResult &subResult : *subResults)
+            for (ParseeResult &subResult : subResultsGroup.getResults())
                 results.push_back(subResult);
-        } while (!(*subResults).empty());
+        } while (subResultsGroup.getKind() == ParseeResultsGroupKind::SUCCESS);
-    }*/
+    }
 
     return ParseeResultsGroup::success(results);
 }
 
-/*optional<vector<ParseeResult>> Parser::parseeResultsForParseeGroup(ParseeGroup group) {
-    int startIndex = currentIndex;
-    vector<ParseeResult> results;
-    bool mustFulfill = false;
-
-    for (Parsee &parsee : group.getParsees()) {
-        optional<ParseeResult> result;
-        switch (parsee.getKind()) {
-            case ParseeKind::TOKEN:
-                result = tokenParseeResult(currentIndex, parsee.getTokenKind());
-                break;
-            case ParseeKind::VALUE_TYPE:
-                result = valueTypeParseeResult(currentIndex);
-                break;
-            case ParseeKind::EXPRESSION:
-                result = expressionParseeResult(currentIndex);
-                break;
-        }
-
-        // if doesn't match on optional group
-        if (!result && parsee.getIsRequired() && !group.getIsRequired() && !mustFulfill) {
-            currentIndex = startIndex;
-            return vector<ParseeResult>();
-        }
-
-        // return matching token?
-        if (result && parsee.getShouldReturn())
-            results.push_back(*result);
-
-        // decide if we're decoding the expected sequence
-        if (!parsee.getIsRequired() && currentIndex > startIndex)
-            mustFulfill = true;
-
-        // invalid sequence detected?
-        if (!result && parsee.getIsRequired() && mustFulfill) {
-            markError(parsee.getTokenKind(), {});
-            return {};
-        }
-
-        // got to the next token if we got a match
-        if (result)
-            currentIndex += (*result).getTokensCount();
-    }
-
-    if (group.getRepeatedGroup()) {
-        bool hasSubResults = false;
-
-        optional<vector<ParseeResult>> subResults;
-        do {
-            subResults = parseeResultsForParseeGroup(*group.getRepeatedGroup());
-            if (!subResults)
-                return {};
-
-            for (ParseeResult &subResult : *subResults)
-                results.push_back(subResult);
-        } while (!(*subResults).empty());
-    }
-
-    return results;
-}*/
-
 optional<ParseeResult> Parser::tokenParseeResult(int index, TokenKind tokenKind) {
     shared_ptr<Token> token = tokens.at(index);
     if (token->isOfKind({tokenKind}))

src/Parser/Parser.h

@@ -57,7 +57,6 @@ private:
     shared_ptr<ValueType> matchValueType();
 
     ParseeResultsGroup parseeResultsGroupForParseeGroup(ParseeGroup group);
-    //optional<vector<ParseeResult>> parseeResultsForParseeGroup(ParseeGroup group);
     optional<ParseeResult> tokenParseeResult(int index, TokenKind tokenKind);
     optional<ParseeResult> valueTypeParseeResult(int index);
     optional<ParseeResult> expressionParseeResult(int index);