fix: Fix some 30cc self-compile errors

keyvank · Dec 3, 2024 · a587365 · a587365
1 parent 81571cf
commit a587365
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/build.py b/build.py
@@ -14,7 +14,7 @@ def compile(path):
         text=True,
     )
     if out.returncode != 0:
-        raise Exception(out.stderr)
+        raise Exception(out.stderr + "\n" + out.stdout)
     else:
         return out.stdout
 
@@ -33,12 +33,19 @@ def compile(path):
     except Exception as e:
         has_error = True
         print("Error compiling:", f, e)
-        
+
 
 objs = list(glob.glob("target/obj/**/*.o", recursive=True))
 
 if not has_error:
     subprocess.run(
-        ["ld", "-dynamic-linker", "/lib64/ld-linux-x86-64.so.2", "-lc", "-o", "target/30cc"]
+        [
+            "ld",
+            "-dynamic-linker",
+            "/lib64/ld-linux-x86-64.so.2",
+            "-lc",
+            "-o",
+            "target/30cc",
+        ]
         + objs
-    )
+    )
diff --git a/parser/expr/expr.c b/parser/expr/expr.c
@@ -192,7 +192,7 @@ apply_result *binary_op_apply(parser_node *node, context *ctx)
     }
 
     // TODO: clag gives warning when comparing int* and int
-    if (binop->op != TKN_ASSIGN && binop->op != TKN_EQ &&
+    if (binop->op != TKN_ASSIGN && binop->op != TKN_EQ && binop->op != TKN_NEQ && binop->op != TKN_ANDAND &&
         (left->type->kind == TYPE_POINTER || right->type->kind == TYPE_POINTER))
     {
         switch (binop->op)

diff --git a/parser/switch.c b/parser/switch.c
@@ -165,7 +165,7 @@ parser_node *parse_switch(typed_token **tkns_ptr)
                 tkn = tkn->next;
                 *tkns_ptr = tkn;
 
-                parser_node *node = malloc(sizeof(parser_node));
+                parser_node *node = (parser_node *)malloc(sizeof(parser_node));
                 node->data = (void *)malloc(sizeof(node_switch));
                 node->debug = switch_debug;
                 node->apply = switch_apply;

diff --git a/parser/type.c b/parser/type.c
@@ -83,7 +83,7 @@ parser_node *parse_type(typed_token **tkns_ptr, int allow_naming)
 
         if (allow_naming && tkn->type_id == TKN_ID)
         {
-            fun_name = tkn->data;
+            fun_name = (char *)tkn->data;
             tkn = tkn->next;
         }
 
@@ -93,7 +93,7 @@ parser_node *parse_type(typed_token **tkns_ptr, int allow_naming)
             if (tkn->type_id == TKN_L_PAREN)
             {
                 tkn = tkn->next;
-                parser_node **arg_types = malloc(sizeof(parser_node *) * 128);
+                parser_node **arg_types = (parser_node **)malloc(sizeof(parser_node *) * 128);
                 int arg_count = 0;
                 while (1)
                 {
@@ -134,7 +134,7 @@ parser_node *parse_type(typed_token **tkns_ptr, int allow_naming)
     if (allow_naming && tkn->type_id == TKN_ID)
     {
         node_type *par = (node_type *)node->data;
-        par->name = tkn->data;
+        par->name = (char *)tkn->data;
         tkn = tkn->next;
     }
 

diff --git a/preprocess/macro_call.c b/preprocess/macro_call.c
@@ -85,7 +85,7 @@ linked_list *seg_macro_call_gen(seg *self, prep_ctx *ctx)
         else if (tkn->type_id == TKN_SHARP)
         {
             repl_tkn = repl_tkn->next;
-            tkn = repl_tkn->value;
+            tkn = (typed_token *)repl_tkn->value;
             if (tkn->type_id != TKN_ID)
             {
                 fprintf(stderr, "Expected identifier!\n");