herbglitch/archeus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed double free of vector and parserlang and creating a parser by string should work now

Browse source
This commit is contained in:
herbglitch 2024-12-04 00:54:24 -07:00
parent 5a5eaabc14
commit 4c3d357cb9
12 changed files with 298 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/std/parser.c
View file

@ -1,3 +1,4 @@
#include "arc/std/parser/parserlang.h"
#include "arc/std/parser.h"
#include "arc/std/bool.h"
#include "arc/std/errno.h"
@ -100,7 +101,26 @@ void ARC_Parser_CreateFromVector(ARC_Parser **parser, ARC_Vector *language, ARC_
ARC_Parser_Create(parser, &languageAsArray, initLexerRulesFn, createDataFn, destroyDataFn, userData);
}
void ARC_Parser_CreateFromString(ARC_Parser **parser, ARC_String *languageString, ARC_Parser_InitLexerRulesFn initLexerRulesFn){
void ARC_Parser_CreateFromString(ARC_Parser **parser, ARC_String *languageString, ARC_Parser_InitLexerRulesFn initLexerRulesFn, ARC_Parser_GetStringIdFn getStringIdFn, ARC_ParserData_CreateFn *createDataFn, ARC_ParserData_DestroyFn *destroyDataFn, void *userData){
//create the language from the string
ARC_Parser *parserlangParser;
ARC_ParserLang_CreateAsParser(&parserlangParser, getStringIdFn);
if(arc_errno){
ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("ARC_Parser_CreateFromString(parser, languageString, initLexerRulesFn, getStringIdFn, createDataFn, destroyDataFn, userData), failed to create language from: %s", languageString->data);
return;
}
//copy the string because parse will destroy the string that is passed in
ARC_String *parserLangString;
ARC_String_Copy(&parserLangString, languageString);
ARC_Parser_Parse(parserlangParser, &parserLangString);
//create the parser from the parsed language
ARC_Vector *language = (ARC_Vector *)ARC_Parser_GetData(parserlangParser);
ARC_Parser_CreateFromVector(parser, language, initLexerRulesFn, createDataFn, destroyDataFn, userData);
//cleanup
ARC_Parser_Destroy(parserlangParser);
}
void ARC_Parser_Destroy(ARC_Parser *parser){
@ -122,7 +142,7 @@ void ARC_Parser_Destroy(ARC_Parser *parser){
free(parser->createDataFn);
}
//free the data and the deletion function callback
//do the same thing as clear but this time pass in the userData as well to clean that up
if(parser->destroyDataFn != NULL){
(*(parser->destroyDataFn))(parser->data, parser->userData);
free(parser->destroyDataFn);
@ -326,7 +346,7 @@ void ARC_Parser_ParseFile(ARC_Parser *parser, ARC_String *path){
void ARC_Parser_ClearData(ARC_Parser *parser){
//check if that data exists and the destructor exists to make sure they can be run
if(parser->data != NULL && parser->destroyDataFn != NULL){
(*(parser->destroyDataFn))(parser->data, parser->userData);
(*(parser->destroyDataFn))(parser->data, NULL);
}
//TODO: might want to error here