we like to spell things properly - if this commit message contains a typo I don't...

diff --git a/ast.c b/ast.c
index 24d0479a71f0b6ae956cce8aa3e264ebdff5cc1c..3af6ffcfd5c1b69acddbf0babf077888a57d80ce 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -1453,7 +1453,7 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield)
         if (self->expression.flags & AST_FLAG_INCLUDE_DEF)
             self->ir_v->flags |= IR_FLAG_INCLUDE_DEF;
         if (self->expression.flags & AST_FLAG_ERASEABLE)
         if (self->expression.flags & AST_FLAG_INCLUDE_DEF)
             self->ir_v->flags |= IR_FLAG_INCLUDE_DEF;
         if (self->expression.flags & AST_FLAG_ERASEABLE)

-            self->ir_v->flags |= IR_FLAG_ERASEABLE;
+            self->ir_v->flags |= IR_FLAG_ERASABLE;

         if (self->expression.flags & AST_FLAG_BLOCK_COVERAGE)
             func->flags |= IR_FLAG_BLOCK_COVERAGE;
         /* The function is filled later on ast_function_codegen... */
         if (self->expression.flags & AST_FLAG_BLOCK_COVERAGE)
             func->flags |= IR_FLAG_BLOCK_COVERAGE;
         /* The function is filled later on ast_function_codegen... */


@@ -1501,7 +1501,7 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield)
             if (self->expression.flags & AST_FLAG_INCLUDE_DEF)
                 self->ir_v->flags |= IR_FLAG_INCLUDE_DEF;
             if (self->expression.flags & AST_FLAG_ERASEABLE)
             if (self->expression.flags & AST_FLAG_INCLUDE_DEF)
                 self->ir_v->flags |= IR_FLAG_INCLUDE_DEF;
             if (self->expression.flags & AST_FLAG_ERASEABLE)

-                self->ir_v->flags |= IR_FLAG_ERASEABLE;
+                self->ir_v->flags |= IR_FLAG_ERASABLE;

 
             namelen = strlen(self->name);
             name    = (char*)mem_a(namelen + 16);
 
             namelen = strlen(self->name);
             name    = (char*)mem_a(namelen + 16);


@@ -1536,7 +1536,7 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield)
                 self->ir_v->flags |= IR_FLAG_INCLUDE_DEF;
 
             if (self->expression.flags & AST_FLAG_ERASEABLE)
                 self->ir_v->flags |= IR_FLAG_INCLUDE_DEF;
 
             if (self->expression.flags & AST_FLAG_ERASEABLE)

-                self->ir_v->flags |= IR_FLAG_ERASEABLE;
+                self->ir_v->flags |= IR_FLAG_ERASABLE;

         }
         return true;
     }
         }
         return true;
     }


@@ -1570,7 +1570,7 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield)
         if (self->expression.flags & AST_FLAG_INCLUDE_DEF)
             v->flags |= IR_FLAG_INCLUDE_DEF;
         if (self->expression.flags & AST_FLAG_ERASEABLE)
         if (self->expression.flags & AST_FLAG_INCLUDE_DEF)
             v->flags |= IR_FLAG_INCLUDE_DEF;
         if (self->expression.flags & AST_FLAG_ERASEABLE)

-            self->ir_v->flags |= IR_FLAG_ERASEABLE;
+            self->ir_v->flags |= IR_FLAG_ERASABLE;

 
         namelen = strlen(self->name);
         name    = (char*)mem_a(namelen + 16);
 
         namelen = strlen(self->name);
         name    = (char*)mem_a(namelen + 16);


@@ -1615,7 +1615,7 @@ bool ast_global_codegen(ast_value *self, ir_builder *ir, bool isfield)
     if (self->expression.flags & AST_FLAG_INCLUDE_DEF)
         self->ir_v->flags |= IR_FLAG_INCLUDE_DEF;
     if (self->expression.flags & AST_FLAG_ERASEABLE)
     if (self->expression.flags & AST_FLAG_INCLUDE_DEF)
         self->ir_v->flags |= IR_FLAG_INCLUDE_DEF;
     if (self->expression.flags & AST_FLAG_ERASEABLE)

-        self->ir_v->flags |= IR_FLAG_ERASEABLE;
+        self->ir_v->flags |= IR_FLAG_ERASABLE;

 
     /* initialize */
     if (self->hasvalue) {
 
     /* initialize */
     if (self->hasvalue) {

diff --git a/ir.c b/ir.c
index d562edc564e5559d812c5e668d02d564344c4c93..c99f591e884ced27c055be2633adf18007826076 100644 (file)
--- a/ir.c
+++ b/ir.c
@@ -1124,7 +1124,7 @@ ir_value* ir_value_var(const char *name, int storetype, int vtype)
 /*  helper function */
 static ir_value* ir_builder_imm_float(ir_builder *self, float value, bool add_to_list) {
     ir_value *v = ir_value_var("#IMMEDIATE", store_global, TYPE_FLOAT);
 /*  helper function */
 static ir_value* ir_builder_imm_float(ir_builder *self, float value, bool add_to_list) {
     ir_value *v = ir_value_var("#IMMEDIATE", store_global, TYPE_FLOAT);

-    v->flags |= IR_FLAG_ERASEABLE;
+    v->flags |= IR_FLAG_ERASABLE;

     v->hasvalue = true;
     v->cvq = CV_CONST;
     v->constval.vfloat = value;
     v->hasvalue = true;
     v->cvq = CV_CONST;
     v->constval.vfloat = value;


@@ -3581,7 +3581,7 @@ static bool gen_global_function_code(ir_builder *ir, ir_value *global)
      * If there is no definition and the thing is eraseable, we can ignore
      * outputting the function to begin with.
      */
      * If there is no definition and the thing is eraseable, we can ignore
      * outputting the function to begin with.
      */

-    if (global->flags & IR_FLAG_ERASEABLE && irfun->code_function_def < 0) {
+    if (global->flags & IR_FLAG_ERASABLE && irfun->code_function_def < 0) {

         return true;
     }
 
         return true;
     }
 


@@ -3693,7 +3693,7 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global, bool isloc
          * if we're eraseable and the function isn't referenced ignore outputting
          * the function.
          */
          * if we're eraseable and the function isn't referenced ignore outputting
          * the function.
          */

-        if (global->flags & IR_FLAG_ERASEABLE && vec_size(global->reads) == 0) {
+        if (global->flags & IR_FLAG_ERASABLE && vec_size(global->reads) == 0) {

             return true;
         }
 
             return true;
         }
 

diff --git a/ir.h b/ir.h
index 731fbbc7ecfde1ee2329096ccb9f30a77d9d153a..aa06179ee5b7e10dab2519612859bb04aa200eb2 100644 (file)
--- a/ir.h
+++ b/ir.h
@@ -47,7 +47,7 @@ enum {
     IR_FLAG_HAS_UNINITIALIZED       = 1 << 1,
     IR_FLAG_HAS_GOTO                = 1 << 2,
     IR_FLAG_INCLUDE_DEF             = 1 << 3,
     IR_FLAG_HAS_UNINITIALIZED       = 1 << 1,
     IR_FLAG_HAS_GOTO                = 1 << 2,
     IR_FLAG_INCLUDE_DEF             = 1 << 3,

-    IR_FLAG_ERASEABLE               = 1 << 4,
+    IR_FLAG_ERASABLE                = 1 << 4,

     IR_FLAG_BLOCK_COVERAGE          = 1 << 5,
 
     IR_FLAG_SPLIT_VECTOR            = 1 << 6,
     IR_FLAG_BLOCK_COVERAGE          = 1 << 5,
 
     IR_FLAG_SPLIT_VECTOR            = 1 << 6,