stable

ccompiler/frontend/parser/ast.h

@@ -89,6 +89,7 @@ typedef struct ast_node {
             vector_header(children, struct ast_node *);
         } block;
         struct {
+            symtab_key_t key;
             struct ast_node * decl_node;
             tok_t tok;
         } syms;

ccompiler/frontend/parser/ast/block.c

@@ -1,8 +1,6 @@
 
 #include "../ast.h"
 #include "../parser.h"
-#include "../symtab/symtab.h"
-
 
 #ifndef BLOCK_MAX_NODE
 #define BLOCK_MAX_NODE (1024)

ccompiler/frontend/parser/ast/decl.c

@@ -1,6 +1,5 @@
 #include "../ast.h"
 #include "../parser.h"
-#include "../symtab/symtab.h"
 
 /**
  * 0 false
@@ -49,7 +48,10 @@ ast_node_t* parse_decl_val(parser_t* parser) {
     node->decl_val.type = type_node;
     node->decl_val.name = name_node;
     node->type = NT_DECL_VAR;
-    symtab_add_symbol(parser->symtab, name_node->syms.tok.val.str, node, 0);
+
+    type_node->syms.key.uid = parser->symtab->cur_scope->uid;
+    type_node->syms.key.strp_name = name_node->syms.tok.val.str;
+    symtab_add(parser->symtab, &type_node->syms.key, node);
     
     ttype = peek_tok_type(tokbuf);
     if (ttype == TOKEN_ASSIGN) {

ccompiler/frontend/parser/ast/expr.c

@@ -1,6 +1,5 @@
 #include "../ast.h"
 #include "../parser.h"
-#include "../symtab/symtab.h"
 
 // Copy from `CParse`
 /**
@@ -253,11 +252,10 @@ static ast_node_t* parse_call(tok_stream_t* tokbuf, symtab_t *symtab, ast_node_t
     }
     pop_tok(tokbuf); // 跳过 ')'
 
-    const char* name = ident->syms.tok.val.str;
-    ast_node_t* sym = symtab_lookup_symbol(symtab, name);
+    ast_node_t* sym = symtab_get(symtab, &ident->syms.key);
     // TODO check func is match
     if (sym == NULL || sym->type != NT_DECL_FUNC) {
-        LOG_ERROR("function not decl %s", name);
+        LOG_FATAL("function not decl %s", ident->syms.key.strp_name);
     }
     node->call.name = ident;
     node->call.func_decl = sym;
@@ -345,10 +343,12 @@ static ast_node_t *parse_primary_expression(tok_stream_t* tokbuf, symtab_t *symt
     case TOKEN_IDENT:
         node = expect_pop_ident(tokbuf);
         cc_tktype_t ttype = peek_tok_type(tokbuf);
+        node->syms.key.uid = 0;
+        node->syms.key.strp_name = tok->val.str;
         if (ttype == TOKEN_L_PAREN) {
             node = parse_call(tokbuf, symtab, node);
         } else {
-            void *sym = symtab_lookup_symbol(symtab, tok->val.str);
+            void *sym = symtab_get(symtab, &node->syms.key);
             if (sym == NULL) {
                 LOG_ERROR("undefined symbol but use %s", tok->val.str);
             }

ccompiler/frontend/parser/ast/func.c

@@ -1,6 +1,5 @@
 #include "../ast.h"
 #include "../parser.h"
-#include "../symtab/symtab.h"
 
 #ifndef FUNC_PARAM_CACHE_SIZE
 #define FUNC_PARAM_CACHE_SIZE 32  // 合理初始值，可覆盖99%常见情况
@@ -40,7 +39,10 @@ static void parse_params(parser_t* parser, tok_stream_t* cache, ast_node_t* node
             node->decl_val.expr_stmt = NULL;
             node->decl_val.data = NULL;
             vector_push(params->params.params, node);
-            symtab_add_symbol(parser->symtab, id_node->syms.tok.val.str, node, 0);
+
+            id_node->syms.key.uid = parser->symtab->cur_scope->uid;
+            id_node->syms.key.strp_name = id_node->syms.tok.val.str;
+            symtab_add(parser->symtab, &id_node->syms.key, node);
             break;
         case TOKEN_L_PAREN: {
             depth++;
@@ -129,7 +131,11 @@ void parse_func(parser_t* parser) {
     
     ast_type_t type = check_is_func_decl(&(parser->tokbuf), &cache);
 
-    ast_node_t* prev = symtab_add_symbol(parser->symtab, func_name, decl, 1);
+
+    name_node->syms.key.uid = parser->symtab->cur_scope->uid;
+    name_node->syms.key.strp_name = func_name;
+    ast_node_t* prev = symtab_get(parser->symtab, &name_node->syms.key);
+    // TODO Change something
     if (prev != NULL) {
         if (prev->type != NT_DECL_FUNC) {
             LOG_ERROR("the symbol duplicate old is %d, new is func", prev->type);
@@ -143,6 +149,7 @@ void parse_func(parser_t* parser) {
         }
         return;
     }
+    symtab_add(parser->symtab, &name_node->syms.key, decl);
     vector_push(parser->root->root.children, decl);
     if (type == NT_DECL_FUNC) {
         return;

ccompiler/frontend/parser/parser.c

@@ -2,7 +2,7 @@
 #include "parser.h"
 #include "type.h"
 
-void init_parser(parser_t* parser, lexer_t* lexer, symtab_t* symtab) {
+void init_parser(parser_t* parser, cc_lexer_t* lexer, symtab_t* symtab) {
     init_lib_core();
     
     parser->cur_node = NULL;

ccompiler/frontend/parser/parser.h

@@ -2,23 +2,22 @@
 #define __PARSER_H__
 
 #include "../lexer/lexer.h"
+#include <lib/utils/symtab/symtab.h>
 #include "ast.h"
-typedef struct lexer lexer_t;
-typedef struct symtab symtab_t;
 #define PARSER_MAX_TOKEN_QUEUE 16
 
 typedef struct parser {
     ast_node_t* root;
     ast_node_t* cur_node;
     
-    lexer_t* lexer;
+    cc_lexer_t* lexer;
     symtab_t* symtab;
     tok_stream_t tokbuf;
     tok_t TokenBuffer[PARSER_MAX_TOKEN_QUEUE];
     int err_level;
 } parser_t;
 
-void init_parser(parser_t* parser, lexer_t* lexer, symtab_t* symtab);
+void init_parser(parser_t* parser, cc_lexer_t* lexer, symtab_t* symtab);
 void run_parser(parser_t* parser);
 
 #endif

ccompiler/frontend/parser/tests/test.c

@@ -1,4 +0,0 @@
-extern int _print_str(const char* str);
-int main(void) {
-    _print_str("Hello, world!\n");
-}

ccompiler/frontend/parser/tests/test_file.c

@@ -1,14 +0,0 @@
-
-// int __print_str(char* str);
-int f(void);
-
-int main(void) {
-    int a;
-    // f();
-    // a = 1 + 2 * 3 + 4;
-    // __print_str("Hello, world!\n");
-    a = 3 - f() * (3 + 2) % 6;
-    // 测试用例：
-    // if (a) if (2) 3; else b;
-    // 是否正确解析为 if (a) { if (b) c else d }
-}

ccompiler/frontend/parser/tests/test_parser.c

@@ -1,37 +0,0 @@
-#include "../parser.h"
-#include "../ast/ast.h"
-#include "../symtab/symtab.h"
-#include <stdio.h>
-
-// gcc -g ../parser.c ../../lexer/lexer.c ../ast/ast.c ../ast/block.c ../ast/decl.c ../ast/expr.c ../ast/func.c ../ast/program.c ../ast/stmt.c ../ast/term.c ../symtab/hashmap.c ../symtab/scope.c ../symtab/symtab.c test_parser.c -o test_parser
-// gcc -g test_parser.c -L../.. -lfrontend -o test_parser
-int main(int argc, char** argv) {
-    init_lib_core();
-    const char* file_name = "test_file.c";
-    if (argc == 2) {
-        file_name = argv[1];
-    }
-    FILE* fp = fopen(file_name, "r");
-    if (fp == NULL) {
-        perror("open file failed");
-        return 1;
-    }
-    printf("open file success\n");
-
-    lexer_t lexer;
-    strpool_t strpool;
-    init_strpool(&strpool);
-    init_lexer(&lexer, file_name, fp, (lexer_sread_fn)fread_s, &strpool);
-    
-    struct SymbolTable symtab;
-    init_symtab(&symtab);
-
-    struct parser parser;
-    init_parser(&parser, &lexer, &symtab);
-    parse_prog(&parser);
-
-    printf("parse_end\n");
-    pnt_ast(parser.root, 0);
-
-    return 0;
-}