Changeset 32ce9b7 for tests

Timestamp:

Feb 19, 2020, 3:37:18 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

1d72a11

Parents:

4aac9ff (diff), e326ebca (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/alloc-ERROR.txt (modified) (4 diffs)
• .expect/alloc.txt (modified) (1 diff)
• .expect/nested-types-ERR1.txt (modified) (1 diff)
• .expect/nested-types-ERR2.txt (modified) (1 diff)
• .expect/userLiterals.txt (added)
• alloc.cfa (modified) (2 diffs)
• exceptions/.expect/except-0.txt (added)
• exceptions/.expect/except-1.txt (added)
• exceptions/.expect/except-2.txt (added)
• exceptions/.expect/except-3.txt (added)
• exceptions/except-0.cfa (modified) (2 diffs)
• exceptions/except-2.cfa (modified) (3 diffs)
• nested-types.cfa (modified) (2 diffs)
• test.py (modified) (1 diff)
• userLiterals.cfa (moved) (moved from tests/zombies/userLiterals.cfa ) (6 diffs)
• zombies/abort.cfa (deleted)

tests/.expect/alloc-ERROR.txt

@@ -1 @@
-alloc.cfa:311:1 error: No reasonable alternatives for expression Applying untyped:
+alloc.cfa:310:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
 ...to:
@@ -19 +19 @@
 
 
-alloc.cfa:312:1 error: No reasonable alternatives for expression Applying untyped:
+alloc.cfa:311:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
 ...to:
@@ -39 +39 @@
 
 
-alloc.cfa:313:1 error: No reasonable alternatives for expression Applying untyped:
+alloc.cfa:312:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
 ...to:
@@ -50 +50 @@
 
 
-alloc.cfa:314:1 error: No reasonable alternatives for expression Applying untyped:
+alloc.cfa:313:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
 ...to:

tests/.expect/alloc.txt

@@ -2 +2 @@
 CFA malloc 0xdeadbeef
 CFA alloc 0xdeadbeef
-CFA array alloc, fill 0xde
 CFA alloc, fill dededede
 CFA alloc, fill 3

tests/.expect/nested-types-ERR1.txt

@@ -1 @@
-nested-types.cfa:70:1 error: Use of undefined type T
+nested-types.cfa:83:1 error: Use of undefined type T

tests/.expect/nested-types-ERR2.txt

@@ -1 @@
-nested-types.cfa:73:1 error: Use of undefined global type Z
-nested-types.cfa:74:1 error: Qualified type requires an aggregate on the left, but has: signed int
-nested-types.cfa:75:1 error: Undefined type in qualified type: Qualified Type:
+nested-types.cfa:86:1 error: Use of undefined global type Z
+nested-types.cfa:87:1 error: Qualified type requires an aggregate on the left, but has: signed int
+nested-types.cfa:88:1 error: Undefined type in qualified type: Qualified Type:
   instance of struct S with body 1
   instance of type Z (not function type)

tests/alloc.cfa

@@ -10 +10 @@
 // Created On       : Wed Feb  3 07:56:22 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Nov 22 15:34:19 2019
-// Update Count     : 404
+// Last Modified On : Sun Feb 16 09:21:13 2020
+// Update Count     : 405
 //
 
@@ -48 +48 @@
 
         p = alloc_set( fill );                                                          // CFA alloc, fill
-        printf( "CFA array alloc, fill %#hhx\n", fill );
         printf( "CFA alloc, fill %08x\n", *p );
         free( p );

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 ) {

tests/nested-types.cfa

@@ -10 +10 @@
 // Created On       : Mon Jul 9 10:20:03 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:59:40 2018
-// Update Count     : 2
+// Last Modified On : Wed Feb 12 18:21:15 2020
+// Update Count     : 3
 //
 
@@ -50 +50 @@
 //   double d;
 // };
+
+// struct S {
+//     enum C { R, G, B };
+//     int i;
+//     struct T {
+//      int i;
+//     };
+//     T t;
+// };
+
+// S s;
+// S.C c;
+// S.T t;
 
 int main() {

tests/test.py

@@ -152 +152 @@
         # run everything in a temp directory to make sure core file are handled properly
         with tempdir():
-                # if the make command succeds continue otherwise skip to diff
+                # if the make command succeeds continue otherwise skip to diff
                 if success(make_ret):
                         with Timed() as run_dur:

tests/userLiterals.cfa

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// user_literals.cfa --
+// userLiterals.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed Sep  6 21:40:50 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec  4 22:03:10 2018
-// Update Count     : 56
+// Last Modified On : Wed Feb 19 07:48:45 2020
+// Update Count     : 74
 //
 
@@ -24 +24 @@
 int ?`__thingy_( int x ) { sout | "_thingy_" | x; return x; }
 
-int ?`s( const char * s ) { sout | "secs" | s; return 0; }
-int ?`m( const char16_t * m ) { sout | "mins" | m; return 0;}
-int ?`h( const char32_t * h ) { sout | "hours" | h; return 0; }
+int ?`s( const char * s ) { sout | "s" | s; return 0; }
+int ?`m( const char16_t * m ) { sout | "m" | m; return 0;}
+int ?`h( const char32_t * h ) { sout | "h" | h; return 0; }
 int ?`_A_( const wchar_t * str ) { sout | "_A_" | str; return 0; }
 int ?`__thingy_( const char * str ) { sout | "_thingy_" | str; return 0; }
@@ -37 +37 @@
         return (Weight){ l.stones + r.stones };
 }
-ofstream & ?|?( ofstream & os, Weight w ) { return os | w.stones; }
+ofstream & ?|?( ofstream & os, Weight w ) { return os | wd(1,1, w.stones); }
+void ?|?( ofstream & os, Weight w ) { (ofstream)(os | w); ends( os ); }
 
 Weight ?`st( double w ) { return (Weight){ w }; }               // backquote for user literals
@@ -60 +61 @@
         sout | w;
 
-//      0`secs;
+        0`s;
         1`s;
         23`s;
@@ -82 +83 @@
 
         "abc"`s;
-//      u"abc"`m;
-//      U_"abc"`h;
-//      L"abc"`_A_;
+        // FIX ME: requires char16_t, char32_t, and wchar_t be unique types
+        // u"abc"`m;
+        // U_"abc"`h;
+        // L"abc"`_A_;
         u8_"abc"`__thingy_;
 } // main
@@ -90 +92 @@
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa user_literals.cfa" //
+// compile-command: "cfa userLiterals.cfa" //
 // End: //