Skip to content

Commit

Permalink
#85 new wip ast printer
Browse files Browse the repository at this point in the history
  • Loading branch information
@dibyendumajumdar
dibyendumajumdar committed Sep 18, 2022
1 parent 308dabf commit 458de5a
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 17 deletions.
42 changes: 28 additions & 14 deletions src/ast_printer_n.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,22 @@ static void dump_ast_node_list(TextBuffer *buf, AstNodeList *list, int level, co
printf_buf(buf, "%p%s\n", level, delimiter);
raviX_dump_ast_node(buf, node, level + 1);
}
END_FOR_EACH_PTR(node);
END_FOR_EACH_PTR(node)
}

static void dump_ast_node_list_as_ids(TextBuffer *buf, AstNodeList *list, const char *delimiter)
{
AstNode *node;
bool is_first = true;
FOR_EACH_PTR(list, AstNode, node)
{
if (is_first)
is_first = false;
else if (delimiter)
printf_buf(buf, "%s", delimiter);
printf_buf(buf, "%P", node);
}
END_FOR_EACH_PTR(node)
}

static void dump_statement_list(TextBuffer *buf, AstNodeList *statement_list, int level)
Expand Down Expand Up @@ -234,13 +249,12 @@ static void dump_symbol_name_list(TextBuffer *buf, LuaSymbolList *list, int leve
END_FOR_EACH_PTR(node);
}


static void dump_scope(TextBuffer *buf, Scope *scope, int level)
{
printf_buf(buf, "%pScope {\n", level);
printf_buf(buf, "%pid = %P,\n", level + 1, scope);
printf_buf(buf, "%pfunction = %P,\n", level + 1, scope->function);
printf_buf(buf, "%pparent = %P,\n", level + 1, scope->parent);
printf_buf(buf, "%pscope_id = %P,\n", level + 1, scope);
printf_buf(buf, "%pfunction_id = %P,\n", level + 1, scope->function);
printf_buf(buf, "%pparent_scope_id = %P,\n", level + 1, scope->parent);
printf_buf(buf, "%psymbols = {\n", level + 1);
dump_symbol_list(buf, scope->symbol_list, level + 2, ",");
printf_buf(buf, "%p},\n", level + 1);
Expand All @@ -253,8 +267,8 @@ void raviX_dump_ast_node(TextBuffer *buf, AstNode *node, int level)
switch (node->type) {
case EXPR_FUNCTION: {
printf_buf(buf, "%pExprFunction {\n", level);
printf_buf(buf, "%pid = %P,\n", level + 1, node);
printf_buf(buf, "%pparent_function = %P,\n", level + 1, node->function_expr.parent_function);
printf_buf(buf, "%pfunction_id = %P,\n", level + 1, node);
printf_buf(buf, "%pparent_function_id = %P,\n", level + 1, node->function_expr.parent_function);
printf_buf(buf, "%ptype_code = %s,\n", level + 1,
raviX_get_type_name(node->function_expr.type.type_code));
printf_buf(buf, "%ptype_name = '%s',\n", level + 1, get_as_str(node->function_expr.type.type_name));
Expand All @@ -277,11 +291,11 @@ void raviX_dump_ast_node(TextBuffer *buf, AstNode *node, int level)
printf_buf(buf, "%pstatements = {\n", level + 1);
dump_statement_list(buf, node->function_expr.function_statement_list, level + 1);
printf_buf(buf, "%p},\n", level + 1);
// if (node->function_expr.child_functions) {
// printf_buf(buf, "%pchild_functions = {\n", level+1);
// dump_ast_node_list(buf, node->function_expr.child_functions, level+1, ",");
// printf_buf(buf, "%p}\n", level+1);
// }
if (node->function_expr.child_functions) {
printf_buf(buf, "%pchild_functions = { ", level+1);
dump_ast_node_list_as_ids(buf, node->function_expr.child_functions, ",");
printf_buf(buf, " }\n");
}
printf_buf(buf, "%p}\n", level);
break;
}
Expand Down Expand Up @@ -405,7 +419,7 @@ void raviX_dump_ast_node(TextBuffer *buf, AstNode *node, int level)
printf_buf(buf, "%p},\n", level + 2);
printf_buf(buf, "%p},\n", level + 1);
}
printf_buf(buf, "%}\n", level);
printf_buf(buf, "%p}\n", level);
break;
}
case STMT_WHILE: {
Expand Down Expand Up @@ -608,7 +622,7 @@ void raviX_dump_ast_node(TextBuffer *buf, AstNode *node, int level)
printf_buf(buf, "%ptype_name = '%s',\n", level + 1, get_as_str(node->table_expr.type.type_name));
printf_buf(buf, "%pexpr_list = {\n", level + 1);
dump_ast_node_list(buf, node->table_expr.expr_list, level + 1, ",");
printf_buf(buf, "%}\n", level + 1);
printf_buf(buf, "%p}\n", level + 1);
printf_buf(buf, "%p}\n", level);
break;
}
Expand Down
6 changes: 3 additions & 3 deletions tests/trun.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ static int do_code(C_MemoryAllocator *allocator, const char *code, const struct
goto L_exit;
}
if (args->astdump) {
raviX_output_ast(compiler_state, stdout);
raviX_dump_ast(compiler_state, stdout);
}
rc = raviX_ast_lower(compiler_state);
if (rc != 0) {
Expand All @@ -144,7 +144,7 @@ static int do_code(C_MemoryAllocator *allocator, const char *code, const struct
goto L_exit;
}
if (args->astdump) {
raviX_output_ast(compiler_state, stdout);
raviX_dump_ast(compiler_state, stdout);
}
if (args->simplify_ast) {
rc = raviX_ast_simplify(compiler_state);
Expand All @@ -153,7 +153,7 @@ static int do_code(C_MemoryAllocator *allocator, const char *code, const struct
goto L_exit;
}
if (args->astdump) {
raviX_output_ast(compiler_state, stdout);
raviX_dump_ast(compiler_state, stdout);
}
}
LinearizerState *linearizer = raviX_init_linearizer(compiler_state);
Expand Down

0 comments on commit 458de5a

Please sign in to comment.