Fix pass type parsing

SingularityT3 · Mar 10, 2023 · c394c66 · c394c66
1 parent 2f6c9f9
commit c394c66
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/src/parser/functionParser.cpp b/src/parser/functionParser.cpp
@@ -29,13 +29,19 @@ Node *Parser::parseFunction() {
                 advance();
             }
 
-            if ((currentToken->type == TokenType::BYREF && !byRef)
-                || (currentToken->type == TokenType::BYVAL && byRef)
+            if (currentToken->type == TokenType::BYREF
+                || currentToken->type == TokenType::BYVAL
             ) {
-                for (int i = 0; i < passTypeCount; i++)
-                    parameterPassTypes.push_back(byRef);
-                byRef = !byRef;
-                passTypeCount = 1;
+                TokenType currentType = byRef ? TokenType::BYREF : TokenType::BYVAL;
+                if (currentType != currentToken->type) {
+                    parameterPassTypes.reserve(passTypeCount);
+                    for (int i = 0; i < passTypeCount; i++)
+                        parameterPassTypes.push_back(byRef);
+                    byRef = !byRef;
+                    passTypeCount = 1;
+                } else {
+                    passTypeCount++;
+                }
                 advance();
             } else {
                 passTypeCount++;
@@ -60,13 +66,15 @@ Node *Parser::parseFunction() {
             advance();
 
             parameterNames.emplace_back(paramName);
+            parameterTypes.reserve(typeCount);
             for (int i = 0; i < typeCount; i++) {
                 parameterTypes.emplace_back(type);
             }
             typeCount = 1;
         }
         if (typeCount != 1) throw PSC::ExpectedTokenError(*currentToken, "data type"); 
         if (passTypeCount > 0) {
+            parameterPassTypes.reserve(passTypeCount);
             for (int i = 0; i < passTypeCount; i++)
                 parameterPassTypes.push_back(byRef);
         }

diff --git a/src/parser/procedureParser.cpp b/src/parser/procedureParser.cpp
@@ -61,13 +61,19 @@ Node *Parser::parseProcedure() {
                 advance();
             }
 
-            if ((currentToken->type == TokenType::BYREF && !byRef)
-                || (currentToken->type == TokenType::BYVAL && byRef)
+            if (currentToken->type == TokenType::BYREF
+                || currentToken->type == TokenType::BYVAL
             ) {
-                for (int i = 0; i < passTypeCount; i++)
-                    parameterPassTypes.push_back(byRef);
-                byRef = !byRef;
-                passTypeCount = 1;
+                TokenType currentType = byRef ? TokenType::BYREF : TokenType::BYVAL;
+                if (currentType != currentToken->type) {
+                    parameterPassTypes.reserve(passTypeCount);
+                    for (int i = 0; i < passTypeCount; i++)
+                        parameterPassTypes.push_back(byRef);
+                    byRef = !byRef;
+                    passTypeCount = 1;
+                } else {
+                    passTypeCount++;
+                }
                 advance();
             } else {
                 passTypeCount++;
@@ -92,13 +98,15 @@ Node *Parser::parseProcedure() {
             advance();
 
             parameterNames.emplace_back(paramName);
+            parameterTypes.reserve(typeCount);
             for (int i = 0; i < typeCount; i++) {
                 parameterTypes.emplace_back(type);
             }
             typeCount = 1;
         }
         if (typeCount != 1) throw PSC::ExpectedTokenError(*currentToken, "data type"); 
         if (passTypeCount > 0) {
+            parameterPassTypes.reserve(passTypeCount);
             for (int i = 0; i < passTypeCount; i++)
                 parameterPassTypes.push_back(byRef);
         }