parserlang now working
This commit is contained in:
herbglitch
parent
f0a20f2374
commit
5a5eaabc14
5 changed files with 214 additions and 166 deletions
|
|
@ -300,21 +300,23 @@ void ARC_Parser_Parse(ARC_Parser *parser, ARC_String **data){
|
|||
ARC_Bool parsed = ARC_Parser_ParseTag(parser, tagToken, &lexerIndex);
|
||||
ARC_Bool allTokensParsed = lexerIndex == ARC_Lexer_GetTokensSize(parser->lexer);
|
||||
|
||||
//error if anything went wrong
|
||||
if(parsed == ARC_False || allTokensParsed == ARC_False || arc_errno){
|
||||
ARC_Lexer_Clear(parser->lexer);
|
||||
|
||||
arc_errno = ARC_ERRNO_DATA;
|
||||
ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("ARC_Parser_Parse(parser, data), could not parse the given data at lexer index: %u", lexerIndex);
|
||||
return;
|
||||
}
|
||||
|
||||
//create the data if the creation callback exists
|
||||
if(parser->createDataFn != NULL){
|
||||
(*(parser->createDataFn))(&(parser->data), tagToken, parser->userData);
|
||||
}
|
||||
|
||||
//cleanup
|
||||
ARC_ParserTagToken_Destroy(tagToken);
|
||||
ARC_Lexer_Clear(parser->lexer);
|
||||
|
||||
//error if anything went wrong
|
||||
if(parsed == ARC_False || allTokensParsed == ARC_False || arc_errno){
|
||||
arc_errno = ARC_ERRNO_DATA;
|
||||
ARC_DEBUG_LOG_ERROR_WITH_VARIABLES("ARC_Parser_Parse(parser, data), could not parse the given data at lexer index: %u", lexerIndex);
|
||||
return;
|
||||
}
|
||||
ARC_ParserTagToken_Destroy(tagToken);
|
||||
}
|
||||
|
||||
void ARC_Parser_ParseFile(ARC_Parser *parser, ARC_String *path){
|
||||
|
|
|
|||
|
|
@ -80,6 +80,12 @@ void ARC_ParserLangParsedData_RecurseStringAdd(ARC_String **data, ARC_ParserTagT
|
|||
return;
|
||||
}
|
||||
|
||||
if(tagToken->token->rule == ARC_PARSERLANG_TOKEN_UNDERSCORE_ID){
|
||||
char tokenChar = ARC_PARSERLANG_TOKEN_UNDERSCORE_CHAR;
|
||||
ARC_String_AppendCString(data, &tokenChar, 1);
|
||||
return;
|
||||
}
|
||||
|
||||
ARC_String_Append(data, tagToken->token->data);
|
||||
return;
|
||||
}
|
||||
|
|
@ -122,6 +128,9 @@ void ARC_ParserLangParsedData_GetArgumentTag(ARC_Vector *orTokensOrTags, ARC_Par
|
|||
continue;
|
||||
|
||||
case ARC_PARSERLANG_TAG_OR_CONSTANT:
|
||||
//initialize the string to use
|
||||
ARC_String_Create(&tagOrConstantString, NULL, 0);
|
||||
|
||||
//get the id of the tag/constant
|
||||
ARC_ParserLangParsedData_RecurseStringAdd(&tagOrConstantString, childTagToken);
|
||||
id = (uint32_t *)malloc(sizeof(uint32_t));
|
||||
|
|
@ -142,24 +151,25 @@ void ARC_ParserLangParsedData_GetArgumentTag(ARC_Vector *orTokensOrTags, ARC_Par
|
|||
}
|
||||
|
||||
/*
|
||||
<arguments> -> <argument> WHITESPACE OR WHITESPACE <arguments> | <tagOrConstant>
|
||||
<arguments> -> <argument> WHITESPACE OR WHITESPACE <arguments> | <argument>
|
||||
*/
|
||||
void ARC_ParserLangParsedData_GetArgumentsTag(ARC_Vector *tokensOrTags, ARC_ParserTagToken *tagToken, ARC_ParserLang_GetIdFn *getIdFn){
|
||||
for(uint32_t index = 0; index < ARC_Vector_GetSize(tagToken->tagTokens); index++){
|
||||
ARC_ParserTagToken *childTagToken = (ARC_ParserTagToken *)ARC_Vector_Get(tagToken->tagTokens, index);
|
||||
|
||||
//switch variables
|
||||
ARC_String *tagOrConstantString;
|
||||
ARC_String_Create(&tagOrConstantString, NULL, 0);
|
||||
|
||||
uint32_t *id = NULL;
|
||||
uint32_t tokensOrTagsIndex = 0;
|
||||
ARC_Vector *orTokensOrTags = NULL;
|
||||
uint32_t tokensOrTagsIndex = 0;
|
||||
ARC_Vector *orTokensOrTags = NULL;
|
||||
|
||||
ARC_Vector_DestroyDataFn destroyUint32Fn = ARC_ParserLang_VectorDestroyUInt32;
|
||||
|
||||
switch(childTagToken->id){
|
||||
case ARC_PARSERLANG_ARGUMENT:
|
||||
//get the last vector within tokens or tags to add the tag/constant to
|
||||
tokensOrTagsIndex = ARC_Vector_GetSize(tokensOrTags);
|
||||
orTokensOrTags = (ARC_Vector *)ARC_Vector_Get(tokensOrTags, tokensOrTagsIndex - 1);
|
||||
|
||||
ARC_ParserLangParsedData_GetArgumentTag(orTokensOrTags, childTagToken, getIdFn);
|
||||
continue;
|
||||
|
||||
case ARC_PARSERLANG_TOKEN_OR_ID:
|
||||
|
|
@ -175,23 +185,6 @@ void ARC_ParserLangParsedData_GetArgumentsTag(ARC_Vector *tokensOrTags, ARC_Pars
|
|||
ARC_ParserLangParsedData_GetArgumentsTag(tokensOrTags, childTagToken, getIdFn);
|
||||
continue;
|
||||
|
||||
case ARC_PARSERLANG_TAG_OR_CONSTANT:
|
||||
//get the id of the tag/constant
|
||||
ARC_ParserLangParsedData_RecurseStringAdd(&tagOrConstantString, childTagToken);
|
||||
id = (uint32_t *)malloc(sizeof(uint32_t));
|
||||
*id = (*getIdFn)(tagOrConstantString);
|
||||
|
||||
//get the last vector within tokens or tags to add the tag/constant to
|
||||
tokensOrTagsIndex = ARC_Vector_GetSize(tokensOrTags);
|
||||
orTokensOrTags = (ARC_Vector *)ARC_Vector_Get(tokensOrTags, tokensOrTagsIndex - 1);
|
||||
|
||||
//add the id to the last or vector
|
||||
ARC_Vector_Add(orTokensOrTags, (void *)id);
|
||||
|
||||
//cleanup
|
||||
ARC_String_Destroy(tagOrConstantString);
|
||||
continue;
|
||||
|
||||
default:
|
||||
//this should only be whitespace
|
||||
continue;
|
||||
|
|
@ -235,7 +228,28 @@ void ARC_ParserLangParsedData_CreateBodyTag(ARC_ParserTag **tag, ARC_ParserTagTo
|
|||
ARC_ParserTagToken *argumentsToken = (ARC_ParserTagToken *)ARC_Vector_Get(tagToken->tagTokens, 4);
|
||||
ARC_ParserLangParsedData_GetArgumentsTag(tokensOrTags, argumentsToken, getIdFn);
|
||||
|
||||
//TODO: move the data from the vector to an array
|
||||
//initialize the tokens or tags array to the needed size
|
||||
bodyTag->tokensOrTagsSize = ARC_Vector_GetSize(tokensOrTags);
|
||||
bodyTag->tokensOrTags = (uint32_t **)malloc(sizeof(uint32_t *) * bodyTag->tokensOrTagsSize);
|
||||
|
||||
//copy each or section into the tokensOrTags
|
||||
for(uint32_t orIndex = 0; orIndex < bodyTag->tokensOrTagsSize; orIndex++){
|
||||
//get the current or vector and its tags
|
||||
orTokensOrTags = (ARC_Vector *)ARC_Vector_Get(tokensOrTags, orIndex);
|
||||
uint32_t orTokensOrTagsSize = ARC_Vector_GetSize(orTokensOrTags);
|
||||
|
||||
//create the or array with one extra space and store the size in that space
|
||||
bodyTag->tokensOrTags[orIndex] = (uint32_t *)malloc(sizeof(uint32_t) * (orTokensOrTagsSize + 1));
|
||||
bodyTag->tokensOrTags[orIndex][0] = orTokensOrTagsSize;
|
||||
|
||||
//copy the or data to the tokensOrTags
|
||||
for(uint32_t tokenOrTagIndex = 0; tokenOrTagIndex < orTokensOrTagsSize; tokenOrTagIndex++){
|
||||
bodyTag->tokensOrTags[orIndex][tokenOrTagIndex + 1] = *(uint32_t *)ARC_Vector_Get(orTokensOrTags, tokenOrTagIndex);
|
||||
}
|
||||
}
|
||||
|
||||
//set the tag to the bodyTag
|
||||
*tag = bodyTag;
|
||||
|
||||
//cleanup
|
||||
ARC_Vector_Destroy(tokensOrTags);
|
||||
|
|
@ -258,6 +272,7 @@ void ARC_ParserLangParsedData_RunLineTag(ARC_Vector *tags, ARC_ParserTagToken *t
|
|||
//get a tag
|
||||
case ARC_PARSERLANG_BODY:
|
||||
ARC_ParserLangParsedData_CreateBodyTag(&tag, childTagToken, getIdFn);
|
||||
ARC_Vector_Add(tags, (void *)tag);
|
||||
continue;
|
||||
|
||||
default:
|
||||
|
|
@ -289,7 +304,7 @@ void ARC_ParserLang_CreateDataFn(void **data, ARC_ParserTagToken *parsedData, vo
|
|||
}
|
||||
|
||||
//load the language into a vector recursivly
|
||||
ARC_ParserLangParsedData_RunLineTag((ARC_Vector *)data, parsedData, getIdFn);
|
||||
ARC_ParserLangParsedData_RunLineTag(*((ARC_Vector **)data), parsedData, getIdFn);
|
||||
}
|
||||
|
||||
//private function to destroy the saved data for the language
|
||||
|
|
@ -297,7 +312,10 @@ void ARC_ParserLang_DestroyDataFn(void *data, void *userData){
|
|||
ARC_ParserLang_GetIdFn *getIdFn = (ARC_ParserLang_GetIdFn *)userData;
|
||||
free(getIdFn);
|
||||
|
||||
ARC_Vector_Destroy((ARC_Vector *)data);
|
||||
//check if there is data to free
|
||||
if((ARC_Vector *)data != NULL){
|
||||
ARC_Vector_Destroy((ARC_Vector *)data);
|
||||
}
|
||||
}
|
||||
|
||||
void ARC_Parser_CreateAsParserLang(ARC_Parser **parser, ARC_ParserLang_GetIdFn getIdFn){
|
||||
|
|
@ -307,8 +325,8 @@ void ARC_Parser_CreateAsParserLang(ARC_Parser **parser, ARC_ParserLang_GetIdFn g
|
|||
//<body> -> <tag> WHITESPACE ARROW WHITESPACE <arguments>
|
||||
uint32_t *body[] = { (uint32_t[]){ 5, ARC_PARSERLANG_TAG, ARC_PARSERLANG_TOKEN_WHITESPACE, ARC_PARSERLANG_TOKEN_ARROW_ID, ARC_PARSERLANG_TOKEN_WHITESPACE, ARC_PARSERLANG_ARGUMENTS } };
|
||||
|
||||
//<arguments> -> <argument> WHITESPACE OR WHITESPACE <arguments> | <tagOrConstant>
|
||||
uint32_t *arguments[] = { (uint32_t[]){ 5, ARC_PARSERLANG_ARGUMENT, ARC_PARSERLANG_TOKEN_WHITESPACE, ARC_PARSERLANG_TOKEN_OR_ID, ARC_PARSERLANG_TOKEN_WHITESPACE, ARC_PARSERLANG_ARGUMENTS }, (uint32_t[]){ 1, ARC_PARSERLANG_TAG_OR_CONSTANT } };
|
||||
//<arguments> -> <argument> WHITESPACE OR WHITESPACE <arguments> | <argument>
|
||||
uint32_t *arguments[] = { (uint32_t[]){ 5, ARC_PARSERLANG_ARGUMENT, ARC_PARSERLANG_TOKEN_WHITESPACE, ARC_PARSERLANG_TOKEN_OR_ID, ARC_PARSERLANG_TOKEN_WHITESPACE, ARC_PARSERLANG_ARGUMENTS }, (uint32_t[]){ 1, ARC_PARSERLANG_ARGUMENT } };
|
||||
|
||||
//<argument> -> <tagOrConstant> WHITESPACE <argument> | <tagOrConstant>
|
||||
uint32_t *argument[] = { (uint32_t[]){ 3, ARC_PARSERLANG_TAG_OR_CONSTANT, ARC_PARSERLANG_TOKEN_WHITESPACE, ARC_PARSERLANG_ARGUMENT }, (uint32_t[]){ 1, ARC_PARSERLANG_TAG_OR_CONSTANT } };
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue