Changeset cb8a18c

Timestamp:

Feb 11, 2020, 3:04:23 PM (5 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:

dda3e2a

Parents:

98538288

Message:

Fixed error expect after the move

Location:

tests/errors

Files:

• .expect/completeType.txt (modified) (2 diffs)
• .expect/declaration.txt (modified) (3 diffs)
• .expect/scope.txt (modified) (1 diff)
• .expect/signature.txt (modified) (1 diff)
• signature.cfa (modified) (1 diff)

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:
@@ -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:

tests/errors/.expect/declaration.txt

@@ -1 @@
-declarationErrors.cfa:16:1 error: duplicate static in declaration of x1: static const volatile short int 
+errors/declaration.cfa:16:1 error: duplicate static in declaration of x1: static const volatile short int 
 
-declarationErrors.cfa:17:1 error: conflicting extern & static in declaration of x2: extern const volatile short int 
+errors/declaration.cfa:17:1 error: conflicting extern & static in declaration of x2: extern const volatile short int 
 
-declarationErrors.cfa:18:1 error: conflicting extern & auto, conflicting extern & static, conflicting extern & static, duplicate extern in declaration of x3: extern const volatile short int 
+errors/declaration.cfa:18:1 error: conflicting extern & auto, conflicting extern & static, conflicting extern & static, duplicate extern in declaration of x3: extern const volatile short int 
 
-declarationErrors.cfa:19:1 error: duplicate static in declaration of x4: static const volatile instance of const volatile struct __anonymous0
+errors/declaration.cfa:19:1 error: duplicate static in declaration of x4: static const volatile instance of const volatile struct __anonymous0
   with members
     i: int 
@@ -11 +11 @@
 
 
-declarationErrors.cfa:20:1 error: duplicate const, duplicate static, duplicate volatile in declaration of x5: static const volatile instance of const volatile struct __anonymous1
+errors/declaration.cfa:20:1 error: duplicate const, duplicate static, duplicate volatile in declaration of x5: static const volatile instance of const volatile struct __anonymous1
   with members
     i: int 
@@ -17 +17 @@
 
 
-declarationErrors.cfa:22:1 error: duplicate static in declaration of x6: static const volatile Int
+errors/declaration.cfa:22:1 error: duplicate static in declaration of x6: static const volatile Int
 
-declarationErrors.cfa:24:1 error: duplicate const in declaration of f01: static inline function
+errors/declaration.cfa:24:1 error: duplicate const in declaration of f01: static inline function
   with no parameters
   returning const volatile int 
 
 
-declarationErrors.cfa:25:1 error: duplicate volatile in declaration of f02: static inline function
+errors/declaration.cfa:25:1 error: duplicate volatile in declaration of f02: static inline function
   with no parameters
   returning const volatile int 
 
 
-declarationErrors.cfa:26:1 error: duplicate const in declaration of f03: static inline function
+errors/declaration.cfa:26:1 error: duplicate const in declaration of f03: static inline function
   with no parameters
   returning const volatile int 
 
 
-declarationErrors.cfa:27:1 error: duplicate volatile in declaration of f04: static inline function
+errors/declaration.cfa:27:1 error: duplicate volatile in declaration of f04: static inline function
   with no parameters
   returning const volatile int 
 
 
-declarationErrors.cfa:28:1 error: duplicate const in declaration of f05: static inline function
+errors/declaration.cfa:28:1 error: duplicate const in declaration of f05: static inline function
   with no parameters
   returning const volatile int 
 
 
-declarationErrors.cfa:29:1 error: duplicate volatile in declaration of f06: static inline function
+errors/declaration.cfa:29:1 error: duplicate volatile in declaration of f06: static inline function
   with no parameters
   returning const volatile int 
 
 
-declarationErrors.cfa:30:1 error: duplicate const in declaration of f07: static inline function
+errors/declaration.cfa:30:1 error: duplicate const in declaration of f07: static inline function
   with no parameters
   returning const volatile int 
 
 
-declarationErrors.cfa:31:1 error: duplicate const, duplicate volatile in declaration of f08: static inline function
+errors/declaration.cfa:31:1 error: duplicate const, duplicate volatile in declaration of f08: static inline function
   with no parameters
   returning const volatile int 
 
 
-declarationErrors.cfa:33:1 error: duplicate const, duplicate volatile in declaration of f09: static inline function
+errors/declaration.cfa:33:1 error: duplicate const, duplicate volatile in declaration of f09: static inline function
   with no parameters
   returning const volatile int 
 
 
-declarationErrors.cfa:34:1 error: duplicate const, duplicate _Atomic, duplicate _Atomic, duplicate const, duplicate restrict, duplicate volatile in declaration of f09: static inline function
+errors/declaration.cfa:34:1 error: duplicate const, duplicate _Atomic, duplicate _Atomic, duplicate const, duplicate restrict, duplicate volatile in declaration of f09: static inline function
   with no parameters
   returning const restrict volatile _Atomic int 

tests/errors/.expect/scope.txt

@@ -1 @@
-scopeErrors.cfa:2:1 error: duplicate object definition for thisIsAnError: signed int
-scopeErrors.cfa:20:1 error: duplicate function definition for butThisIsAnError: function
+errors/scope.cfa:2:1 error: duplicate object definition for thisIsAnError: signed int
+errors/scope.cfa:20:1 error: duplicate function definition for butThisIsAnError: function
 ... with parameters
   double

tests/errors/.expect/signature.txt

@@ -1 @@
-errors/signature.cfa:2:1 error: Constructor has invalid parameter list (cannot be void/empty)
-errors/signature.cfa:3:1 error: Destructor has invalid parameter list (cannot be void/empty)
-errors/signature.cfa:4:1 error: Assignment has invalid parameter list (cannot be void/empty)
-errors/signature.cfa:5:1 error: Cannot declare a Constructor for type Void
-errors/signature.cfa:6:1 error: Cannot declare a Destructor for type Void
-errors/signature.cfa:7:1 error: Cannot declare a Assignment for type Void
-errors/signature.cfa:10:1 error: Constructor must have a reference to a type as its first parameter
-errors/signature.cfa:11:1 error: Destructor must have a reference to a type as its first parameter
-errors/signature.cfa:12:1 error: Assignment must have a reference to a type as its first parameter
+errors/signature.cfa:2:1 error: Constructors, destructors, and assignment functions require at least one parameter.
+errors/signature.cfa:3:1 error: Constructors, destructors, and assignment functions require at least one parameter.
+errors/signature.cfa:4:1 error: Constructors, destructors, and assignment functions require at least one parameter.
+errors/signature.cfa:5:1 error: First parameter of a constructor, destructor, or assignment function must be a reference.
+errors/signature.cfa:6:1 error: First parameter of a constructor, destructor, or assignment function must be a reference.
+errors/signature.cfa:7:1 error: First parameter of a constructor, destructor, or assignment function must be a reference.
+errors/signature.cfa:10:1 error: First parameter of a constructor, destructor, or assignment function must be a reference.
+errors/signature.cfa:11:1 error: First parameter of a constructor, destructor, or assignment function must be a reference.
+errors/signature.cfa:12:1 error: First parameter of a constructor, destructor, or assignment function must be a reference.

tests/errors/signature.cfa

@@ -11 +11 @@
 void ^?{}(int);
 void  ?=?(int);
+void  ?{}(int *);
+void ^?{}(int *);
+void  ?=?(int *);