Changeset 4f7b418 for tests

Timestamp:

Feb 4, 2020, 11:29:22 AM (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:

52142c2, 9f575ea, bdfc032

Parents:

09f357ec (diff), e56eb455 (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/except-finally-error.txt (deleted)
• exceptions/.expect/finally-error.txt (added)
• exceptions/except-0.cfa (moved) (moved from tests/except-0.cfa )
• exceptions/except-1.cfa (moved) (moved from tests/except-1.cfa )
• exceptions/except-2.cfa (moved) (moved from tests/except-2.cfa )
• exceptions/except-3.cfa (moved) (moved from tests/except-3.cfa )
• exceptions/except-mac.hfa (moved) (moved from tests/except-mac.hfa )
• exceptions/finally-error.cfa (moved) (moved from tests/except-finally-error.cfa ) (1 diff)
• expression.cfa (modified) (1 diff)
• quotedKeyword.cfa (modified) (2 diffs)

tests/exceptions/finally-error.cfa

@@ -142 +142 @@
 }
 
+// Checked in the same place, make sure it does't break.
+void break_in_function() {
+        while (true) {
+                void inner() {
+                        break;
+                }
+        }
+}
+
 void main() {
         // Should not compile.

tests/expression.cfa

@@ +1 @@
+struct S { int i; };
+void ?{}( S & s, int i ) { s.i = i; }
+int ?`mary( int );
+int ?`mary( S );
+[int] ?`mary( [int, int] );
+int & ?`jane( int & );
+int jack( int );
+
 int main() {
-    struct s { int i; } x, *p = &x;
-    int i = 3;
+    int a[3] = { 0, 0, 0 };
+    S s = { 3 }, * ps = &s;
+    [int] t = { 3 };
+    * [int] pt = &t;
+    int i = 1, j = 2;
 
     // operators
 
-    ! i;
+    !i;
     ~i;
     +i;
     -i;
-    *p;
-    ++p;
-    --p;
-    p++;
-    p--;
+    *ps;
+    ++ps;
+    --ps;
+    ps++;
+    ps--;
 
-    i+i;
-    i-i;
-    i*i;
+    i + j;
+    i - j;
+    i * j;
 
-    i/i;
-    i%i;
-    i^i;
-    i&i;
-    i|i;
-    i<i;
-    i>i;
-    i=i;
+    i / j;
+    i % j;
+    i ^ j;
+    i & j;
+    i | j;
+    i < j;
+    i > j;
+    i = j;
 
-    i==i;
-    i!=i;
-    i<<i;
-    i>>i;
-    i<=i;
-    i>=i;
-    i&&i;
-    i||i;
-    p->i;
-    i*=i;
-    i/=i;
-    i%=i;
-    i+=i;
-    i-=i;
-    i&=i;
-    i|=i;
-    i^=i;
-    i<<=i;
-    i>>=i;
+    i == j;
+    i != j;
+    i << j;
+    i >> j;
+    i <= j;
+    i >= j;
+    i && j;
+    i || j;
+    ps->i;
 
-    i?i:i;
+    i *= j;
+    i /= j;
+    i %= j;
+    i += j;
+    i -= j;
+    i &= j;
+    i |= j;
+    i ^= j;
+    i <<= j;
+    i >>= j;
+
+    i ? i : j;
+
+    // postfix function call
+
+    (3 + 4)`mary;
+    ({3 + 4;})`mary;
+    [3, 4]`mary;
+    3`mary;
+    a[0]`mary;
+    a[0]`mary`mary;
+    s{0}`mary;
+    a[3]`jane++;
+    jack(3)`mary;
+    s.i`mary;
+    t.0`mary;
+    s.[i]`mary;
+    ps->i`mary;
+    pt->0`mary;
+    ps->[i]`mary;
+    i++`mary;
+    i--`mary;
+    (S){2}`mary;
+    (S)@{2}`mary;
 } // main

tests/quotedKeyword.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec  4 21:45:53 2018
-// Update Count     : 23
+// Last Modified On : Sat Feb  1 00:02:22 2020
+// Update Count     : 24
 //
 
@@ -17 +17 @@
 
 struct {
-        int `otype`;
-        int `struct`;
+        int ``otype``;
+        int ``struct``;
 } st = { 10, 10 };
 
-typedef int `forall`;
-`forall` xxx = 10;
+typedef int ``forall``;
+``forall`` xxx = 10;
 
-int `_Alignas`, `_Alignof`, `__alignof`, `__alignof__`, `asm`, `__asm`, `__asm__`, `_At`, `_Atomic`, `__attribute`,
-        `__attribute__`, `auto`, `_Bool`, `break`, `case`, `catch`, `catchResume`, `char`, `choose`, `_Complex`, `__complex`,
-        `__complex__`, `const`, `__const`, `__const__`, `continue`, `default`, `disable`, `do`, `double`, `dtype`, `else`,
-        `enable`, `enum`, `__extension__`, `extern`, `fallthru`, `finally`, `float`, `__float128`, `for`, `forall`, `fortran`,
-        `ftype`, `_Generic`, `goto`, `if`, `_Imaginary`, `__imag`, `__imag__`, `inline`, `__inline`, `__inline__`, `int`,
-        `__int128`, `__label__`, `long`, `lvalue`, `_Noreturn`, `__builtin_offsetof`, `otype`, `register`, `restrict`,
-        `__restrict`, `__restrict__`, `return`, `short`, `signed`, `__signed`, `__signed__`, `sizeof`, `static`,
-        `_Static_assert`, `struct`, `switch`, `_Thread_local`, `throw`, `throwResume`, `trait`, `try`, `typedef`,
-        `typeof`, `__typeof`, `__typeof__`, `union`, `unsigned`, `__builtin_va_list`, `void`, `volatile`, `__volatile`,
-        `__volatile__`, `while`;
+int ``_Alignas``, ``_Alignof``, ``__alignof``, ``__alignof__``, ``asm``, ``__asm``, ``__asm__``, ``_At``, ``_Atomic``, ``__attribute``,
+        ``__attribute__``, ``auto``, ``_Bool``, ``break``, ``case``, ``catch``, ``catchResume``, ``char``, ``choose``, ``_Complex``, ``__complex``,
+        ``__complex__``, ``const``, ``__const``, ``__const__``, ``continue``, ``default``, ``disable``, ``do``, ``double``, ``dtype``, ``else``,
+        ``enable``, ``enum``, ``__extension__``, ``extern``, ``fallthru``, ``finally``, ``float``, ``__float128``, ``for``, ``forall``, ``fortran``,
+        ``ftype``, ``_Generic``, ``goto``, ``if``, ``_Imaginary``, ``__imag``, ``__imag__``, ``inline``, ``__inline``, ``__inline__``, ``int``,
+        ``__int128``, ``__label__``, ``long``, ``lvalue``, ``_Noreturn``, ``__builtin_offsetof``, ``otype``, ``register``, ``restrict``,
+        ``__restrict``, ``__restrict__``, ``return``, ``short``, ``signed``, ``__signed``, ``__signed__``, ``sizeof``, ``static``,
+        ``_Static_assert``, ``struct``, ``switch``, ``_Thread_local``, ``throw``, ``throwResume``, ``trait``, ``try``, ``typedef``,
+        ``typeof``, ``__typeof``, ``__typeof__``, ``union``, ``unsigned``, ``__builtin_va_list``, ``void``, ``volatile``, ``__volatile``,
+        ``__volatile__``, ``while``;
 
 int main() {
-        int `if` = 0;
-        `catch` = 1;
-        st.`otype` = 2;
-        st.`struct` = 3;
-        `throw` = 4;
-        sout | `catch` + st.`otype` + st.`struct` + `throw`;
+        int ``if`` = 0;
+        ``catch`` = 1;
+        st.``otype`` = 2;
+        st.``struct`` = 3;
+        ``throw`` = 4;
+        sout | ``catch`` + st.``otype`` + st.``struct`` + ``throw``;
 }