Changeset fca3bf8 for tests

Timestamp:

Feb 18, 2020, 8:52:55 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

e326ebca

Parents:

6988dc6 (diff), 3b9c674 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests/exceptions

Files:

• .expect/except-0.txt (added)
• .expect/except-1.txt (added)
• .expect/except-2.txt (added)
• .expect/except-3.txt (added)
• except-0.cfa (modified) (2 diffs)
• except-2.cfa (modified) (3 diffs)

tests/exceptions/except-0.cfa

@@ -19 +19 @@
 };
 
-void ?{}(signal_exit * this, const char * area) {
-        this->area = area;
-}
-
-void ^?{}(signal_exit * this) {
-        printf("Exiting: %s\n", this->area);
+void ?{}(signal_exit & this, const char * area) {
+        this.area = area;
+}
+
+void ^?{}(signal_exit & this) {
+        printf("Exiting: %s\n", this.area);
 //      sout | "Exiting:" | this->area;
 }
@@ -242 +242 @@
 
         // Uncaught termination test.
+        /* Removed due to non-deterministic output.
         printf("Throw uncaught.\n");
         yang z;
         terminate(&z);
-}
+        */
+}

tests/exceptions/except-2.cfa

@@ -12 +12 @@
         struct TABLE(BASE_EXCEPT) const * parent;
         size_t size;
-        void (*copy)(num_error *this, num_error * other);
-        void (*free)(num_error *this);
+        void (*copy)(num_error &this, num_error & other);
+        void (*free)(num_error &this);
         const char * (*msg)(num_error *this);
         int (*code)(num_error *this);
@@ -28 +28 @@
         if ( ! this->msg ) {
                 static const char * base = "Num Error with code: X";
-                this->msg = malloc(22);
+                this->msg = (char *)malloc(22);
                 for (int i = 0 ; (this->msg[i] = base[i]) ; ++i);
         }
@@ -34 +34 @@
         return this->msg;
 }
-void ?{}(num_error * this, int num) {
-        this->virtual_table = &INSTANCE(num_error);
-        this->msg = 0;
-        this->num = num;
+void ?{}(num_error & this, int num) {
+        this.virtual_table = &INSTANCE(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, 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 );
+void ^?{}(num_error & this) {
+        if( this.msg ) free( this.msg );
 }
 int num_error_code( num_error * this ) {