parser fixed (still probably needs more testing, but current tests work), parserlang still not working
This commit is contained in:
parent
6d64a17b1d
commit
84c4dffc85
4 changed files with 153 additions and 161 deletions
|
|
@ -28,23 +28,6 @@
|
|||
/*
|
||||
* @brief
|
||||
*/
|
||||
typedef struct ARC_ParserLangLineData {
|
||||
ARC_Vector *body;
|
||||
} ARC_ParserLangLineData;
|
||||
|
||||
typedef struct ARC_ParserLangBodyData {
|
||||
ARC_String *tagName;
|
||||
ARC_Vector *arguments;
|
||||
} ARC_ParserLangBodyData;
|
||||
|
||||
typedef struct ARC_ParserLangArgumentData {
|
||||
ARC_Vector *tagsOrConstants;
|
||||
} ARC_ParserLangArgumentData;
|
||||
|
||||
typedef struct ARC_ParserLangVectorStringData {
|
||||
ARC_String *string;
|
||||
ARC_Vector *vector;
|
||||
} ARC_ParserLangVectorStringData;
|
||||
|
||||
//private function to initalize the lexer rules for the language
|
||||
void ARC_ParserLang_InitLexerRulesFn(ARC_Lexer *lexer){
|
||||
|
|
@ -94,7 +77,7 @@ void ARC_ParserLang_VectorDestroyParserTagFn(void *data){
|
|||
}
|
||||
|
||||
//private function to create the saved data for the language
|
||||
void ARC_ParserLang_CreateDataFn(void **data){
|
||||
void ARC_ParserLang_CreateDataFn(void **data, ARC_ParserTagToken *parsedData, void *userData){
|
||||
//function callback to cleanup added tags
|
||||
ARC_Vector_DestroyDataFn destroyParserTagFn = ARC_ParserLang_VectorDestroyParserTagFn;
|
||||
|
||||
|
|
@ -107,48 +90,6 @@ void ARC_ParserLang_DestroyDataFn(void *data){
|
|||
ARC_Vector_Destroy(data);
|
||||
}
|
||||
|
||||
//private function to add char to constant name
|
||||
void ARC_ParserLang_AddCharFn(void **data, uint32_t tagId, uint32_t tagIndex, ARC_LexerToken *token, void *userData){
|
||||
if(userData == NULL){
|
||||
return;
|
||||
}
|
||||
|
||||
//recast the addData to make it easier to use
|
||||
ARC_String **variable = (ARC_String **)userData;
|
||||
if(*variable == NULL){
|
||||
return;
|
||||
}
|
||||
|
||||
//create the const string if it is null
|
||||
if(variable == NULL){
|
||||
//this will be freed in the main parser lang add
|
||||
ARC_String_Create(variable, NULL, 0);
|
||||
}
|
||||
|
||||
ARC_String_Append(variable, token->data);
|
||||
}
|
||||
|
||||
//private function to get details from a constant
|
||||
void ARC_ParserLang_AddFirstCharFn(void **data, uint32_t tagId, uint32_t tagIndex, ARC_LexerToken *token, void *userData){
|
||||
if(userData == NULL){
|
||||
return;
|
||||
}
|
||||
|
||||
//recast the addData to make it easier to use
|
||||
ARC_ParserLangVectorStringData *vectorStringData = (ARC_ParserLangVectorStringData *)userData;
|
||||
|
||||
//add the first character to the temp const
|
||||
ARC_String *tokenData = NULL;
|
||||
ARC_String_Copy(&tokenData, token->data);
|
||||
ARC_String_Append(&tokenData, vectorStringData->string);
|
||||
|
||||
//cleanup the string as it will be added to the vector
|
||||
ARC_String_Destroy(vectorStringData->string);
|
||||
vectorStringData->string = NULL;
|
||||
|
||||
ARC_Vector_Add(vectorStringData->vector, tokenData);
|
||||
}
|
||||
|
||||
void ARC_Parser_CreateAsParserLang(ARC_Parser **parser){
|
||||
//<line> -> <body> NEWLINE <line> | <body> | NEWLINE <line> | LAMBDA
|
||||
uint32_t *line[] = { (uint32_t[]){ 3, ARC_PARSERLANG_BODY, ARC_PARSERLANG_TOKEN_NEWLINE_ID, ARC_PARSERLANG_LINE }, (uint32_t[]){ 1, ARC_PARSERLANG_BODY }, (uint32_t[]){ 2, ARC_PARSERLANG_TOKEN_NEWLINE_ID, ARC_PARSERLANG_LINE }, (uint32_t[]){ 1, ARC_PARSERLANG_LAMBDA } };
|
||||
|
|
@ -214,5 +155,5 @@ void ARC_Parser_CreateAsParserLang(ARC_Parser **parser){
|
|||
ARC_ParserData_DestroyFn destroyDataFn = ARC_ParserLang_DestroyDataFn;
|
||||
|
||||
//TODO: add the create, destroy, and add callbacks
|
||||
ARC_Parser_Create(parser, &parserLanguageArray, ARC_ParserLang_InitLexerRulesFn, &createDataFn, &destroyDataFn);
|
||||
ARC_Parser_Create(parser, &parserLanguageArray, ARC_ParserLang_InitLexerRulesFn, &createDataFn, NULL, &destroyDataFn);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue