Changeset 53ee27e for tests/exceptions

Timestamp:

Aug 4, 2020, 5:13:51 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

eafec07

Parents:

3f850d7 (diff), 21b0a23 (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/polymophic.txt (added)
• conditional.cfa (modified) (1 diff)
• defaults.cfa (modified) (2 diffs)
• polymophic.cfa (added)

tests/exceptions/conditional.cfa

@@ -17 +17 @@
 };
 
-void num_error_msg(num_error * this) {
+const char * num_error_msg(num_error * this) {
     if ( ! this->msg ) {
         static const char * base = "Num Error with code: X";

tests/exceptions/defaults.cfa

@@ -13 +13 @@
 }
 
-char * get_log_message(log_message * this) {
+const char * get_log_message(log_message * this) {
         return this->msg;
 }
@@ -28 +28 @@
         // We can catch log:
         try {
-                throwResume (log_message){(char *)"Should be printed.\n"};
+                throwResume (log_message){"Should be printed.\n"};
         } catchResume (log_message * this) {
                 printf("%s", this->virtual_table->msg(this));
         }
         // But we don't have to:
-        throwResume (log_message){(char *)"Should not be printed.\n"};
+        throwResume (log_message){"Should not be printed.\n"};
 }