bout halfway complete with parserlang, also added userdata to parser
This commit is contained in:
parent
7cfea02681
commit
16821e8411
6 changed files with 190 additions and 44 deletions
|
|
@ -13,13 +13,13 @@ struct ARC_Parser {
|
|||
ARC_Lexer *lexer;
|
||||
|
||||
void *data;
|
||||
void *createUserData;
|
||||
void *userData;
|
||||
ARC_ParserData_CreateFn *createDataFn;
|
||||
ARC_ParserData_DestroyFn *destroyDataFn;
|
||||
|
||||
};
|
||||
|
||||
void ARC_Parser_Create(ARC_Parser **parser, ARC_Array *language, ARC_Parser_InitLexerRulesFn initLexerRulesFn, ARC_ParserData_CreateFn *createDataFn, void *createUserData, ARC_ParserData_DestroyFn *destroyDataFn){
|
||||
void ARC_Parser_Create(ARC_Parser **parser, ARC_Array *language, ARC_Parser_InitLexerRulesFn initLexerRulesFn, ARC_ParserData_CreateFn *createDataFn, ARC_ParserData_DestroyFn *destroyDataFn, void *userData){
|
||||
*parser = (ARC_Parser *)malloc(sizeof(ARC_Parser));
|
||||
|
||||
//set the language size to 0 and data to NULL in case the language is NULL
|
||||
|
|
@ -59,14 +59,20 @@ void ARC_Parser_Create(ARC_Parser **parser, ARC_Array *language, ARC_Parser_Init
|
|||
//register instructions to the lexer
|
||||
initLexerRulesFn(((*parser)->lexer));
|
||||
|
||||
//create the data and copy the creation function if the creation function exists
|
||||
//set the data to null (the parse function is what creates it)
|
||||
(*parser)->data = NULL;
|
||||
|
||||
//set the userData for the create callback function
|
||||
(*parser)->userData = userData;
|
||||
|
||||
//init the create function callback with null, then copy the callback if it exists
|
||||
(*parser)->createDataFn = NULL;
|
||||
if(createDataFn != NULL){
|
||||
(*parser)->createDataFn = (ARC_ParserData_CreateFn *)malloc(sizeof(ARC_ParserData_CreateFn));
|
||||
*((*parser)->createDataFn) = *createDataFn;
|
||||
}
|
||||
|
||||
//init the destroy function callback with null, then copy the callback if it exists
|
||||
(*parser)->destroyDataFn = NULL;
|
||||
if(createDataFn != NULL){
|
||||
(*parser)->destroyDataFn = (ARC_ParserData_DestroyFn *)malloc(sizeof(ARC_ParserData_DestroyFn));
|
||||
|
|
@ -74,7 +80,7 @@ void ARC_Parser_Create(ARC_Parser **parser, ARC_Array *language, ARC_Parser_Init
|
|||
}
|
||||
}
|
||||
|
||||
void ARC_Parser_CreateFromVector(ARC_Parser **parser, ARC_Vector *language, ARC_Parser_InitLexerRulesFn initLexerRulesFn, ARC_ParserData_CreateFn *createDataFn, void *createUserData, ARC_ParserData_DestroyFn *destroyDataFn){
|
||||
void ARC_Parser_CreateFromVector(ARC_Parser **parser, ARC_Vector *language, ARC_Parser_InitLexerRulesFn initLexerRulesFn, ARC_ParserData_CreateFn *createDataFn, ARC_ParserData_DestroyFn *destroyDataFn, void *userData){
|
||||
//creates the variables to copy the vector into
|
||||
const uint32_t languageSize = ARC_Vector_GetSize(language);
|
||||
ARC_ParserTag languageArray[languageSize];
|
||||
|
|
@ -91,7 +97,7 @@ void ARC_Parser_CreateFromVector(ARC_Parser **parser, ARC_Vector *language, ARC_
|
|||
};
|
||||
|
||||
//create the parser
|
||||
ARC_Parser_Create(parser, &languageAsArray, initLexerRulesFn, createDataFn, createUserData, destroyDataFn);
|
||||
ARC_Parser_Create(parser, &languageAsArray, initLexerRulesFn, createDataFn, destroyDataFn, userData);
|
||||
}
|
||||
|
||||
void ARC_Parser_CreateFromString(ARC_Parser **parser, ARC_String *languageString, ARC_Parser_InitLexerRulesFn initLexerRulesFn){
|
||||
|
|
@ -118,7 +124,7 @@ void ARC_Parser_Destroy(ARC_Parser *parser){
|
|||
|
||||
//free the data and the deletion function callback
|
||||
if(parser->destroyDataFn != NULL){
|
||||
(*(parser->destroyDataFn))(parser->data);
|
||||
(*(parser->destroyDataFn))(parser->data, parser->userData);
|
||||
free(parser->destroyDataFn);
|
||||
}
|
||||
|
||||
|
|
@ -296,7 +302,7 @@ void ARC_Parser_Parse(ARC_Parser *parser, ARC_String **data){
|
|||
|
||||
//create the data if the creation callback exists
|
||||
if(parser->createDataFn != NULL){
|
||||
(*(parser->createDataFn))(&(parser->data), tagToken, parser->createUserData);
|
||||
(*(parser->createDataFn))(&(parser->data), tagToken, parser->userData);
|
||||
}
|
||||
|
||||
//cleanup
|
||||
|
|
@ -318,7 +324,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->destroyDataFn))(parser->data, parser->userData);
|
||||
}
|
||||
|
||||
//TODO: might want to error here
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue