Changeset 748877f for tests

Timestamp:

Aug 4, 2024, 12:23:00 PM (15 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

7ab24fef

Parents:

a57ad8a (diff), 065de93 (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:

• errors/.expect/completeType.arm64.txt (modified) (3 diffs)
• errors/.expect/completeType.x86.txt (modified) (3 diffs)
• meta/.expect/arch.arm64.txt (modified) (3 diffs)
• meta/.expect/arch.x86.txt (modified) (3 diffs)

tests/errors/.expect/completeType.arm64.txt

@@ -9 +9 @@
 ... with resolved type:
   void Alternatives are:
-Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
+Cost ( 0, 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
       Application of
         Variable Expression: *?: forall
@@ -44 +44 @@
 
 
-Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
+Cost ( 0, 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
       Application of
         Variable Expression: *?: forall
@@ -111 +111 @@
 
       Unsatisfiable alternative:
-Cost ( 0, 1, 0, 0, 1, -5, 0 ): Application of
+Cost ( 0, 0, 1, 0, 0, 1, -5, 0 ): Application of
             Variable Expression: baz: forall
               instance of type T (not function type)

tests/errors/.expect/completeType.x86.txt

@@ -9 +9 @@
 ... with resolved type:
   void Alternatives are:
-Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
+Cost ( 0, 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
       Application of
         Variable Expression: *?: forall
@@ -44 +44 @@
 
 
-Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
+Cost ( 0, 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
       Application of
         Variable Expression: *?: forall
@@ -111 +111 @@
 
       Unsatisfiable alternative:
-Cost ( 0, 1, 0, 0, 1, -5, 0 ): Application of
+Cost ( 0, 0, 1, 0, 0, 1, -5, 0 ): Application of
             Variable Expression: baz: forall
               instance of type T (not function type)

tests/meta/.expect/arch.arm64.txt

@@ -1 +1 @@
 meta/arch.cfa:28:1 error: Cannot choose between 3 alternatives for expression
 Explicit Cast of:
-  Name: FA64
+  Name: FX64
 ... to:
   char
 ... with resolved type:
   char Alternatives are:
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FA64: double
+Cost ( 1, 0, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+      Variable Expression: FX64: double
       ... with resolved type:
         double
@@ -19 +19 @@
   Environment:
 
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FA64: function
+Cost ( 1, 0, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+      Variable Expression: FX64: function
         accepting unspecified arguments
       ... returning nothing
@@ -38 +38 @@
   Environment:
 
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FA64: signed int
+Cost ( 1, 0, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+      Variable Expression: FX64: signed int
       ... with resolved type:
         signed int

tests/meta/.expect/arch.x86.txt

@@ -6 +6 @@
 ... with resolved type:
   char Alternatives are:
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+Cost ( 1, 0, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
       Variable Expression: FX86: double
       ... with resolved type:
@@ -19 +19 @@
   Environment:
 
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+Cost ( 1, 0, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
       Variable Expression: FX86: function
         accepting unspecified arguments
@@ -38 +38 @@
   Environment:
 
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+ Cost ( 1, 0, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
       Variable Expression: FX86: signed int
       ... with resolved type: