Changeset 276a55b2 for tests

Timestamp:

Jan 14, 2019, 3:38:28 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

fd73248

Parents:

07ec1a2 (diff), 52ffa30 (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)
• searchsort.cfa (modified) (1 diff)

tests/.expect/castError.txt

@@ -4 +4 @@
 ... to:
   char Alternatives are:
-Cost ( 1, 0, 0, 0 ): Cast of:
+Cost ( 1, 0, 0, 0, 0, 0 ): Cast of:
      Variable Expression: f: function
        accepting unspecified arguments
@@ -16 +16 @@
  Environment:
 
-Cost ( 1, 0, 0, 0 ): Cast of:
+Cost ( 1, 0, 0, 0, 0, 0 ): Cast of:
      Variable Expression: f: double
    ... to:
@@ -25 +25 @@
  Environment:
 
-Cost ( 1, 0, 0, 0 ): Cast of:
+Cost ( 1, 0, 0, 0, 0, 0 ): Cast of:
      Variable Expression: f: signed int
    ... to:

tests/searchsort.cfa

@@ -57 +57 @@
 
         // descending sort/search by changing < to >
-        for ( i; 0u ~ size ) {
+        for ( i; 0 ~ size ) {
                 iarr[i] = i + 1;
                 sout | iarr[i] | ", ";