Changeset ecfd758 for tests/exceptions/virtual-poly.cfa

Timestamp:

Apr 9, 2021, 2:11:43 PM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b91bfde

Parents:

e07b589

Message:

Major exception update, seperating type-ids from virtual tables. The major interface changes are done. There is a regression of ?Cancelled(T) to Some?Cancelled. There is some bits of code for the new verion of the ?Cancelled(T) interface already there. Not connected yet but I just reached the limit of what I wanted to do in one commit and then spent over a day cleaning up, so it will replace Some?Cancelled in a future commit.

File:

• tests/exceptions/virtual-poly.cfa (modified) (7 diffs)

tests/exceptions/virtual-poly.cfa

@@ -8 +8 @@
 #include <assert.h>
 
+
+struct __cfatid_struct_mono_base {
+    __cfa__parent_vtable const * parent;
+};
+
+__attribute__(( section(".gnu.linkonce.__cfatid_mono_base") ))
+struct __cfatid_struct_mono_base __cfatid_mono_base = {
+    (__cfa__parent_vtable *)0,
+};
+
 struct mono_base_vtable {
-        mono_base_vtable const * const parent;
+        __cfatid_struct_mono_base const * const __cfavir_typeid;
 };
 
@@ -17 +27 @@
 
 forall(T)
+struct __cfatid_struct_mono_child {
+    __cfatid_struct_mono_base const * parent;
+};
+
+forall(T)
 struct mono_child_vtable {
-        mono_base_vtable const * const parent;
+        __cfatid_struct_mono_child(T) const * const __cfavir_typeid;
 };
 
@@ -26 +41 @@
 };
 
-mono_base_vtable _mono_base_vtable_instance @= { 0 };
+__cfatid_struct_mono_child(int) __cfatid_mono_child @= {
+        &__cfatid_mono_base,
+};
+
 mono_child_vtable(int) _mono_child_vtable_instance @= {
-        &_mono_base_vtable_instance
+        &__cfatid_mono_child,
 };
 
@@ -37 +55 @@
 }
 
+
+forall(U)
+struct __cfatid_struct_poly_base {
+    __cfa__parent_vtable const * parent;
+};
+
 forall(U)
 struct poly_base_vtable {
-        poly_base_vtable(U) const * const parent;
+        __cfatid_struct_poly_base(U) const * const __cfavir_typeid;
 };
 
@@ -48 +72 @@
 
 forall(V)
+struct __cfatid_struct_poly_child {
+    __cfatid_struct_poly_base(V) const * parent;
+};
+
+forall(V)
 struct poly_child_vtable {
-        poly_base_vtable(V) const * const parent;
+        __cfatid_struct_poly_child(V) const * const __cfavir_typeid;
 };
 
@@ -57 +86 @@
 };
 
-poly_base_vtable(int) _poly_base_vtable_instance @= { 0 };
+__cfatid_struct_poly_base(int) __cfatid_poly_base @= {
+        (__cfa__parent_vtable *)0,
+};
+__cfatid_struct_poly_child(int) __cfatid_poly_child = {
+    &__cfatid_poly_base,
+};
 poly_child_vtable(int) _poly_child_vtable_instance @= {
-        &_poly_base_vtable_instance
+        &__cfatid_poly_child,
 };
-/* Resolver bug keeps me from adding these.
-poly_base_vtable(char) _poly_base_vtable_instance @= { 0 };
-poly_child_vtable(char) _poly_child_vtable_instance @= {
-        &_poly_base_vtable_instance
-};
-*/
 
 void poly_poly_test() {
@@ -77 +105 @@
         mono_poly_test();
         poly_poly_test();
-        printf( "done\n" );                             // non-empty .expect file
+        printf( "done\n" );
 }