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
|
|
@ -13,36 +13,32 @@
|
|||
#define VARIABLE_NAME 24
|
||||
#define VARIABLE 25
|
||||
|
||||
void TEST_ParserData_CreateStringFn(void **data){
|
||||
void TEST_ParserData_RecurseStringAdd(ARC_String **data, ARC_ParserTagToken *tagToken){
|
||||
if(tagToken->token != NULL){
|
||||
ARC_String_Append(data, tagToken->token->data);
|
||||
return;
|
||||
}
|
||||
|
||||
//TODO: probs don't need this
|
||||
if(tagToken->tagTokens == NULL){
|
||||
return;
|
||||
}
|
||||
|
||||
for(uint32_t index = 0; index < ARC_Vector_GetSize(tagToken->tagTokens); index++){
|
||||
TEST_ParserData_RecurseStringAdd(data, (ARC_ParserTagToken *)ARC_Vector_Get(tagToken->tagTokens, index));
|
||||
}
|
||||
}
|
||||
|
||||
void TEST_ParserData_CreateStringFn(void **data, ARC_ParserTagToken *parsedData, void *userData){
|
||||
ARC_String_Create((ARC_String **)data, NULL, 0);
|
||||
|
||||
TEST_ParserData_RecurseStringAdd((ARC_String **)data, parsedData);
|
||||
}
|
||||
|
||||
void TEST_ParserData_DestroyStringFn(void *data){
|
||||
ARC_String_Destroy((ARC_String *)data);
|
||||
}
|
||||
|
||||
//for this very basic example, the tagId does not matter
|
||||
void TEST_ParserTag_AddFirstCharFn(void **data, uint32_t tagId, uint32_t tagIndex, ARC_LexerToken *token, void *userData){
|
||||
if(*data == NULL){
|
||||
return;
|
||||
}
|
||||
|
||||
ARC_String *tokenData = NULL;
|
||||
ARC_String_Copy(&tokenData, token->data);
|
||||
ARC_String_Append(&tokenData, *data);
|
||||
ARC_String_Destroy(*data);
|
||||
*data = tokenData;
|
||||
}
|
||||
|
||||
//for this very basic example, the tagId does not matter
|
||||
void TEST_ParserTag_AddCharFn(void **data, uint32_t tagId, uint32_t tagIndex, ARC_LexerToken *token, void *userData){
|
||||
if(*data == NULL){
|
||||
return;
|
||||
}
|
||||
|
||||
ARC_String_Append((ARC_String **)data, token->data);
|
||||
}
|
||||
|
||||
uint32_t *charOrNumTokens[] = { (uint32_t[]){ 1, CHAR }, (uint32_t[]){ 1, NUM } };
|
||||
uint32_t *variableNameTags[] = { (uint32_t[]){ 2, CHAR_OR_NUM, VARIABLE_NAME }, (uint32_t[]){ 1, LAMBDA } };
|
||||
uint32_t *variableTokensOrTags[] = { (uint32_t[]){ 2, CHAR, VARIABLE_NAME } };
|
||||
|
|
@ -51,8 +47,6 @@ uint32_t *variableTokensOrTags[] = { (uint32_t[]){ 2, CHAR, VARIABLE_NAME } };
|
|||
ARC_ParserData_CreateFn createStringFn = TEST_ParserData_CreateStringFn;
|
||||
ARC_ParserData_DestroyFn destroyStringFn = TEST_ParserData_DestroyStringFn;
|
||||
|
||||
ARC_ParserTag_AddDataFn addCharFn = TEST_ParserTag_AddCharFn;
|
||||
ARC_ParserTag_AddDataFn addFirstCharFn = TEST_ParserTag_AddFirstCharFn;
|
||||
|
||||
ARC_ParserTag testTags[3] = {
|
||||
{
|
||||
|
|
@ -83,8 +77,7 @@ void TEST_Parser_InitLexerRulesFn(ARC_Lexer *lexer){
|
|||
|
||||
ARC_TEST(Parser_Init){
|
||||
ARC_Parser *parser;
|
||||
|
||||
ARC_Parser_Create(&parser, &languageArray, TEST_Parser_InitLexerRulesFn, NULL, NULL);
|
||||
ARC_Parser_Create(&parser, &languageArray, TEST_Parser_InitLexerRulesFn, NULL, NULL, NULL);
|
||||
|
||||
ARC_Parser_Destroy(parser);
|
||||
|
||||
|
|
@ -93,8 +86,8 @@ ARC_TEST(Parser_Init){
|
|||
|
||||
ARC_TEST(Parser_Basic_Parse){
|
||||
ARC_Parser *parser;
|
||||
ARC_Parser_Create(&parser, &languageArray, TEST_Parser_InitLexerRulesFn, NULL, NULL, NULL);
|
||||
|
||||
ARC_Parser_Create(&parser, &languageArray, TEST_Parser_InitLexerRulesFn, NULL, NULL);
|
||||
ARC_String *tempString;
|
||||
|
||||
|
||||
|
|
@ -140,8 +133,7 @@ ARC_TEST(Parser_Basic_Parse){
|
|||
|
||||
ARC_TEST(Parser_Basic_ParseError){
|
||||
ARC_Parser *parser;
|
||||
|
||||
ARC_Parser_Create(&parser, &languageArray, TEST_Parser_InitLexerRulesFn, NULL, NULL);
|
||||
ARC_Parser_Create(&parser, &languageArray, TEST_Parser_InitLexerRulesFn, NULL, NULL, NULL);
|
||||
|
||||
ARC_String *tempString;
|
||||
|
||||
|
|
@ -186,8 +178,7 @@ ARC_TEST(Parser_Basic_ParseError){
|
|||
|
||||
ARC_TEST(Parser_Basic_GetParsedValue){
|
||||
ARC_Parser *parser;
|
||||
|
||||
ARC_Parser_Create(&parser, &languageArray, TEST_Parser_InitLexerRulesFn, &createStringFn, &destroyStringFn);
|
||||
ARC_Parser_Create(&parser, &languageArray, TEST_Parser_InitLexerRulesFn, &createStringFn, NULL, &destroyStringFn);
|
||||
|
||||
ARC_String *tempString;
|
||||
|
||||
|
|
@ -223,26 +214,26 @@ ARC_TEST(Parser_ParserLang_BasicTest){
|
|||
ARC_CHECK(arc_errno == 0);
|
||||
}
|
||||
|
||||
ARC_TEST(Parser_ParserLang_BasicVector){
|
||||
ARC_Vector *testLanguage;
|
||||
ARC_Vector_Create(&testLanguage, NULL, NULL);
|
||||
|
||||
ARC_Vector_Add(testLanguage, testTags + 0);
|
||||
ARC_Vector_Add(testLanguage, testTags + 1);
|
||||
ARC_Vector_Add(testLanguage, testTags + 2);
|
||||
|
||||
ARC_Parser *parser;
|
||||
ARC_Parser_CreateFromVector(&parser, testLanguage, TEST_Parser_InitLexerRulesFn, NULL, NULL);
|
||||
|
||||
ARC_String *tempString;
|
||||
ARC_String_CreateWithStrlen(&tempString, "variablename");
|
||||
|
||||
//this destroys string, so no need for cleanup
|
||||
ARC_Parser_Parse(parser, &tempString);
|
||||
|
||||
//cleanup
|
||||
ARC_Parser_Destroy(parser);
|
||||
ARC_Vector_Destroy(testLanguage);
|
||||
|
||||
ARC_CHECK(arc_errno == 0);
|
||||
}
|
||||
//ARC_TEST(Parser_ParserLang_BasicVector){
|
||||
// ARC_Vector *testLanguage;
|
||||
// ARC_Vector_Create(&testLanguage, NULL, NULL);
|
||||
//
|
||||
// ARC_Vector_Add(testLanguage, testTags + 0);
|
||||
// ARC_Vector_Add(testLanguage, testTags + 1);
|
||||
// ARC_Vector_Add(testLanguage, testTags + 2);
|
||||
//
|
||||
// ARC_Parser *parser;
|
||||
// ARC_Parser_CreateFromVector(&parser, testLanguage, TEST_Parser_InitLexerRulesFn, NULL, NULL);
|
||||
//
|
||||
// ARC_String *tempString;
|
||||
// ARC_String_CreateWithStrlen(&tempString, "variablename");
|
||||
//
|
||||
// //this destroys string, so no need for cleanup
|
||||
// ARC_Parser_Parse(parser, &tempString);
|
||||
//
|
||||
// //cleanup
|
||||
// ARC_Parser_Destroy(parser);
|
||||
// ARC_Vector_Destroy(testLanguage);
|
||||
//
|
||||
// ARC_CHECK(arc_errno == 0);
|
||||
//}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue