still working on parser, plan to rework to parsing first, then calling struct creation callback after with vector of tokens and tags
This commit is contained in:
parent
fcc07493d3
commit
d69844dab1
9 changed files with 251 additions and 27 deletions
|
|
@ -27,11 +27,11 @@ void ARC_Parser_Create(ARC_Parser **parser, ARC_Array *language, ARC_Parser_Init
|
|||
//if the language exists, copy the language
|
||||
if(language != NULL){
|
||||
(*parser)->language.size = language->size;
|
||||
(*parser)->language.data = malloc(sizeof(ARC_ParserLanguageTag) * language->size);
|
||||
(*parser)->language.data = malloc(sizeof(ARC_ParserTag) * language->size);
|
||||
|
||||
for(uint32_t index = 0; index < language->size; index++){
|
||||
ARC_ParserLanguageTag *languageTag = ((ARC_ParserLanguageTag *)language->data) + index;
|
||||
ARC_ParserLanguageTag *currentTag = ((ARC_ParserLanguageTag *)(*parser)->language.data) + index;
|
||||
ARC_ParserTag *languageTag = ((ARC_ParserTag *)language->data) + index;
|
||||
ARC_ParserTag *currentTag = ((ARC_ParserTag *)(*parser)->language.data) + index;
|
||||
|
||||
//copy the language tag into the current tag
|
||||
currentTag->tagId = languageTag->tagId;
|
||||
|
|
@ -52,7 +52,7 @@ void ARC_Parser_Create(ARC_Parser **parser, ARC_Array *language, ARC_Parser_Init
|
|||
//add the add function
|
||||
currentTag->addDataFn = NULL;
|
||||
if(languageTag->addDataFn != NULL){
|
||||
currentTag->addDataFn = (ARC_ParserLanguageTag_AddDataFn *)malloc(sizeof(ARC_ParserLanguageTag_AddDataFn));
|
||||
currentTag->addDataFn = (ARC_ParserTag_AddDataFn *)malloc(sizeof(ARC_ParserTag_AddDataFn));
|
||||
*(currentTag->addDataFn) = *(languageTag->addDataFn);
|
||||
}
|
||||
}
|
||||
|
|
@ -80,13 +80,33 @@ 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, ARC_ParserData_DestroyFn *destroyDataFn){
|
||||
//creates the variables to copy the vector into
|
||||
const uint32_t languageSize = ARC_Vector_GetSize(language);
|
||||
ARC_ParserTag languageArray[languageSize];
|
||||
|
||||
//copy the language from a vector into an array
|
||||
for(uint32_t index = 0; index < languageSize; index++){
|
||||
languageArray[index] = *(ARC_ParserTag *)ARC_Vector_Get(language, index);
|
||||
}
|
||||
|
||||
//set the vector data as an ARC_Array
|
||||
ARC_Array languageAsArray = {
|
||||
languageSize,
|
||||
languageArray
|
||||
};
|
||||
|
||||
//create the parser
|
||||
ARC_Parser_Create(parser, &languageAsArray, initLexerRulesFn, createDataFn, destroyDataFn);
|
||||
}
|
||||
|
||||
void ARC_Parser_CreateFromString(ARC_Parser **parser, ARC_String *languageString, ARC_Parser_InitLexerRulesFn initLexerRulesFn){
|
||||
}
|
||||
|
||||
void ARC_Parser_Destroy(ARC_Parser *parser){
|
||||
//clear all the copied token or tags from memory
|
||||
for(uint32_t index = 0; index < parser->language.size; index++){
|
||||
ARC_ParserLanguageTag *currentTag = ((ARC_ParserLanguageTag *)parser->language.data) + index;
|
||||
ARC_ParserTag *currentTag = ((ARC_ParserTag *)parser->language.data) + index;
|
||||
|
||||
//free the orIndex vlues
|
||||
for(uint32_t orIndex = 0; orIndex < currentTag->tokensOrTagsSize; orIndex++){
|
||||
|
|
@ -123,9 +143,9 @@ void ARC_Parser_Destroy(ARC_Parser *parser){
|
|||
//private recusive function to parse a tag
|
||||
ARC_Bool ARC_Parser_ParseTag(ARC_Parser *parser, uint32_t *lexerIndex, uint32_t tagId){
|
||||
//get the current tag
|
||||
ARC_ParserLanguageTag *tag = NULL;
|
||||
ARC_ParserTag *tag = NULL;
|
||||
for(uint32_t index = 0; index < parser->language.size; index++){
|
||||
ARC_ParserLanguageTag *foundTag = ((ARC_ParserLanguageTag *)parser->language.data) + index;
|
||||
ARC_ParserTag *foundTag = ((ARC_ParserTag *)parser->language.data) + index;
|
||||
if(foundTag->tagId == tagId){
|
||||
tag = foundTag;
|
||||
break;
|
||||
|
|
@ -205,7 +225,7 @@ ARC_Bool ARC_Parser_ParseTag(ARC_Parser *parser, uint32_t *lexerIndex, uint32_t
|
|||
//iterate through the tokens with the add callback
|
||||
for(uint32_t index = 0; index < ARC_Vector_GetSize(foundTokens); index++){
|
||||
ARC_LexerToken *token = (ARC_LexerToken *)ARC_Vector_Get(foundTokens, index);
|
||||
(*(tag->addDataFn))(&(parser->data), tagId, token, tag->addUserData);
|
||||
(*(tag->addDataFn))(&(parser->data), tagId, index, token, tag->addUserData);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -241,7 +261,7 @@ void ARC_Parser_Parse(ARC_Parser *parser, ARC_String **data){
|
|||
|
||||
//set the lexer index to start and get the first tag
|
||||
uint32_t lexerIndex = 0;
|
||||
ARC_ParserLanguageTag *startTag = parser->language.data;
|
||||
ARC_ParserTag *startTag = parser->language.data;
|
||||
|
||||
//TODO: handle error checks for if parsing fails
|
||||
//recursivly parse from the inital start tag
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue