Changeset 95789be for tests

Timestamp:

Aug 3, 2020, 2:23:17 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:

1a39a5a

Parents:

3e2b9c9 (diff), 6dba8755 (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

Files:

• .expect/castError.txt (modified) (3 diffs)
• .expect/init1.txt (added)
• avltree/avl1.cfa (modified) (1 diff)
• bugs/140.cfa (added)
• bugs/203-2.cfa (added)
• bugs/203-7.cfa (added)
• bugs/203-9.cfa (added)
• bugs/66.cfa (modified) (1 diff)
• castError.cfa (modified) (2 diffs)
• concurrent/signal/block.cfa (modified) (1 diff)
• exceptions/conditional.cfa (modified) (1 diff)
• exceptions/defaults.cfa (modified) (2 diffs)
• init1.cfa (added)
• io2.cfa (modified) (1 diff)
• searchsort.cfa (modified) (1 diff)

tests/.expect/castError.txt

@@ -1 @@
-castError.cfa:21:1 error: Cannot choose between 3 alternatives for expression
+castError.cfa:23:1 error: Cannot choose between 3 alternatives for expression
 Explicit Cast of:
   Name: f
@@ -35 +35 @@
 
 
-castError.cfa:26:1 error: Cannot choose between 2 alternatives for expression
+castError.cfa:28:1 error: Cannot choose between 2 alternatives for expression
 Generated Cast of:
   Comma Expression:
@@ -62 +62 @@
 
 
+castError.cfa:30:1 error: No reasonable alternatives for expression Explicit Cast of:
+  Name: sint
+... to:
+  instance of struct S with body 1
+  ... with parameters
+    char
+

tests/avltree/avl1.cfa

@@ -24 +24 @@
 tree(K, V) * create(K key, V value) {
   // infinite loop trying to resolve ... t = malloc();
-  tree(K, V) * t = malloc(sizeof(tree(K,V)));
+  tree(K, V) * t = ( tree(K, V) * ) malloc(sizeof(tree(K,V)));
   (*t){ key, value };
   return t;

tests/bugs/66.cfa

@@ -5 +5 @@
 
 int main() {
-        int * next = (void*)0;
+        int * next = 0p;
         if( next ) {
                 return 1;

tests/castError.cfa

@@ -14 +14 @@
 // 
 
+forall(otype T) struct S { T p; };
 int f;
+S(int) sint;
 
 void f() {
@@ -25 +27 @@
         short int v;
         3, v;           // implicit void cast
+
+        (S(char)) sint;
 }
 

tests/concurrent/signal/block.cfa

@@ -82 +82 @@
         if( !is_empty( cond ) ) {
 
-                $thread * next = front( cond );
+                $thread * next = ( $thread * ) front( cond );
 
                 if( ! signal_block( cond ) ) {

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"};
 }
 

tests/io2.cfa

@@ -121 +121 @@
 
         [int, int, const char *, double] t3 = { 3, 4, "a", 7.2 };
-        sout | [ 3, 4, "a", 7.2 ];
+        sout | [ 3, 4, (const char*)"a", 7.2 ];             // workaround trac#207: the const cast should not be needed
         sout | t3;
         sepSetTuple( sout, " " );

tests/searchsort.cfa

@@ -38 +38 @@
         } // for
         sout | nl;
-        for ( i; 0 ~ size ) {           // C version
+        for ( i; 0 ~ size ) {           // C version, returns void*
                 int key = size - i;
-                int * v = bsearch( &key, iarr, size, sizeof( iarr[0] ), comp );
+                int * v = ( int * ) bsearch( &key, iarr, size, sizeof( iarr[0] ), comp );
                 sout | key | ':' | *v | ", ";
         } // for