Changeset ecfd758 for tests/exceptions/conditional.cfa

Timestamp:

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

Author:

Andrew Beach <ajbeach@…>

Branches:

arm-eh, jacob/cs343-translation, master, new-ast-unique-expr

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/conditional.cfa (modified) (3 diffs)

tests/exceptions/conditional.cfa

@@ -6 +6 @@
 #include <exception.hfa>
 
-VTABLE_DECLARATION(num_error)(
-        int (*code)(num_error *this);
+EHM_EXCEPTION(num_error)(
+        int num;
 );
 
-struct num_error {
-        VTABLE_FIELD(num_error);
-    char * msg;
-    int num;
-};
-
-const char * num_error_msg(num_error * this) {
-    if ( ! this->msg ) {
-        static const char * base = "Num Error with code: X";
-        this->msg = (char *)malloc(22);
-        for (int i = 0 ; (this->msg[i] = base[i]) ; ++i);
-    }
-    this->msg[21] = '0' + this->num;
-    return this->msg;
-}
-void ?{}(num_error & this, int num) {
-        VTABLE_INIT(this, num_error);
-    this.msg = 0;
-    this.num = num;
-}
-void ?{}(num_error & this, num_error & other) {
-    this.virtual_table = other.virtual_table;
-    this.msg = 0;
-    this.num = other.num;
-}
-void ^?{}(num_error & this) {
-    if( this.msg ) free( this.msg );
-}
-int num_error_code( num_error * this ) {
-    return this->num;
-}
-
-VTABLE_INSTANCE(num_error)(
-        num_error_msg,
-        num_error_code,
-);
+EHM_VIRTUAL_TABLE(num_error, num_error_vt);
 
 void caught_num_error(int expect, num_error * actual) {
@@ -52 +17 @@
 
 int main(int argc, char * argv[]) {
-        num_error exc = 2;
+        num_error exc = {&num_error_vt, 2};
 
         try {
                 throw exc;
-        } catch (num_error * error ; 3 == error->virtual_table->code( error )) {
+        } catch (num_error * error ; 3 == error->num ) {
                 caught_num_error(3, error);
-        } catch (num_error * error ; 2 == error->virtual_table->code( error )) {
+        } catch (num_error * error ; 2 == error->num ) {
                 caught_num_error(2, error);
         }
@@ -64 +29 @@
         try {
                 throwResume exc;
-        } catchResume (num_error * error ; 3 == error->virtual_table->code( error )) {
+        } catchResume (num_error * error ; 3 == error->num ) {
                 caught_num_error(3, error);
-        } catchResume (num_error * error ; 2 == error->virtual_table->code( error )) {
+        } catchResume (num_error * error ; 2 == error->num ) {
                 caught_num_error(2, error);
         }