fix memory leak in declaration and function

This commit is contained in:
2025-06-26 16:56:17 +01:00
parent a9d0ba0318
commit 6828cc5f1a
12 changed files with 196 additions and 42 deletions

View File

@@ -49,5 +49,6 @@ void free_parse_call(void *ptr) {
darray_free(&parsedCall->args, free_parsed);
free_parsed(parsedCall->to_call);
free(parsedCall->to_call);
free(parsedCall);
}

View File

@@ -1,9 +1,9 @@
#include "declaration.h"
#include "../../lexer/token.h"
#include "../../memory.h"
#include "../function/function.h"
#include "../literals/literals.h"
#include "../parser.h"
#include "../function/function.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -23,7 +23,6 @@ ParsedValue *parse_declaration(char *file, DArray *tokens, size_t *index) {
darray_push(declarations, &_declaration);
ParsedSingleDeclaration *declaration =
darray_get(declarations, declarations->size - 1);
bool isFunction = false;
DArray parameters;
declaration->from = parse_null();
@@ -40,7 +39,6 @@ ParsedValue *parse_declaration(char *file, DArray *tokens, size_t *index) {
return parsedValue;
token = darray_get(tokens, *index);
if (token->type == TOKEN_LPAREN) {
isFunction = true;
darray_init(&parameters, sizeof(char *));
(*index)++;
error_if_finished(file, tokens, index);
@@ -63,8 +61,8 @@ ParsedValue *parse_declaration(char *file, DArray *tokens, size_t *index) {
file, token->line, token->column);
exit(EXIT_FAILURE);
}
char *parameter_name =
strcpy(checked_malloc(strlen(token->value) + 1), token->value);
char *parameter_name = checked_malloc(strlen(token->value) + 1);
strcpy(parameter_name, token->value);
darray_push(&parameters, &parameter_name);
(*index)++;
error_if_finished(file, tokens, index);
@@ -99,13 +97,15 @@ ParsedValue *parse_declaration(char *file, DArray *tokens, size_t *index) {
token->column);
exit(EXIT_FAILURE);
}
if (isFunction) {
declaration->from = create_parsed_function(declaration->name, parameters, declaration->from);
}
if ((*index) >= tokens->size)
break;
token = darray_get(tokens, *index);
}
if (parameters.resizable) {
declaration->from = create_parsed_function(declaration->name, parameters,
declaration->from);
}
if ((*index) >= tokens->size)
break;
token = darray_get(tokens, *index);
size_t count = skip_newlines_and_indents(tokens, index);
if ((*index) >= tokens->size)
break;

View File

@@ -1,5 +1,6 @@
#include "function.h"
#include "../../memory.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -15,11 +16,17 @@ ParsedValue *create_parsed_function(char *name, DArray parameters,
return parsedValue;
}
void free_parameter(void *ptr) {
char** data = ptr;
free(*data);
}
void free_function(void *ptr) {
ParsedValue *parsedValue = ptr;
ParsedFunction *parsed = parsedValue->data;
free_parsed(parsed->body);
free(parsed->body);
free(parsed->name);
darray_free(&parsed->parameters, NULL);
darray_free(&parsed->parameters, free_parameter);
free(parsed);
}

View File

@@ -23,8 +23,8 @@
#include <string.h>
const char *ValueTypeNames[] = {
"string", "assign", "identifier", "number", "if statement",
"access", "call", "declaration", "null", "boolean",
"string", "assign", "identifier", "number", "if statement",
"access", "call", "declaration", "null", "boolean",
"do wrap", "operations", "list", "dictionary", "function"};
void error_if_finished(char *file, DArray *tokens, size_t *index) {
@@ -157,7 +157,7 @@ ParsedValue *parse_token_full(char *file, DArray *tokens, size_t *index,
passed = true;
}
}
return output;
}