ed/metadesk
1
0
Fork 0
mirror of https://github.com/Ed94/metadesk.git synced 2026-08-06 07:38:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

kill char literal

Browse Source
This commit is contained in:
ryanfleury
2021-06-24 22:57:06 -06:00
parent 4b8d2c3ade
commit 647dd40a0f
5 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/grammar.c
+6 -6
View File
@@ -86,7 +86,7 @@ static MD_Node * NewChild(MD_Node *parent)
#define SET_DEPTH(depth_map, node, depth) MD_MapOverwrite(depth_map, MD_MapKeyPtr(node), (void *)(depth))
static void PrintRule(MD_Map *depth_map, MD_Node *rule)
{
MD_b32 is_literal_char = rule->flags & MD_NodeFlag_CharLiteral;
MD_b32 is_literal_char = rule->flags & MD_NodeFlag_StringLiteral;
MD_b32 optional = MD_NodeHasTag(rule, MD_S8Lit(OPTIONAL_TAG));
@@ -221,7 +221,7 @@ static void ExpandRule(MD_Node *rule, MD_String8List *out_strings, MD_Node *cur_
}
else
{
if(rule_element->flags & MD_NodeFlag_CharLiteral) // NOTE(mal): Terminal production
if(rule_element->flags & MD_NodeFlag_StringLiteral) // NOTE(mal): Terminal production
{
char c = 0;
if(rule_element->string.size == 2 && rule_element->string.str[0] == '\\')
@@ -308,7 +308,7 @@ static MD_Node * FindNonTerminalProduction(MD_Node *node, MD_Map *visited)
{
if(MD_NodeIsNil(node->first_child))
{
if(node->flags & MD_NodeFlag_CharLiteral)
if(node->flags & MD_NodeFlag_StringLiteral)
{
}
else
@@ -425,7 +425,7 @@ static void ComputeElementDepth(MD_Map *depth_map, MD_Node *re)
}
else
{
if(re->flags & MD_NodeFlag_CharLiteral) // NOTE(mal): Terminal production
if(re->flags & MD_NodeFlag_StringLiteral) // NOTE(mal): Terminal production
{
result = 1;
}
@@ -561,7 +561,7 @@ int main(int argument_count, char **arguments)
else
{
if(MD_StringMatch(rule_element->string, MD_S8Lit("|"), 0) &&
!(rule_element->flags & MD_NodeFlag_CharLiteral))
!(rule_element->flags & MD_NodeFlag_StringLiteral))
{
rule = NewChild(production);
}
@@ -658,7 +658,7 @@ int main(int argument_count, char **arguments)
{
MD_u64 depth = 0;
MD_Assert(MD_NodeIsNil(rule_element->first_child));
if(!(rule_element->flags & MD_NodeFlag_CharLiteral))
if(!(rule_element->flags & MD_NodeFlag_StringLiteral))
{
MD_Node * production = MD_MapLookup(globals.production_table, MD_MapKeyStr(rule_element->string))->val;
depth = GET_DEPTH(depth_map, production);
tests/sanity_tests.c
+3 -3
View File
@@ -287,7 +287,7 @@ int main(void)
TestResult(MD_ParseOneNode(MD_S8Lit(""), MD_S8Lit("\"foo\"")).node->flags &
MD_NodeFlag_StringLiteral);
TestResult(MD_ParseOneNode(MD_S8Lit(""), MD_S8Lit("'foo'")).node->flags &
MD_NodeFlag_CharLiteral);
MD_NodeFlag_StringLiteral);
}
Test("Expression Evaluation")
@@ -395,11 +395,11 @@ int main(void)
{
TestResult(MD_StringMatch(MD_StringFromNodeKind(MD_NodeKind_Label), MD_S8Lit("Label"), 0));
TestResult(MD_StringMatch(MD_StringFromNodeKind(MD_NodeKind_Label), MD_S8Lit("Label"), 0));
MD_String8List list = MD_StringListFromNodeFlags(MD_NodeFlag_CharLiteral | MD_NodeFlag_ParenLeft | MD_NodeFlag_BeforeSemicolon);
MD_String8List list = MD_StringListFromNodeFlags(MD_NodeFlag_StringLiteral | MD_NodeFlag_ParenLeft | MD_NodeFlag_BeforeSemicolon);
MD_b32 match = 1;
for(MD_String8Node *node = list.first; node; node = node->next)
{
if(!MD_StringMatch(node->string, MD_S8Lit("CharLiteral"), 0) &&
if(!MD_StringMatch(node->string, MD_S8Lit("StringLiteral"), 0) &&
!MD_StringMatch(node->string, MD_S8Lit("ParenLeft"), 0) &&
!MD_StringMatch(node->string, MD_S8Lit("BeforeSemicolon"), 0))
{