Get rid of some code duplication

diff --git a/ast.c b/ast.c
index fc82940dcb0faf1d8063d6488454eaacdc13613a..69a16feec91ee57bc0cfe1176715cc980fa475b9 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -1391,18 +1391,8 @@ bool ast_local_codegen(ast_value *self, ir_function *func, bool param)
     v->cvq = self->cvq;
     self->ir_v = v;
 
-    if (self->setter) {
-        if (!ast_global_codegen(self->setter, func->owner, false) ||
-            !ast_function_codegen(self->setter->constval.vfunc, func->owner) ||
-            !ir_function_finalize(self->setter->constval.vfunc->ir_func))
-            return false;
-    }
-    if (self->getter) {
-        if (!ast_global_codegen(self->getter, func->owner, false) ||
-            !ast_function_codegen(self->getter->constval.vfunc, func->owner) ||
-            !ir_function_finalize(self->getter->constval.vfunc->ir_func))
-            return false;
-    }
+    if (!ast_generate_accessors(self, func->owner))
+        return false;
     return true;
 
 error: /* clean up */
@@ -1410,6 +1400,29 @@ error: /* clean up */
     return false;
 }
 
+bool ast_generate_accessors(ast_value *asvalue, ir_builder *ir)
+{
+    if (asvalue->setter) {
+        if (!ast_global_codegen  (asvalue->setter, ir, false) ||
+            !ast_function_codegen(asvalue->setter->constval.vfunc, ir) ||
+            !ir_function_finalize(asvalue->setter->constval.vfunc->ir_func))
+        {
+            compile_error(ast_ctx(asvalue), "internal error: failed to generate setter for `%s`", asvalue->name);
+            return false;
+        }
+    }
+    if (asvalue->getter) {
+        if (!ast_global_codegen  (asvalue->getter, ir, false) ||
+            !ast_function_codegen(asvalue->getter->constval.vfunc, ir) ||
+            !ir_function_finalize(asvalue->getter->constval.vfunc->ir_func))
+        {
+            compile_error(ast_ctx(asvalue), "internal error: failed to generate getter for `%s`", asvalue->name);
+            return false;
+        }
+    }
+    return true;
+}
+
 bool ast_function_codegen(ast_function *self, ir_builder *ir)
 {
     ir_function *irf;

diff --git a/ast.h b/ast.h
index 004243fd7717fdf4ceea6343b7fe4ba06ae88200..41ef31821b8d81fe3878d342c3b02a9ce323be1b 100644 (file)
--- a/ast.h
+++ b/ast.h
@@ -626,6 +626,7 @@ void ast_function_delete(ast_function*);
 const char* ast_function_label(ast_function*, const char *prefix);
 
 bool ast_function_codegen(ast_function *self, ir_builder *builder);
+bool ast_generate_accessors(ast_value *asvalue, ir_builder *ir);
 
 /* Expression union
  */

diff --git a/parser.c b/parser.c
index d2c8bffe8aa28ec5f66dfb97f2024ae114e9412e..c3c4fa2c62c1fd275911daebb031aa6295a0124e 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -4591,25 +4591,9 @@ bool parser_finish(const char *output)
             if (!ast_istype(parser->globals[i], ast_value))
                 continue;
             asvalue = (ast_value*)(parser->globals[i]);
-            if (asvalue->setter) {
-                if (!ast_global_codegen(asvalue->setter, ir, false) ||
-                    !ast_function_codegen(asvalue->setter->constval.vfunc, ir) ||
-                    !ir_function_finalize(asvalue->setter->constval.vfunc->ir_func))
-                {
-                    printf("failed to generate setter for %s\n", asvalue->name);
-                    ir_builder_delete(ir);
-                    return false;
-                }
-            }
-            if (asvalue->getter) {
-                if (!ast_global_codegen(asvalue->getter, ir, false) ||
-                    !ast_function_codegen(asvalue->getter->constval.vfunc, ir) ||
-                    !ir_function_finalize(asvalue->getter->constval.vfunc->ir_func))
-                {
-                    printf("failed to generate getter for %s\n", asvalue->name);
-                    ir_builder_delete(ir);
-                    return false;
-                }
+            if (!ast_generate_accessors(asvalue, ir)) {
+                ir_builder_delete(ir);
+                return false;
             }
         }
         for (i = 0; i < vec_size(parser->fields); ++i) {
@@ -4620,25 +4604,9 @@ bool parser_finish(const char *output)
                 continue;
             if (asvalue->expression.vtype != TYPE_ARRAY)
                 continue;
-            if (asvalue->setter) {
-                if (!ast_global_codegen(asvalue->setter, ir, false) ||
-                    !ast_function_codegen(asvalue->setter->constval.vfunc, ir) ||
-                    !ir_function_finalize(asvalue->setter->constval.vfunc->ir_func))
-                {
-                    printf("failed to generate setter for %s\n", asvalue->name);
-                    ir_builder_delete(ir);
-                    return false;
-                }
-            }
-            if (asvalue->getter) {
-                if (!ast_global_codegen(asvalue->getter, ir, false) ||
-                    !ast_function_codegen(asvalue->getter->constval.vfunc, ir) ||
-                    !ir_function_finalize(asvalue->getter->constval.vfunc->ir_func))
-                {
-                    printf("failed to generate getter for %s\n", asvalue->name);
-                    ir_builder_delete(ir);
-                    return false;
-                }
+            if (!ast_generate_accessors(asvalue, ir)) {
+                ir_builder_delete(ir);
+                return false;
             }
         }
         for (i = 0; i < vec_size(parser->functions); ++i) {