Changeset 3d5701e for tests/errors/.expect/completeType.txt

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, stuck-waitfor-destruct

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• tests/errors/.expect/completeType.txt (moved) (moved from tests/.expect/completeTypeError.txt ) (5 diffs)

tests/errors/.expect/completeType.txt

@@ -1 @@
-completeTypeError.cfa:34:1 error: Cannot choose between 2 alternatives for expression
+errors/completeType.cfa:34:1 error: Cannot choose between 2 alternatives for expression
 Generated Cast of:
   Applying untyped:
@@ -10 +10 @@
       Application of
         Variable Expression: *?: forall
-          DT: object type
+          DT: data type
           function
         ... with parameters
@@ -33 +33 @@
       Application of
         Variable Expression: *?: forall
-          DT: object type
+          DT: data type
           function
         ... with parameters
@@ -54 +54 @@
 
 
-completeTypeError.cfa:35:1 error: No reasonable alternatives for expression Applying untyped:
+errors/completeType.cfa:35:1 error: No reasonable alternatives for expression Applying untyped:
   Name: foo
 ...to:
   Name: v
 
-completeTypeError.cfa:36:1 error: No reasonable alternatives for expression Applying untyped:
+errors/completeType.cfa:36:1 error: No reasonable alternatives for expression Applying untyped:
   Name: baz
 ...to:
   Name: v
 
-completeTypeError.cfa:37:1 error: No reasonable alternatives for expression Applying untyped:
+errors/completeType.cfa:37:1 error: No reasonable alternatives for expression Applying untyped:
   Name: quux
 ...to:
   Name: v
 
-completeTypeError.cfa:59:1 error: No reasonable alternatives for expression Applying untyped:
+errors/completeType.cfa:59:1 error: No reasonable alternatives for expression Applying untyped:
   Name: baz
 ...to:
   Name: y
 
-completeTypeError.cfa:60:1 error: No reasonable alternatives for expression Applying untyped:
+errors/completeType.cfa:60:1 error: No reasonable alternatives for expression Applying untyped:
   Name: quux
 ...to:
   Name: y
 
-completeTypeError.cfa:72:1 error: No alternatives with satisfiable assertions for Applying untyped:
+errors/completeType.cfa:72:1 error: No alternatives with satisfiable assertions for Applying untyped:
   Name: baz
 ...to:
@@ -87 +87 @@
 Cost ( 0, 1, 0, 0, 1, -5, 0 ): Application of
             Variable Expression: baz: forall
-              T: sized object type
+              T: sized data type
               ... with assertions
                 ?=?: pointer to function