Fix memory and other issues with procedures

Author: James-Livesey

dist/catto.h

@@ -1161,11 +1161,13 @@ CATTO_FN_PREFIX void catto_removeScopedVariables(catto_Context* context) {
         if (variable->scope >= context->statementStackCount) {
             if (previousVariable) {
                 previousVariable->nextVariable = nextVariable;
-            } else {
+            }
+            
+            if (variable == context->firstVariable) {
                 context->firstVariable = nextVariable;
             }
 
-            if (context->lastVariable == variable) {
+            if (variable == context->lastVariable) {
                 context->lastVariable = previousVariable;
             }
 
@@ -2759,9 +2761,9 @@ CATTO_FN_PREFIX catto_AstNode* catto_parseStatement(catto_Token** currentTokenPt
             parsedAccessor = CATTO_TRUE;
         }
 
-        catto_Token* assignmentOperatorToken = catto_eatIfType(currentTokenPtr, CATTO_TOKEN_TYPE_OPERATOR);
+        catto_Token* assignmentOperatorToken = catto_eatIfKeyword(currentTokenPtr, "=");
 
-        if (assignmentOperatorToken && catto_stringsEqualCaseInsensitive(assignmentOperatorToken->value.asString, "=")) {
+        if (assignmentOperatorToken) {
             catto_AstNode* value = CATTO_NULL;
 
             if (!catto_parseExpression(currentTokenPtr, &value)) {
@@ -3067,6 +3069,17 @@ CATTO_FN_PREFIX void catto_debugAstNodes(catto_AstNode* firstAstNode) {
 
                 break;
 
+            case CATTO_AST_NODE_TYPE_PROCEDURE_STATEMENT:
+                CATTO_LOG(currentAstNode->value.asStatement.attributes.asProcedure.name);
+
+                CATTO_LOG_CHAR('(');
+
+                catto_debugAstNodes(currentAstNode->value.asStatement.firstArgument);
+
+                CATTO_LOG_CHAR(')');
+
+                break;
+
             case CATTO_AST_NODE_TYPE_EXPRESSION_LEAF:
                 if (currentAstNode->value.asExpressionLeaf.subjectVariable) {
                     CATTO_LOG(currentAstNode->value.asExpressionLeaf.subjectVariable);

src/contexts.h

@@ -657,11 +657,13 @@ void catto_removeScopedVariables(catto_Context* context) {
         if (variable->scope >= context->statementStackCount) {
             if (previousVariable) {
                 previousVariable->nextVariable = nextVariable;
-            } else {
+            }
+            
+            if (variable == context->firstVariable) {
                 context->firstVariable = nextVariable;
             }
 
-            if (context->lastVariable == variable) {
+            if (variable == context->lastVariable) {
                 context->lastVariable = previousVariable;
             }
 

src/numbers.h

@@ -95,14 +95,14 @@ catto_Char* catto_numberToString(catto_Float number) {
     number -= integralPart; // Now fractional part
 
     do {
-        catto_appendCharToString(string, (catto_Char)('0' + (integralPart % 10)));
+        string = catto_appendCharToString(string, (catto_Char)('0' + (integralPart % 10)));
 
         integralPart /= 10;
         precisionLeft--;
     } while (integralPart > 0);
 
     if (isNegative) {
-        catto_appendCharToString(string, '-');
+        string = catto_appendCharToString(string, '-');
     }
 
     catto_reverseString(string);
@@ -111,7 +111,7 @@ catto_Char* catto_numberToString(catto_Float number) {
     catto_Bool anyDigitsInFractionalPart = CATTO_FALSE;
 
     if (number > CATTO_EPSILON && precisionLeft > 0) {
-        catto_appendCharToString(string, '.');
+        string = catto_appendCharToString(string, '.');
 
         while (number > CATTO_EPSILON && precisionLeft > 0) {
             number *= 10;
@@ -125,7 +125,7 @@ catto_Char* catto_numberToString(catto_Float number) {
                 anyDigitsInFractionalPart = CATTO_TRUE;
             }
 
-            catto_appendCharToString(string, (catto_Char)('0' + digit));
+            string = catto_appendCharToString(string, (catto_Char)('0' + digit));
 
             number -= digit;
             precisionLeft--;
@@ -144,10 +144,10 @@ catto_Char* catto_numberToString(catto_Float number) {
     }
 
     if (exponent != 0) {
-        catto_appendCharToString(string, 'E');
+        string = catto_appendCharToString(string, 'E');
 
         if (exponent > 0) {
-            catto_appendCharToString(string, '+');
+            string = catto_appendCharToString(string, '+');
         }
 
         catto_Char* exponentString = catto_numberToString(exponent);

src/parser.h

@@ -446,9 +446,9 @@ catto_AstNode* catto_parseStatement(catto_Token** currentTokenPtr, catto_AstNode
             parsedAccessor = CATTO_TRUE;
         }
 
-        catto_Token* assignmentOperatorToken = catto_eatIfType(currentTokenPtr, CATTO_TOKEN_TYPE_OPERATOR);
+        catto_Token* assignmentOperatorToken = catto_eatIfKeyword(currentTokenPtr, "=");
 
-        if (assignmentOperatorToken && catto_stringsEqualCaseInsensitive(assignmentOperatorToken->value.asString, "=")) {
+        if (assignmentOperatorToken) {
             catto_AstNode* value = CATTO_NULL;
 
             if (!catto_parseExpression(currentTokenPtr, &value)) {
@@ -754,6 +754,17 @@ void catto_debugAstNodes(catto_AstNode* firstAstNode) {
 
                 break;
 
+            case CATTO_AST_NODE_TYPE_PROCEDURE_STATEMENT:
+                CATTO_LOG(currentAstNode->value.asStatement.attributes.asProcedure.name);
+
+                CATTO_LOG_CHAR('(');
+
+                catto_debugAstNodes(currentAstNode->value.asStatement.firstArgument);
+
+                CATTO_LOG_CHAR(')');
+
+                break;
+
             case CATTO_AST_NODE_TYPE_EXPRESSION_LEAF:
                 if (currentAstNode->value.asExpressionLeaf.subjectVariable) {
                     CATTO_LOG(currentAstNode->value.asExpressionLeaf.subjectVariable);

src/stdlib/functions.h

@@ -58,7 +58,7 @@ catto_TypedValue catto_function_chr(catto_Context* context, catto_DataType retur
     catto_Char* string = catto_copyString("");
 
     if (codepoint > 0) {
-        catto_appendCharToString(string, codepoint);
+        string = catto_appendCharToString(string, codepoint);
     }
 
     catto_TypedValue returnValue = catto_asTypedString(string);