guillm/42sh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-functionnal pretty-printing

Browse source
This commit is contained in:
Jean Herail 2026-01-21 19:57:44 +01:00
parent f6573d81f0
commit 0ede8d3eef
3 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main.c
View file

@ -60,6 +60,11 @@ int main(int argc, char **argv)
// Call the parser to get the AST // Call the parser to get the AST
struct ast *command_ast = get_ast(); // We'll pass the options later struct ast *command_ast = get_ast(); // We'll pass the options later
if (options.pretty_print)
{
ast_print_dot(command_ast);
}
// Call the executor with the AST // Call the executor with the AST
r = execution(command_ast); r = execution(command_ast);

27
src/utils/ast/ast.c
View file

@ -1,10 +1,10 @@
#include "ast.h"
#include <assert.h> #include <assert.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "ast.h"
static void ast_print_dot_recursive(struct ast *node, FILE *out) static void ast_print_dot_recursive(struct ast *node, FILE *out)
{ {
if (!node) if (!node)
@ -12,8 +12,7 @@ static void ast_print_dot_recursive(struct ast *node, FILE *out)
switch (node->type) switch (node->type)
{ {
case AST_IF: case AST_IF: {
{
struct ast_if *if_data = ast_get_if(node); struct ast_if *if_data = ast_get_if(node);
fprintf(out, " node%p [label=\"IF\"];\n", (void *)node); fprintf(out, " node%p [label=\"IF\"];\n", (void *)node);
@ -21,28 +20,30 @@ static void ast_print_dot_recursive(struct ast *node, FILE *out)
{ {
fprintf(out, " node%p -> node%p;\n", (void *)node, fprintf(out, " node%p -> node%p;\n", (void *)node,
(void *)if_data->condition); (void *)if_data->condition);
fprintf(out, " node%p [fillcolor=\"lightyellow\", style=\"filled\"];\n", fprintf(out,
" node%p [fillcolor=\"lightyellow\", style=\"filled\"];\n",
(void *)if_data->condition); (void *)if_data->condition);
ast_print_dot_recursive(if_data->condition, out); ast_print_dot_recursive(if_data->condition, out);
if (if_data->then_clause) if (if_data->then_clause)
{ {
fprintf(out, " node%p -> node%p [label=\"true\"];\n", fprintf(out, " node%p -> node%p [label=\"true\"];\n",
(void *)if_data->condition, (void *)if_data->then_clause); (void *)if_data->condition,
(void *)if_data->then_clause);
ast_print_dot_recursive(if_data->then_clause, out); ast_print_dot_recursive(if_data->then_clause, out);
} }
if (if_data->else_clause) if (if_data->else_clause)
{ {
fprintf(out, " node%p -> node%p [label=\"false\"];\n", fprintf(out, " node%p -> node%p [label=\"false\"];\n",
(void *)if_data->condition, (void *)if_data->else_clause); (void *)if_data->condition,
(void *)if_data->else_clause);
ast_print_dot_recursive(if_data->else_clause, out); ast_print_dot_recursive(if_data->else_clause, out);
} }
} }
break; break;
} }
case AST_CMD: case AST_CMD: {
{
struct ast_cmd *cmd_data = ast_get_cmd(node); struct ast_cmd *cmd_data = ast_get_cmd(node);
fprintf(out, " node%p [label=\"", (void *)node); fprintf(out, " node%p [label=\"", (void *)node);
struct list *l = cmd_data->cmd; struct list *l = cmd_data->cmd;
@ -66,14 +67,6 @@ static void ast_print_dot_recursive(struct ast *node, FILE *out)
void ast_print_dot(struct ast *ast) void ast_print_dot(struct ast *ast)
{ {
// Always print to stdout so the user can see it in the terminal
printf("digraph AST {\n");
if (ast)
{
ast_print_dot_recursive(ast, stdout);
}
printf("}\n");
if (!ast) if (!ast)
return; return;