feat add func call and rewrite codes

ccompiler/frontend/parser/ast/block.c

@@ -1,48 +1,49 @@
 
-#include "../parser.h"
 #include "ast.h"
+#include "../parser.h"
 #include "../symtab/symtab.h"
 
+
 #ifndef BLOCK_MAX_NODE
 #define BLOCK_MAX_NODE (1024)
 #endif
 
-struct ASTNode* parse_block(struct Parser* parser) {
-    symtab_enter_scope(parser->symtab);
-
-    // parse_decl(parser); // decl_var
-    enum TokenType ttype;
-    struct ASTNode* node = new_ast_node();
+ast_node_t* new_ast_node_block() {
+    ast_node_t* node = new_ast_node();
     node->type = NT_BLOCK;
-    flushpeektok(parser);
-    ttype = peektoktype(parser);
-    if (ttype != TOKEN_L_BRACE) {
-        error("block need '{' start");
-    }
-    poptok(parser);
+    vector_init(node->block.children);
+    return node;
+}
 
-    node->block.children = malloc(sizeof(struct ASTNode*) * BLOCK_MAX_NODE);
-    struct ASTNode* child = NULL;
+ast_node_t* parse_block(parser_t* parser) {
+    symtab_enter_scope(parser->symtab);
+    tok_buf_t *tokbuf = &parser->tokbuf;
+    flush_peek_tok(tokbuf);
+    tok_type_t ttype;
+    ast_node_t* node = new_ast_node_block();
+
+    expect_pop_tok(tokbuf, TOKEN_L_BRACE);
+    ast_node_t* child = NULL;
     while (1) {
-        if (peek_decl(parser) == 1) {
+        if (peek_decl(tokbuf)) {
             child = parse_decl(parser);
-            goto ADD_CHILD;
+            vector_push(node->block.children, child);
+            continue;
         }
 
-        flushpeektok(parser);
-        ttype = peektoktype(parser);
+        flush_peek_tok(tokbuf);
+        ttype = peek_tok_type(tokbuf);
         switch (ttype) {
-        case TOKEN_R_BRACE:
-            poptok(parser);
-            goto END;
-        default:
-            child = parse_stmt(parser);
-            goto ADD_CHILD;
-            break;
+            case TOKEN_R_BRACE: {
+                pop_tok(tokbuf);
+                goto END;
+            }
+            default: {
+                child = parse_stmt(parser);
+                vector_push(node->block.children, child);
+                break;
+            }
         }
-        continue;
-    ADD_CHILD:
-        node->block.children[node->block.child_size++] = child;
     }
 END:
     symtab_leave_scope(parser->symtab);