X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=parser.c;h=9dbc9a15ab3791cbb1816c99082ae4a06fe896d7;hb=baf69f3725f8eef6a7a34ef4c94264f7daecb9f5;hp=525192e48f2b64b1a2114bebc25c858d56375d68;hpb=0787038934f3ccc2ab6959896b2cd87fc7585c9f;p=xonotic%2Fgmqcc.git

diff --git a/parser.c b/parser.c
index 525192e..9dbc9a1 100644
--- a/parser.c
+++ b/parser.c
@@ -167,7 +167,7 @@ static ast_value* parser_const_float(parser_t *parser, double d)
     size_t i;
     ast_value *out;
     for (i = 0; i < vec_size(parser->imm_float); ++i) {
-        if (parser->imm_float[i]->constval.vfloat == d)
+        if ((double)(parser->imm_float[i]->constval.vfloat) == d)
             return parser->imm_float[i];
     }
     out = ast_value_new(parser_ctx(parser), "#IMMEDIATE", TYPE_FLOAT);
@@ -460,8 +460,6 @@ static bool parser_sy_pop(parser_t *parser, shunt *sy)
              (ast_istype((A), ast_value) && ((ast_value*)(A))->isconst)
 #define CanConstFold(A, B) \
              (CanConstFold1(A) && CanConstFold1(B))
-#define CanConstFold3(A, B, C) \
-             (CanConstFold1(A) && CanConstFold1(B) && CanConstFold1(C))
 #define ConstV(i) (asvalue[(i)]->constval.vvec)
 #define ConstF(i) (asvalue[(i)]->constval.vfloat)
 #define ConstS(i) (asvalue[(i)]->constval.vstring)
@@ -768,6 +766,12 @@ static bool parser_sy_pop(parser_t *parser, shunt *sy)
             break;
 
         case opid2('?',':'):
+            if (exprs[1]->expression.vtype != exprs[2]->expression.vtype) {
+                ast_type_to_string(exprs[1], ty1, sizeof(ty1));
+                ast_type_to_string(exprs[2], ty2, sizeof(ty2));
+                parseerror(parser, "iperands of ternary expression must have the same type, got %s and %s", ty1, ty2);
+                return false;
+            }
             if (CanConstFold1(exprs[0]))
                 out = (ConstF(0) ? exprs[1] : exprs[2]);
             else
@@ -1820,7 +1824,7 @@ static bool parse_switch(parser_t *parser, ast_block *block, ast_expression **ou
 
     /* case list! */
     while (parser->tok != '}') {
-        ast_block *block;
+        ast_block *caseblock;
 
         if (parser->tok != TOKEN_KEYWORD) {
             ast_delete(switchnode);
@@ -1863,13 +1867,13 @@ static bool parse_switch(parser_t *parser, ast_block *block, ast_expression **ou
             parseerror(parser, "expected statements or case");
             return false;
         }
-        block = ast_block_new(parser_ctx(parser));
-        if (!block) {
+        caseblock = ast_block_new(parser_ctx(parser));
+        if (!caseblock) {
             if (swcase.value) ast_unref(swcase.value);
             ast_delete(switchnode);
             return false;
         }
-        swcase.code = (ast_expression*)block;
+        swcase.code = (ast_expression*)caseblock;
         vec_push(switchnode->cases, swcase);
         while (true) {
             ast_expression *expr;
@@ -1882,13 +1886,13 @@ static bool parse_switch(parser_t *parser, ast_block *block, ast_expression **ou
                     break;
                 }
             }
-            if (!parse_statement(parser, block, &expr, true)) {
+            if (!parse_statement(parser, caseblock, &expr, true)) {
                 ast_delete(switchnode);
                 return false;
             }
             if (!expr)
                 continue;
-            vec_push(block->exprs, expr);
+            vec_push(caseblock->exprs, expr);
         }
     }
 
@@ -3575,6 +3579,78 @@ static bool parser_global_statement(parser_t *parser)
     return true;
 }
 
+static uint16_t progdefs_crc_sum(uint16_t old, const char *str)
+{
+    return util_crc16(old, str, strlen(str));
+}
+
+static void progdefs_crc_file(const char *str)
+{
+    /* write to progdefs.h here */
+}
+
+static uint16_t progdefs_crc_both(uint16_t old, const char *str)
+{
+    old = progdefs_crc_sum(old, str);
+    progdefs_crc_file(str);
+    return old;
+}
+
+static void generate_checksum(parser_t *parser)
+{
+    uint16_t crc = 0xFFFF;
+    size_t i;
+
+	crc = progdefs_crc_both(crc, "\n/* file generated by qcc, do not modify */\n\ntypedef struct\n{");
+	crc = progdefs_crc_sum(crc, "\tint\tpad[28];\n");
+	/*
+	progdefs_crc_file("\tint\tpad;\n");
+	progdefs_crc_file("\tint\tofs_return[3];\n");
+	progdefs_crc_file("\tint\tofs_parm0[3];\n");
+	progdefs_crc_file("\tint\tofs_parm1[3];\n");
+	progdefs_crc_file("\tint\tofs_parm2[3];\n");
+	progdefs_crc_file("\tint\tofs_parm3[3];\n");
+	progdefs_crc_file("\tint\tofs_parm4[3];\n");
+	progdefs_crc_file("\tint\tofs_parm5[3];\n");
+	progdefs_crc_file("\tint\tofs_parm6[3];\n");
+	progdefs_crc_file("\tint\tofs_parm7[3];\n");
+	*/
+	for (i = 0; i < parser->crc_globals; ++i) {
+	    if (!ast_istype(parser->globals[i].var, ast_value))
+	        continue;
+	    switch (parser->globals[i].var->expression.vtype) {
+	        case TYPE_FLOAT:    crc = progdefs_crc_both(crc, "\tfloat\t"); break;
+	        case TYPE_VECTOR:   crc = progdefs_crc_both(crc, "\tvec3_t\t"); break;
+	        case TYPE_STRING:   crc = progdefs_crc_both(crc, "\tstring_t\t"); break;
+	        case TYPE_FUNCTION: crc = progdefs_crc_both(crc, "\tfunc_t\t"); break;
+	        default:
+	            crc = progdefs_crc_both(crc, "\tint\t");
+	            break;
+	    }
+	    crc = progdefs_crc_both(crc, parser->globals[i].name);
+	    crc = progdefs_crc_both(crc, ";\n");
+	}
+	crc = progdefs_crc_both(crc, "} globalvars_t;\n\ntypedef struct\n{\n");
+	for (i = 0; i < parser->crc_fields; ++i) {
+	    if (!ast_istype(parser->fields[i].var, ast_value))
+	        continue;
+	    switch (parser->fields[i].var->expression.next->expression.vtype) {
+	        case TYPE_FLOAT:    crc = progdefs_crc_both(crc, "\tfloat\t"); break;
+	        case TYPE_VECTOR:   crc = progdefs_crc_both(crc, "\tvec3_t\t"); break;
+	        case TYPE_STRING:   crc = progdefs_crc_both(crc, "\tstring_t\t"); break;
+	        case TYPE_FUNCTION: crc = progdefs_crc_both(crc, "\tfunc_t\t"); break;
+	        default:
+	            crc = progdefs_crc_both(crc, "\tint\t");
+	            break;
+	    }
+	    crc = progdefs_crc_both(crc, parser->fields[i].name);
+	    crc = progdefs_crc_both(crc, ";\n");
+	}
+	crc = progdefs_crc_both(crc, "} entvars_t;\n\n");
+
+	code_crc = crc;
+}
+
 static parser_t *parser;
 
 bool parser_init()
@@ -3702,78 +3778,6 @@ void parser_cleanup()
     mem_d(parser);
 }
 
-static uint16_t progdefs_crc_sum(uint16_t old, const char *str)
-{
-    return util_crc16(old, str, strlen(str));
-}
-
-static void progdefs_crc_file(const char *str)
-{
-    /* write to progdefs.h here */
-}
-
-static uint16_t progdefs_crc_both(uint16_t old, const char *str)
-{
-    old = progdefs_crc_sum(old, str);
-    progdefs_crc_file(str);
-    return old;
-}
-
-static void generate_checksum(parser_t *parser)
-{
-    uint16_t crc = 0xFFFF;
-    size_t i;
-
-	crc = progdefs_crc_both(crc, "\n/* file generated by qcc, do not modify */\n\ntypedef struct\n{");
-	crc = progdefs_crc_sum(crc, "\tint\tpad[28];\n");
-	/*
-	progdefs_crc_file("\tint\tpad;\n");
-	progdefs_crc_file("\tint\tofs_return[3];\n");
-	progdefs_crc_file("\tint\tofs_parm0[3];\n");
-	progdefs_crc_file("\tint\tofs_parm1[3];\n");
-	progdefs_crc_file("\tint\tofs_parm2[3];\n");
-	progdefs_crc_file("\tint\tofs_parm3[3];\n");
-	progdefs_crc_file("\tint\tofs_parm4[3];\n");
-	progdefs_crc_file("\tint\tofs_parm5[3];\n");
-	progdefs_crc_file("\tint\tofs_parm6[3];\n");
-	progdefs_crc_file("\tint\tofs_parm7[3];\n");
-	*/
-	for (i = 0; i < parser->crc_globals; ++i) {
-	    if (!ast_istype(parser->globals[i].var, ast_value))
-	        continue;
-	    switch (parser->globals[i].var->expression.vtype) {
-	        case TYPE_FLOAT:    crc = progdefs_crc_both(crc, "\tfloat\t"); break;
-	        case TYPE_VECTOR:   crc = progdefs_crc_both(crc, "\tvec3_t\t"); break;
-	        case TYPE_STRING:   crc = progdefs_crc_both(crc, "\tstring_t\t"); break;
-	        case TYPE_FUNCTION: crc = progdefs_crc_both(crc, "\tfunc_t\t"); break;
-	        default:
-	            crc = progdefs_crc_both(crc, "\tint\t");
-	            break;
-	    }
-	    crc = progdefs_crc_both(crc, parser->globals[i].name);
-	    crc = progdefs_crc_both(crc, ";\n");
-	}
-	crc = progdefs_crc_both(crc, "} globalvars_t;\n\ntypedef struct\n{\n");
-	for (i = 0; i < parser->crc_fields; ++i) {
-	    if (!ast_istype(parser->fields[i].var, ast_value))
-	        continue;
-	    switch (parser->fields[i].var->expression.next->expression.vtype) {
-	        case TYPE_FLOAT:    crc = progdefs_crc_both(crc, "\tfloat\t"); break;
-	        case TYPE_VECTOR:   crc = progdefs_crc_both(crc, "\tvec3_t\t"); break;
-	        case TYPE_STRING:   crc = progdefs_crc_both(crc, "\tstring_t\t"); break;
-	        case TYPE_FUNCTION: crc = progdefs_crc_both(crc, "\tfunc_t\t"); break;
-	        default:
-	            crc = progdefs_crc_both(crc, "\tint\t");
-	            break;
-	    }
-	    crc = progdefs_crc_both(crc, parser->fields[i].name);
-	    crc = progdefs_crc_both(crc, ";\n");
-	}
-	crc = progdefs_crc_both(crc, "} entvars_t;\n\n");
-
-	code_crc = crc;
-}
-
 bool parser_finish(const char *output)
 {
     size_t i;
@@ -3915,6 +3919,10 @@ bool parser_finish(const char *output)
                 ir_builder_delete(ir);
                 return false;
             }
+        }
+        if (opts_dump)
+            ir_builder_dump(ir, con_out);
+        for (i = 0; i < vec_size(parser->functions); ++i) {
             if (!ir_function_finalize(parser->functions[i]->ir_func)) {
                 con_out("failed to finalize function %s\n", parser->functions[i]->name);
                 ir_builder_delete(ir);
@@ -3923,7 +3931,7 @@ bool parser_finish(const char *output)
         }
 
         if (retval) {
-            if (opts_dump)
+            if (opts_dumpfin)
                 ir_builder_dump(ir, con_out);
 
             generate_checksum(parser);