ed/metadesk
1
0
Fork 0
mirror of https://github.com/Ed94/metadesk.git synced 2026-08-04 22:58:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

more progress

Browse Source
This commit is contained in:
ed
2025-02-08 11:28:37 -05:00
parent 68fadce5c6
commit e77c3c6385
6 changed files with 292 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/metagen/metagen.c
+24 -24
View File
@@ -372,7 +372,7 @@ mg_str_expr_parse_from_first_opl__min_prec(Arena *arena, Node *first, Node *opl,
//- rjf: consume prefix operators
MG_StrExpr *leafmost_op = &mg_str_expr_nil;
for(;it != opl && !md_node_is_nil(it);)
for(;it != opl && !node_is_nil(it);)
{
MG_StrExprOp found_op = MG_StrExprOp_Null;
for(MG_StrExprOp op = (MG_StrExprOp)(MG_StrExprOp_Null+1);
@@ -408,16 +408,16 @@ mg_str_expr_parse_from_first_opl__min_prec(Arena *arena, Node *first, Node *opl,
{
MG_StrExpr *atom = &mg_str_expr_nil;
if(it->flags & (NodeFlag_Identifier|NodeFlag_Numeric|NodeFlag_StringLiteral) &&
md_node_is_nil(it->first))
node_is_nil(it->first))
{
atom = mg_push_str_expr(arena, MG_StrExprOp_Null, it);
it = it->next;
}
else if(!md_node_is_nil(it->first))
else if(!node_is_nil(it->first))
{
MG_StrExprParseResult subparse = mg_str_expr_parse_from_first_opl__min_prec(arena, it->first, &nil_node(), 0);
atom = subparse.root;
md_msg_list_concat_in_place(&parse.msgs, &subparse.msgs);
msg_list_concat_in_place(&parse.msgs, &subparse.msgs);
it = it->next;
}
if(leafmost_op != &mg_str_expr_nil)
@@ -431,7 +431,7 @@ mg_str_expr_parse_from_first_opl__min_prec(Arena *arena, Node *first, Node *opl,
}
//- rjf: parse binary operator extensions at this precedence level
for(;it != opl && !md_node_is_nil(it);)
for(;it != opl && !node_is_nil(it);)
{
// rjf: find binary op kind of `it`
MG_StrExprOp found_op = MG_StrExprOp_Null;
@@ -468,10 +468,10 @@ mg_str_expr_parse_from_first_opl__min_prec(Arena *arena, Node *first, Node *opl,
// rjf: parse right hand side of binary operator
MG_StrExprParseResult subparse = mg_str_expr_parse_from_first_opl__min_prec(arena, it, opl, mg_str_expr_op_precedence_table[found_op]+1);
parse.root->right = subparse.root;
md_msg_list_concat_in_place(&parse.msgs, &subparse.msgs);
msg_list_concat_in_place(&parse.msgs, &subparse.msgs);
if(subparse.root == &mg_str_expr_nil)
{
md_msg_list_pushf(arena, &parse.msgs, it, MsgKind_Error, "Missing right-hand-side of '%S'.", mg_str_expr_op_symbol_string_table[found_op]);
msg_list_pushf(arena, &parse.msgs, it, MsgKind_Error, "Missing right-hand-side of '%S'.", mg_str_expr_op_symbol_string_table[found_op]);
}
it = subparse.next_node;
}
@@ -515,7 +515,7 @@ mg_node_array_make(Arena *arena, U64 count)
internal MG_NodeArray
mg_child_array_from_node(Arena *arena, Node *node)
{
MG_NodeArray children = mg_node_array_make(arena, md_child_count_from_node(node));
MG_NodeArray children = mg_node_array_make(arena, child_count_from_node(node));
U64 idx = 0;
for MD_EachNode(child, node->first)
{
@@ -531,11 +531,11 @@ mg_node_grid_make_from_node(Arena *arena, Node *root)
MG_NodeGrid grid = {0};
// rjf: determine dimensions
U64 row_count = md_child_count_from_node(root);
U64 row_count = child_count_from_node(root);
U64 column_count = 0;
for MD_EachNode(row, root->first)
{
U64 cell_count_this_row = md_child_count_from_node(row);
U64 cell_count_this_row = child_count_from_node(row);
column_count = Max(column_count, cell_count_this_row);
}
@@ -619,20 +619,20 @@ internal MG_ColumnDescArray
mg_column_desc_array_from_tag(Arena *arena, Node *tag)
{
MG_ColumnDescArray result = {0};
result.count = md_child_count_from_node(tag);
result.count = child_count_from_node(tag);
result.v = push_array(arena, MG_ColumnDesc, result.count);
U64 idx = 0;
for MD_EachNode(hdr, tag->first)
{
result.v[idx].name = push_str8_copy(arena, hdr->string);
result.v[idx].kind = MG_ColumnKind_DirectCell;
if(md_node_has_tag(hdr, str8_lit("tag_check"), 0))
if(node_has_tag(hdr, str8_lit("tag_check"), 0))
{
result.v[idx].kind = MG_ColumnKind_CheckForTag;
}
if(md_node_has_tag(hdr, str8_lit("tag_child"), 0))
if(node_has_tag(hdr, str8_lit("tag_child"), 0))
{
String8 tag_name = md_tag_from_string(hdr, str8_lit("tag_child"), 0)->first->string;
String8 tag_name = tag_from_string(hdr, str8_lit("tag_child"), 0)->first->string;
result.v[idx].kind = MG_ColumnKind_TagChild;
result.v[idx].tag_name = tag_name;
}
@@ -686,21 +686,21 @@ mg_string_from_row_desc_idx(Node *row_parent, MG_ColumnDescArray descs, U64 idx)
cell_idx -= 1;
}
}
Node *node = md_child_from_index(row_parent, cell_idx);
Node *node = child_from_index(row_parent, cell_idx);
result = node->string;
}break;
case MG_ColumnKind_CheckForTag:
{
String8 tag_name = desc->name;
Node *tag = md_tag_from_string(row_parent, tag_name, 0);
result = md_node_is_nil(tag) ? str8_lit("0") : str8_lit("1");
Node *tag = tag_from_string(row_parent, tag_name, 0);
result = node_is_nil(tag) ? str8_lit("0") : str8_lit("1");
}break;
case MG_ColumnKind_TagChild:
{
String8 tag_name = desc->tag_name;
Node *tag = md_tag_from_string(row_parent, tag_name, 0);
Node *tag = tag_from_string(row_parent, tag_name, 0);
result = tag->first->string;
}break;
}
@@ -815,7 +815,7 @@ mg_eval_table_expand_expr__string(Arena *arena, MG_StrExpr *expr, MG_TableExpand
{
S64 numeric_eval = mg_eval_table_expand_expr__numeric(expr, info);
String8 numeric_eval_stringized = {0};
if(md_node_has_tag(md_root_from_node(expr->node), str8_lit("hex"), 0))
if(node_has_tag(root_from_node(expr->node), str8_lit("hex"), 0))
{
numeric_eval_stringized = push_str8f(arena, "0x%I64x", numeric_eval);
}
@@ -999,8 +999,8 @@ mg_loop_table_column_expansion(Arena *arena, String8 strexpr, MG_TableExpandInfo
}
}
String8 expr_string = str8_substr(string, expr_range);
TokenizeResult expr_tokenize = md_tokenize_from_text(scratch.arena, expr_string);
ParseResult expr_base_parse = md_parse_from_text_tokens(scratch.arena, str8_lit(""), expr_string, expr_tokenize.tokens);
TokenizeResult expr_tokenize = tokenize_from_text(scratch.arena, expr_string);
ParseResult expr_base_parse = parse_from_text_tokens(scratch.arena, str8_lit(""), expr_string, expr_tokenize.tokens);
MG_StrExprParseResult expr_parse = mg_str_expr_parse_from_root(scratch.arena, expr_base_parse.root->first);
mg_eval_table_expand_expr__string(arena, expr_parse.root, info, &expansion_strs);
char_idx = start = char_idx + 1 + expr_range.max;
@@ -1026,7 +1026,7 @@ mg_string_list_from_table_gen(Arena *arena, MG_Map grid_name_map, MG_Map grid_co
{
String8List result = {0};
Temp scratch = scratch_begin(&arena, 1);
if(md_node_is_nil(gen->first) && gen->string.size != 0)
if(node_is_nil(gen->first) && gen->string.size != 0)
{
str8_list_push(arena, &result, gen->string);
str8_list_push(arena, &result, str8_lit("\n"));
@@ -1041,8 +1041,8 @@ mg_string_list_from_table_gen(Arena *arena, MG_Map grid_name_map, MG_Map grid_co
if(str8_match(tag->string, str8_lit("expand"), 0))
{
// rjf: grab args for this expansion
Node *table_name_node = md_child_from_index(tag, 0);
Node *expand_label_node = md_child_from_index(tag, 1);
Node *table_name_node = child_from_index(tag, 0);
Node *expand_label_node = child_from_index(tag, 1);
String8 table_name = table_name_node->string;
String8 expand_label = expand_label_node->string;
code/metagen/metagen_main.c
+33 -33
View File
@@ -92,8 +92,8 @@ entry_point(CmdLine *cmdline)
if(str8_match(file_ext, str8_lit("mdesk"), 0))
{
String8 data = os_data_from_file_path(mg_arena, file_path);
TokenizeResult tokenize = md_tokenize_from_text(mg_arena, data);
ParseResult parse = md_parse_from_text_tokens(mg_arena, file_path, data, tokenize.tokens);
TokenizeResult tokenize = tokenize_from_text(mg_arena, data);
ParseResult parse = parse_from_text_tokens(mg_arena, file_path, data, tokenize.tokens);
for(Msg *m = parse.msgs.first; m != 0; m = m->next)
{
TxtPt pt = mg_txt_pt_from_string_off(data, m->node->src_offset);
@@ -131,8 +131,8 @@ entry_point(CmdLine *cmdline)
Node *file = n->v.root;
for MD_EachNode(node, file->first)
{
Node *table_tag = md_tag_from_string(node, str8_lit("table"), 0);
if(!md_node_is_nil(table_tag))
Node *table_tag = tag_from_string(node, str8_lit("table"), 0);
if(!node_is_nil(table_tag))
{
MG_NodeGrid *table = push_array(mg_arena, MG_NodeGrid, 1);
MG_ColumnDescArray *col_descs = push_array(mg_arena, MG_ColumnDescArray, 1);
@@ -156,26 +156,26 @@ entry_point(CmdLine *cmdline)
MG_Layer *layer = mg_layer_from_key(layer_key);
for MD_EachNode(node, file->first)
{
if(md_node_has_tag(node, str8_lit("option"), 0))
if(node_has_tag(node, str8_lit("option"), 0))
{
if(str8_match(node->string, str8_lit("library"), 0))
{
layer->is_library = 1;
}
}
if(md_node_has_tag(node, str8_lit("gen_folder"), 0))
if(node_has_tag(node, str8_lit("gen_folder"), 0))
{
layer->gen_folder_name = node->string;
}
if(md_node_has_tag(node, str8_lit("h_name"), 0))
if(node_has_tag(node, str8_lit("h_name"), 0))
{
layer->h_name_override = node->string;
}
if(md_node_has_tag(node, str8_lit("c_name"), 0))
if(node_has_tag(node, str8_lit("c_name"), 0))
{
layer->c_name_override = node->string;
}
if(md_node_has_tag(node, str8_lit("h_header"), 0))
if(node_has_tag(node, str8_lit("h_header"), 0))
{
String8List gen_strings = mg_string_list_from_table_gen(mg_arena, table_grid_map, table_col_map, str8_lit(""), node);
for(String8Node *n = gen_strings.first; n != 0; n = n->next)
@@ -184,7 +184,7 @@ entry_point(CmdLine *cmdline)
str8_list_push(mg_arena, &layer->h_header, str8_lit("\n"));
}
}
if(md_node_has_tag(node, str8_lit("h_footer"), 0))
if(node_has_tag(node, str8_lit("h_footer"), 0))
{
String8List gen_strings = mg_string_list_from_table_gen(mg_arena, table_grid_map, table_col_map, str8_lit(""), node);
for(String8Node *n = gen_strings.first; n != 0; n = n->next)
@@ -193,7 +193,7 @@ entry_point(CmdLine *cmdline)
str8_list_push(mg_arena, &layer->h_footer, str8_lit("\n"));
}
}
if(md_node_has_tag(node, str8_lit("c_header"), 0))
if(node_has_tag(node, str8_lit("c_header"), 0))
{
String8List gen_strings = mg_string_list_from_table_gen(mg_arena, table_grid_map, table_col_map, str8_lit(""), node);
for(String8Node *n = gen_strings.first; n != 0; n = n->next)
@@ -202,7 +202,7 @@ entry_point(CmdLine *cmdline)
str8_list_push(mg_arena, &layer->c_header, str8_lit("\n"));
}
}
if(md_node_has_tag(node, str8_lit("c_footer"), 0))
if(node_has_tag(node, str8_lit("c_footer"), 0))
{
String8List gen_strings = mg_string_list_from_table_gen(mg_arena, table_grid_map, table_col_map, str8_lit(""), node);
for(String8Node *n = gen_strings.first; n != 0; n = n->next)
@@ -222,8 +222,8 @@ entry_point(CmdLine *cmdline)
Node *file = n->v.root;
for MD_EachNode(node, file->first)
{
Node *tag = md_tag_from_string(node, str8_lit("enum"), 0);
if(!md_node_is_nil(tag))
Node *tag = tag_from_string(node, str8_lit("enum"), 0);
if(!node_is_nil(tag))
{
String8 enum_name = node->string;
String8 enum_member_prefix = enum_name;
@@ -269,8 +269,8 @@ entry_point(CmdLine *cmdline)
Node *file = n->v.root;
for MD_EachNode(node, file->first)
{
Node *tag = md_tag_from_string(node, str8_lit("xlist"), 0);
if(!md_node_is_nil(tag))
Node *tag = tag_from_string(node, str8_lit("xlist"), 0);
if(!node_is_nil(tag))
{
String8 layer_key = mg_layer_key_from_path(file->string);
MG_Layer *layer = mg_layer_from_key(layer_key);
@@ -294,7 +294,7 @@ entry_point(CmdLine *cmdline)
Node *file = n->v.root;
for MD_EachNode(node, file->first)
{
if(md_node_has_tag(node, str8_lit("struct"), 0))
if(node_has_tag(node, str8_lit("struct"), 0))
{
String8 layer_key = mg_layer_key_from_path(file->string);
MG_Layer *layer = mg_layer_from_key(layer_key);
@@ -319,14 +319,14 @@ entry_point(CmdLine *cmdline)
Node *file = n->v.root;
for MD_EachNode(node, file->first)
{
Node *tag = md_tag_from_string(node, str8_lit("data"), 0);
if(!md_node_is_nil(tag))
Node *tag = tag_from_string(node, str8_lit("data"), 0);
if(!node_is_nil(tag))
{
String8 element_type = tag->first->string;
String8 layer_key = mg_layer_key_from_path(file->string);
MG_Layer *layer = mg_layer_from_key(layer_key);
String8List gen_strings = mg_string_list_from_table_gen(mg_arena, table_grid_map, table_col_map, str8_lit(""), node);
if(!md_node_has_tag(node, str8_lit("c_file"), 0))
if(!node_has_tag(node, str8_lit("c_file"), 0))
{
str8_list_pushf(mg_arena, &layer->h_tables, "extern %S %S[%I64u];\n", element_type, node->string, gen_strings.node_count);
}
@@ -349,8 +349,8 @@ entry_point(CmdLine *cmdline)
Node *file = n->v.root;
for MD_EachNode(node, file->first)
{
Node *tag = md_tag_from_string(node, str8_lit("enum2string_switch"), 0);
if(!md_node_is_nil(tag))
Node *tag = tag_from_string(node, str8_lit("enum2string_switch"), 0);
if(!node_is_nil(tag))
{
String8 enum_type = tag->first->string;
String8 layer_key = mg_layer_key_from_path(file->string);
@@ -382,12 +382,12 @@ entry_point(CmdLine *cmdline)
Node *file = n->v.root;
for MD_EachNode(node, file->first)
{
Node *tag = md_tag_from_string(node, str8_lit("gen"), 0);
if(!md_node_is_nil(tag))
Node *tag = tag_from_string(node, str8_lit("gen"), 0);
if(!node_is_nil(tag))
{
String8 layer_key = mg_layer_key_from_path(file->string);
MG_Layer *layer = mg_layer_from_key(layer_key);
B32 prefer_c_file = md_node_has_tag(node, str8_lit("c_file"), 0);
B32 prefer_c_file = node_has_tag(node, str8_lit("c_file"), 0);
String8List *out = prefer_c_file ? &layer->c_catchall : &layer->h_catchall;
if(tag->first->string.size == 0){}
else if(str8_match(tag->first->string, str8_lit("enums"), 0)) { out = &layer->enums; }
@@ -414,7 +414,7 @@ entry_point(CmdLine *cmdline)
Node *file = n->v.root;
for MD_EachNode(node, file->first)
{
if(md_node_has_tag(node, str8_lit("embed_string"), 0))
if(node_has_tag(node, str8_lit("embed_string"), 0))
{
String8 layer_key = mg_layer_key_from_path(file->string);
MG_Layer *layer = mg_layer_from_key(layer_key);
@@ -423,7 +423,7 @@ entry_point(CmdLine *cmdline)
str8_list_push (mg_arena, &layer->h_tables, embed_string);
str8_list_pushf(mg_arena, &layer->h_tables, ");\n\n");
}
if(md_node_has_tag(node, str8_lit("embed_file"), 0))
if(node_has_tag(node, str8_lit("embed_file"), 0))
{
String8 layer_key = mg_layer_key_from_path(file->string);
MG_Layer *layer = mg_layer_from_key(layer_key);
@@ -449,20 +449,20 @@ entry_point(CmdLine *cmdline)
for MD_EachNode(node, file->first)
{
//- rjf: generate markdown page
if(md_node_has_tag(node, str8_lit("markdown"), 0))
if(node_has_tag(node, str8_lit("markdown"), 0))
{
String8List md_strs = {0};
for(Node *piece = node->first; !md_node_is_nil(piece); piece = piece->next)
for(Node *piece = node->first; !node_is_nil(piece); piece = piece->next)
{
if(md_node_has_tag(piece, str8_lit("title"), 0))
if(node_has_tag(piece, str8_lit("title"), 0))
{
str8_list_pushf(mg_arena, &md_strs, "# %S\n\n", piece->string);
}
if(md_node_has_tag(piece, str8_lit("subtitle"), 0))
if(node_has_tag(piece, str8_lit("subtitle"), 0))
{
str8_list_pushf(mg_arena, &md_strs, "## %S\n\n", piece->string);
}
if(md_node_has_tag(piece, str8_lit("p"), 0))
if(node_has_tag(piece, str8_lit("p"), 0))
{
String8 paragraph_text = piece->string;
String8List paragraph_lines = mg_wrapped_lines_from_string(mg_arena, paragraph_text, 80, 80, 0);
@@ -473,7 +473,7 @@ entry_point(CmdLine *cmdline)
}
str8_list_push(mg_arena, &md_strs, str8_lit("\n"));
}
if(md_node_has_tag(piece, str8_lit("unordered_list"), 0))
if(node_has_tag(piece, str8_lit("unordered_list"), 0))
{
String8List gen_strings = mg_string_list_from_table_gen(mg_arena, table_grid_map, table_col_map, str8_lit(""), piece);
for(String8Node *n = gen_strings.first; n != 0; n = n->next)