Changeset 8f910430 for libcfa

Timestamp:

May 17, 2021, 11:43:49 AM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

90a10e8

Parents:

fc1347d0

Message:

Updated the virtual module to prefix the names with the new convention and change the parent_vtable into type_info.

Location:

libcfa/src

Files:

• exception.c (modified) (1 diff)
• exception.h (modified) (2 diffs)
• exception.hfa (modified) (1 diff)
• virtual.c (modified) (3 diffs)
• virtual.h (modified) (2 diffs)

libcfa/src/exception.c

@@ -48 +48 @@
 
 // Base Exception type id:
-struct __cfa__parent_vtable __cfatid_exception_t = {
+struct __cfavir_type_info __cfatid_exception_t = {
         NULL,
 };

libcfa/src/exception.h

@@ -29 +29 @@
 struct __cfaehm_base_exception_t;
 typedef struct __cfaehm_base_exception_t exception_t;
-struct __cfa__parent_vtable;
+struct __cfavir_type_info;
 struct __cfaehm_base_exception_t_vtable {
-        const struct __cfa__parent_vtable * __cfavir_typeid;
+        const struct __cfavir_type_info * __cfavir_typeid;
         size_t size;
         void (*copy)(struct __cfaehm_base_exception_t *this,
@@ -41 +41 @@
         struct __cfaehm_base_exception_t_vtable const * virtual_table;
 };
-extern struct __cfa__parent_vtable __cfatid_exception_t;
+extern struct __cfavir_type_info __cfatid_exception_t;
 
 

libcfa/src/exception.hfa

@@ -157 +157 @@
 #define _EHM_TYPE_ID_STRUCT(exception_name, forall_clause) \
         forall_clause _EHM_TYPE_ID_TYPE(exception_name) { \
-                __cfa__parent_vtable const * parent; \
+                __cfavir_type_info const * parent; \
         }
 

libcfa/src/virtual.c

@@ -10 +10 @@
 // Created On       : Tus Jul 11 15:10:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Jul 26 14:24:00 2017
-// Update Count     : 1
+// Last Modified On : Mon May 17 11:01:00 2021
+// Update Count     : 2
 //
 
@@ -17 +17 @@
 #include "assert.h"
 
-int __cfa__is_parent( struct __cfa__parent_vtable const * parent,
-        struct __cfa__parent_vtable const * child ) {
+int __cfavir_is_parent(
+                __cfavir_type_id parent,
+                __cfavir_type_id child ) {
         assert( child );
         do {
@@ -28 +29 @@
 }
 
-void * __cfa__virtual_cast( struct __cfa__parent_vtable const * parent,
-        struct __cfa__parent_vtable const * const * child ) {
+void * __cfavir_virtual_cast(
+                __cfavir_type_id parent,
+                __cfavir_type_id const * child ) {
         assert( child );
-        return (__cfa__is_parent(parent, *child)) ? (void *)child : (void *)0;
+        return (__cfavir_is_parent(parent, *child)) ? (void *)child : (void *)0;
 }

libcfa/src/virtual.h

@@ -10 +10 @@
 // Created On       : Tus Jul 11 15:08:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Jul 26 14:18:00 2017
-// Update Count     : 1
+// Last Modified On : Mon May 17 11:03:00 2021
+// Update Count     : 2
 //
 
@@ -20 +20 @@
 #endif
 
-// All strict/explicate vtables should have this head, showing their parent.
-struct __cfa__parent_vtable {
-    struct __cfa__parent_vtable const * const parent;
+// Information on a type for the virtual system.
+// There should be exactly one instance per type and there should be a
+// pointer to it at the head of every virtual table.
+struct __cfavir_type_info {
+        // Type id of parent type, null if this is a root type.
+    struct __cfavir_type_info const * const parent;
 };
 
-// Takes in two non-null pointers to type_objects.
-int __cfa__is_parent( struct __cfa__parent_vtable const * parent,
-                struct __cfa__parent_vtable const * child );
+// A pointer to type information acts as the type id.
+typedef struct __cfavir_type_info const * __cfavir_type_id;
+
+// Takes in two non-null type ids.
+int __cfavir_is_parent(
+                __cfavir_type_id parent, __cfavir_type_id child );
 
 // If parent is a parent of child then return child, otherwise return NULL.
 // Input pointers are none-null, child's first level should be an object with
 // a vtable
-void * __cfa__virtual_cast( struct __cfa__parent_vtable const * parent,
-                struct __cfa__parent_vtable const * const * child );
+void * __cfavir_virtual_cast(
+                __cfavir_type_id parent, __cfavir_type_id const * child );
 
 #ifdef __cforall