herbglitch/archeus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed double free of vector and parserlang and creating a parser by string should work now

Browse source
This commit is contained in:
herbglitch 2024-12-04 00:54:24 -07:00
parent 5a5eaabc14
commit 4c3d357cb9
12 changed files with 298 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

166
tests/std/parser.c
View file

@ -3,8 +3,8 @@
#include "arc/std/parser.h"
#include "arc/std/lexer.h"
#include "arc/std/vector.h"
#include "arc/std/parser/parserlang.h"
#include <stddef.h>
#include <stdlib.h>
#define LAMBDA ARC_PARSER_TAG_LAMBDA
#define CHAR ARC_LEXER_TOKEN_ALPHALOWERCHAR
@ -13,7 +13,7 @@
#define VARIABLE_NAME 24
#define VARIABLE 25
const uint32_t TEST_ALPHA_LAMBDA = 0;
const uint32_t TEST_LAMBDA = 0;
const uint32_t TEST_ALPHA_LOWER_CHAR = 1;
const uint32_t TEST_ALPHA_UPPER_CHAR = 2;
const uint32_t TEST_ALPHA_CHAR = 3;
@ -41,6 +41,10 @@ void TEST_ParserData_CreateStringFn(void **data, ARC_ParserTagToken *parsedData,
}
void TEST_ParserData_DestroyStringFn(void *data, void *userData){
if(data == NULL){
return;
}
ARC_String_Destroy((ARC_String *)data);
}
@ -135,7 +139,7 @@ void TEST_Parser_InitLexerRulesFn(ARC_Lexer *lexer){
// /* ~ cleanup ~ */
// ARC_Parser_Destroy(parser);
//}
//
//ARC_TEST(Parser_Basic_ParseError){
// ARC_Parser *parser;
// ARC_Parser_Create(&parser, &languageArray, TEST_Parser_InitLexerRulesFn, NULL, NULL, NULL);
@ -180,7 +184,7 @@ void TEST_Parser_InitLexerRulesFn(ARC_Lexer *lexer){
// //reset for next test
// arc_errno = 0;
//}
//
//ARC_TEST(Parser_Basic_GetParsedValue){
// ARC_Parser *parser;
// ARC_Parser_Create(&parser, &languageArray, TEST_Parser_InitLexerRulesFn, &createStringFn, &destroyStringFn, NULL);
@ -203,51 +207,7 @@ void TEST_Parser_InitLexerRulesFn(ARC_Lexer *lexer){
// /* ~ cleanup ~ */
// ARC_Parser_Destroy(parser);
//}
/* ~ parserlang tests ~ */
uint32_t TEST_ParserLang_GetIdFn(ARC_String *string){
if(ARC_String_EqualsCStringWithStrlen(string, "<alphaChar>")){
return TEST_ALPHA_CHAR;
}
if(ARC_String_EqualsCStringWithStrlen(string, "ALPHA_LOWER_CHAR")){
return TEST_ALPHA_LOWER_CHAR;
}
if(ARC_String_EqualsCStringWithStrlen(string, "ALPHA_UPPER_CHAR")){
return TEST_ALPHA_UPPER_CHAR;
}
printf("tag: %s\n", string->data);
return 0;
}
ARC_TEST(Parser_ParserLang_BasicTest){
ARC_Parser *parser;
ARC_Parser_CreateAsParserLang(&parser, TEST_ParserLang_GetIdFn);
ARC_String *tempString;
ARC_String_CreateWithStrlen(&tempString, "<alphaChar> -> ALPHA_LOWER_CHAR | ALPHA_UPPER_CHAR\n");
//this destroys string, so no need for cleanup
ARC_Parser_Parse(parser, &tempString);
ARC_CHECK(arc_errno == 0);
void *data = ARC_Parser_GetData(parser);
ARC_ParserTag *tag = ARC_Vector_Get((ARC_Vector *)data, 0);
ARC_CHECK(tag->tagId == TEST_ALPHA_CHAR);
ARC_CHECK(tag->tokensOrTagsSize == 2);
ARC_CHECK(tag->tokensOrTags[0][0] == 1);
ARC_CHECK(tag->tokensOrTags[0][1] == TEST_ALPHA_LOWER_CHAR);
ARC_CHECK(tag->tokensOrTags[1][0] == 1);
ARC_CHECK(tag->tokensOrTags[1][1] == TEST_ALPHA_UPPER_CHAR);
ARC_Parser_Destroy(parser);
}
//
//ARC_TEST(Parser_ParserLang_BasicVector){
// ARC_Vector *testLanguage;
// ARC_Vector_Create(&testLanguage, NULL, NULL);
@ -257,7 +217,7 @@ ARC_TEST(Parser_ParserLang_BasicTest){
// ARC_Vector_Add(testLanguage, testTags + 2);
//
// ARC_Parser *parser;
// ARC_Parser_CreateFromVector(&parser, testLanguage, TEST_Parser_InitLexerRulesFn, NULL, NULL);
// ARC_Parser_CreateFromVector(&parser, testLanguage, TEST_Parser_InitLexerRulesFn, NULL, NULL, NULL);
//
// ARC_String *tempString;
// ARC_String_CreateWithStrlen(&tempString, "variablename");
@ -271,3 +231,109 @@ ARC_TEST(Parser_ParserLang_BasicTest){
//
// ARC_CHECK(arc_errno == 0);
//}
/* ~ parser tests ~ */
void TEST_Parser_InitBasicLexerTokenRules(ARC_Lexer *lexer){
//null
ARC_Lexer_RegisterTokenRule(lexer, ARC_LexerTokenRule_CreateAndReturnMatchCharRule(TEST_LAMBDA, 0));
//alpha char
ARC_Lexer_RegisterTokenRule(lexer, ARC_LexerTokenRule_CreateAndReturnMatchCharOrBetween(TEST_ALPHA_LOWER_CHAR, 'a', 'z'));
ARC_Lexer_RegisterTokenRule(lexer, ARC_LexerTokenRule_CreateAndReturnMatchCharOrBetween(TEST_ALPHA_UPPER_CHAR, 'A', 'Z'));
}
uint32_t TEST_Parser_GetStringIdFn(ARC_String *string){
if(ARC_String_EqualsCStringWithStrlen(string, "<alphaChar>")){
return TEST_ALPHA_CHAR;
}
if(ARC_String_EqualsCStringWithStrlen(string, "ALPHA_LOWER_CHAR")){
return TEST_ALPHA_LOWER_CHAR;
}
if(ARC_String_EqualsCStringWithStrlen(string, "ALPHA_UPPER_CHAR")){
return TEST_ALPHA_UPPER_CHAR;
}
return ~(uint32_t)0;
}
void TEST_ParserData_CreateCharFn(void **data, ARC_ParserTagToken *parsedData, void *userData){
if(parsedData == NULL){
*data = NULL;
return;
}
char *alphaChar = (char *)malloc(sizeof(char));
ARC_ParserTagToken *tagToken = (ARC_ParserTagToken *)ARC_Vector_Get(parsedData->tagTokens, 0);
*alphaChar = tagToken->token->data->data[0];
*data = (void *)alphaChar;
}
void TEST_ParserData_DestroyCharFn(void *data, void *userData){
if(data == NULL){
return;
}
free((char *)data);
}
ARC_TEST(Parser_Parser_BasicCreateWithStringTest){
ARC_Parser *parser;
/* ~ create the language ~ */
ARC_String *languageString;
ARC_String_CreateWithStrlen(&languageString, "<alphaChar> -> ALPHA_LOWER_CHAR | ALPHA_UPPER_CHAR\n");
ARC_ParserData_CreateFn createCharFn = TEST_ParserData_CreateCharFn;
ARC_ParserData_DestroyFn destroyCharFn = TEST_ParserData_DestroyCharFn;
ARC_Parser_CreateFromString(&parser, languageString, TEST_Parser_InitBasicLexerTokenRules, TEST_Parser_GetStringIdFn, &createCharFn, &destroyCharFn, NULL);
ARC_String_Destroy(languageString);
ARC_CHECK(arc_errno == 0);
/* ~ check if a can be parsed ~ */
ARC_String *tempString;
ARC_String_CreateWithStrlen(&tempString, "a");
ARC_Parser_Parse(parser, &tempString);
char *data = (char *)ARC_Parser_GetData(parser);
ARC_CHECK(*data == 'a');
ARC_Parser_ClearData(parser);
/* ~ check if Z can be parsed ~ */
ARC_String_CreateWithStrlen(&tempString, "Z");
ARC_Parser_Parse(parser, &tempString);
data = (char *)ARC_Parser_GetData(parser);
ARC_CHECK(*data == 'Z');
ARC_Parser_ClearData(parser);
/* ~ check if 8 errors ~ */
ARC_String_CreateWithStrlen(&tempString, "8");
ARC_Parser_Parse(parser, &tempString);
data = (char *)ARC_Parser_GetData(parser);
ARC_CHECK(arc_errno == ARC_ERRNO_DATA);
arc_errno = 0;
ARC_Parser_ClearData(parser);
//cleanup
ARC_Parser_Destroy(parser);
}