codegen: Replace some unfortunate asserts with internal error reports

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 5b23c61790042cd2d3548ab3cbf2f8570ebf9bbe..32f42c992b1470a811330b733538566a0a99baeb 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -5644,14 +5644,16 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                                        } else if (cleft is CCodeConstant) {
                                                left = ((CCodeConstant) cleft).name;
                                        } else {
-                                               assert_not_reached ();
+                                               Report.error (expr.source_reference, "internal: Unsupported expression");
+                                               left = "NULL";
                                        }
                                        if (cright is CCodeIdentifier) {
                                                right = ((CCodeIdentifier) cright).name;
                                        } else if (cright is CCodeConstant) {
                                                right = ((CCodeConstant) cright).name;
                                        } else {
-                                               assert_not_reached ();
+                                               Report.error (expr.source_reference, "internal: Unsupported expression");
+                                               right = "NULL";
                                        }
 
                                        set_cvalue (expr, new CCodeConstant ("%s %s".printf (left, right)));

diff --git a/codegen/valaccodemethodmodule.vala b/codegen/valaccodemethodmodule.vala
index a341dc84317cf536057a0df87ee8c8665b620e34..fcf12def35cb7911ed72d6f7f885beeaa6a680a4 100644 (file)
--- a/codegen/valaccodemethodmodule.vala
+++ b/codegen/valaccodemethodmodule.vala
@@ -960,7 +960,8 @@ public abstract class Vala.CCodeMethodModule : CCodeStructModule {
                        } else if (parent_type is Enum) {
                                this_type = new EnumValueType ((Enum) parent_type);
                        } else {
-                               assert_not_reached ();
+                               Report.error (parent_type.source_reference, "internal: Unsupported symbol type");
+                               this_type = new InvalidType ();
                        }
 
                        generate_type_declaration (this_type, decl_space);

diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index babab2d7610404c4317f09c398318af5e4b2eb4a..3274b904d9f5bff8d0ac4911ce44181e10c5c8c8 100644 (file)
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -275,7 +275,7 @@ public class Vala.GTypeModule : GErrorModule {
                                        var f = (Field) s;
                                        generate_struct_field_declaration (cl, f, instance_struct, type_struct, decl_space, ref has_struct_member);
                                } else {
-                                       assert_not_reached ();
+                                       Report.error (s.source_reference, "internal: Unsupported symbol");
                                }
                        }
                } else {
@@ -2199,7 +2199,7 @@ public class Vala.GTypeModule : GErrorModule {
                                        type_struct.add_declaration (vdecl);
                                }
                        } else {
-                               assert_not_reached ();
+                               Report.error (sym.source_reference, "internal: Unsupported symbol");
                        }
                }