WIP: linkage 3

Author: LesleyLai

include/mcc/ast.h

@@ -102,7 +102,7 @@ typedef struct Expr {
     struct ConstExpr const_expr;
     struct UnaryOpExpr unary_op;
     struct BinaryOpExpr binary_op;
-    const IdentifierInfo* variable;
+    IdentifierInfo* variable;
     struct TernaryExpr ternary;
     struct CallExpr call;
   };

src/frontend/parser.c

@@ -180,7 +180,7 @@ static Expr* parse_identifier_expr(Parser* parser, Scope* scope)
   Expr* result = ARENA_ALLOC_OBJECT(parser->permanent_arena, Expr);
 
   // If local variable does not exist
-  const IdentifierInfo* variable_identifier = lookup_identifier(scope, name);
+  IdentifierInfo* variable_identifier = lookup_identifier(scope, name);
   if (!variable_identifier) {
     const StringView error_msg = allocate_printf(
         parser->permanent_arena, "use of undeclared identifier '%.*s'",

src/frontend/symbol_table.c

@@ -78,6 +78,9 @@ FunctionIdentifierInfo* add_function_identifer(SymbolTable* symbol_table,
 {
   MCC_ASSERT(linkage != LINKAGE_NONE);
 
+  // check identifier in current scope
+  if (hashmap_lookup(&scope->identifiers, name) != nullptr) { return nullptr; }
+
   // TODO: proper types
   FunctionIdentifierInfo* info =
       ARENA_ALLOC_OBJECT(arena, FunctionIdentifierInfo);

src/frontend/symbol_table.h

@@ -87,7 +87,8 @@ Scope* new_scope(Scope* parent, Arena* arena);
 
 IdentifierInfo* lookup_identifier(const Scope* scope, StringView name);
 
-// Add information of the function identifier to the current scope
+// Return nullptr if an identifier of the same name already exist in the same
+// scope. Otherwise we add it to the current scope
 FunctionIdentifierInfo* add_function_identifer(SymbolTable* symbol_table,
                                                Scope* scope, StringView name,
                                                Linkage linkage, Arena* arena);

src/ir/ir_generator.c

@@ -359,9 +359,7 @@ static IRValue emit_ir_instructions_from_expr(const Expr* expr,
     }
   }
   case EXPR_VARIABLE: {
-    // TODO: fix this
-    // return ir_variable(expr->variable->rewrote_name);
-    return ir_variable(str("TODO"));
+    return ir_variable(as_object_ident(expr->variable)->rewrote_name);
   }
   case EXPR_TERNARY: {
     const StringView true_label =

tests/test_driver/src/test_runner.rs

@@ -95,7 +95,7 @@ async fn run_test(database: &TestDatabase, config: &TestConfig) -> Result<(), Te
         .args(["-c", &command])
         .output();
 
-    let timeout_duration = Duration::from_secs(1);
+    let timeout_duration = Duration::from_secs(10);
     let output = timeout(timeout_duration, output).await;
     if output.is_err() {
         return Err(TestError {