Changeset 5546eee4 for tests

Timestamp:

Dec 16, 2023, 1:01:44 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

b7898ac

Parents:

0fa0201d (diff), 69ab896 (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/nested-types-ERR1.txt (modified) (1 diff)
• .expect/nested-types-ERR2.txt (modified) (1 diff)
• .expect/typedefRedef-ERR1.txt (modified) (1 diff)
• concurrency/.expect/ctor-check.txt (modified) (1 diff)
• exceptions/.expect/try-ctrl-flow.txt (modified) (1 diff)
• raii/.expect/dtor-early-exit-ERR1.txt (modified) (1 diff)
• raii/.expect/dtor-early-exit-ERR2.txt (modified) (1 diff)

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

@@ -1 +1 @@
 nested-types.cfa:100:25: warning: Compiled
-nested-types.cfa:83: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 +1 @@
 nested-types.cfa:100:25: warning: Compiled
-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:
+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
   instance of type Z (not function type)

tests/.expect/typedefRedef-ERR1.txt

@@ -1 +1 @@
 typedefRedef.cfa:75:25: warning: Compiled
-typedefRedef.cfa:4:1 error: Cannot redefine typedef: Foo
-typedefRedef.cfa:31:1 error: Cannot redefine typedef: ARR
-typedefRedef.cfa:65:1 error: Cannot redefine typedef: ARR
+typedefRedef.cfa:4:1 error: Cannot redefine typedef Foo
+typedefRedef.cfa:31:1 error: Cannot redefine typedef ARR
+typedefRedef.cfa:65:1 error: Cannot redefine typedef ARR

tests/concurrency/.expect/ctor-check.txt

@@ -1 @@
-concurrency/ctor-check.cfa:11:1 error: constructors cannot have mutex parameters
-?{}: function
+concurrency/ctor-check.cfa:11:1 error: constructors cannot have mutex parameters ?{}: function
 ... with parameters
   this: mutex reference to instance of struct Empty with body

tests/exceptions/.expect/try-ctrl-flow.txt

@@ -1 @@
-exceptions/try-ctrl-flow.cfa:7:1 error: 'break' outside a loop, 'switch', or labelled block
-exceptions/try-ctrl-flow.cfa:15:1 error: 'break' outside a loop, 'switch', or labelled block
-exceptions/try-ctrl-flow.cfa:23:1 error: 'break' outside a loop, 'switch', or labelled block
-exceptions/try-ctrl-flow.cfa:31:1 error: 'continue' target must be an enclosing loop: 
-exceptions/try-ctrl-flow.cfa:48:1 error: 'break' target must be an enclosing control structure: mainLoop
-exceptions/try-ctrl-flow.cfa:56:1 error: 'continue' target must be an enclosing loop: mainLoop
-exceptions/try-ctrl-flow.cfa:65:1 error: 'break' outside a loop, 'switch', or labelled block
-exceptions/try-ctrl-flow.cfa:76:1 error: 'break' outside a loop, 'switch', or labelled block
-exceptions/try-ctrl-flow.cfa:87:1 error: 'fallthrough' must be enclosed in a 'switch' or 'choose'
-exceptions/try-ctrl-flow.cfa:98:1 error: 'break' target must be an enclosing control structure: mainBlock
-exceptions/try-ctrl-flow.cfa:111:1 error: 'fallthrough' must be enclosed in a 'switch' or 'choose'
-exceptions/try-ctrl-flow.cfa:124:1 error: 'fallthrough' must be enclosed in a 'switch' or 'choose'
-exceptions/try-ctrl-flow.cfa:133:1 error: 'return' may not appear in a finally clause
-exceptions/try-ctrl-flow.cfa:139:1 error: 'return' may not appear in a finally clause
-exceptions/try-ctrl-flow.cfa:148:1 error: 'break' outside a loop, 'switch', or labelled block
-exceptions/try-ctrl-flow.cfa:159:1 error: 'return' may not appear in a try statement with a catch clause
-exceptions/try-ctrl-flow.cfa:187:1 error: 'return' may not appear in a catch clause
-exceptions/try-ctrl-flow.cfa:195:1 error: 'return' may not appear in a catchResume clause
+exceptions/try-ctrl-flow.cfa:7:1 error: "break" outside a loop, "switch", or labelled block
+exceptions/try-ctrl-flow.cfa:15:1 error: "break" outside a loop, "switch", or labelled block
+exceptions/try-ctrl-flow.cfa:23:1 error: "break" outside a loop, "switch", or labelled block
+exceptions/try-ctrl-flow.cfa:31:1 error: "continue" target must be an enclosing loop: 
+exceptions/try-ctrl-flow.cfa:48:1 error: "break" target must be an enclosing control structure: mainLoop
+exceptions/try-ctrl-flow.cfa:56:1 error: "continue" target must be an enclosing loop: mainLoop
+exceptions/try-ctrl-flow.cfa:65:1 error: "break" outside a loop, "switch", or labelled block
+exceptions/try-ctrl-flow.cfa:76:1 error: "break" outside a loop, "switch", or labelled block
+exceptions/try-ctrl-flow.cfa:87:1 error: "fallthrough" must be enclosed in a "switch" or "choose"
+exceptions/try-ctrl-flow.cfa:98:1 error: "break" target must be an enclosing control structure: mainBlock
+exceptions/try-ctrl-flow.cfa:111:1 error: "fallthrough" must be enclosed in a "switch" or "choose"
+exceptions/try-ctrl-flow.cfa:124:1 error: "fallthrough" must be enclosed in a "switch" or "choose"
+exceptions/try-ctrl-flow.cfa:133:1 error: "return" may not appear in a finally clause
+exceptions/try-ctrl-flow.cfa:139:1 error: "return" may not appear in a finally clause
+exceptions/try-ctrl-flow.cfa:148:1 error: "break" outside a loop, "switch", or labelled block
+exceptions/try-ctrl-flow.cfa:159:1 error: "return" may not appear in a try statement with a catch clause
+exceptions/try-ctrl-flow.cfa:187:1 error: "return" may not appear in a catch clause
+exceptions/try-ctrl-flow.cfa:195:1 error: "return" may not appear in a catchResume clause

tests/raii/.expect/dtor-early-exit-ERR1.txt

@@ -1 @@
-raii/dtor-early-exit.cfa:150:1 error: jump to label 'L1' crosses initialization of y Branch (Goto)
-  with target: L1
-  with original target: L1
-
+raii/dtor-early-exit.cfa:150:1 error: jump to label "L1" crosses initialization of "y".

tests/raii/.expect/dtor-early-exit-ERR2.txt

@@ -1 @@
-raii/dtor-early-exit.cfa:214:1 error: jump to label 'L2' crosses initialization of y Branch (Goto)
-  with target: L2
-  with original target: L2
-
+raii/dtor-early-exit.cfa:214:1 error: jump to label "L2" crosses initialization of "y".