Changeset 9bb6c5f for tests/errors

Timestamp:

Sep 5, 2024, 3:57:05 PM (15 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

29c8675

Parents:

ad47ec4 (diff), 508cff0 (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/errors

Files:

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

tests/errors/.expect/declaration.txt

@@ -20 +20 @@
 
 errors/declaration.cfa:24:1 error: duplicate const qualifier(s) in declaration of f01: static inline function
-  with no parameters
+  with parameters 
+    void 
   returning const volatile int 
 
 
 errors/declaration.cfa:25:1 error: duplicate volatile qualifier(s) in declaration of f02: static inline function
-  with no parameters
+  with parameters 
+    void 
   returning const volatile int 
 
 
 errors/declaration.cfa:26:1 error: duplicate const qualifier(s) in declaration of f03: static inline function
-  with no parameters
+  with parameters 
+    void 
   returning const volatile int 
 
 
 errors/declaration.cfa:27:1 error: duplicate volatile qualifier(s) in declaration of f04: static inline function
-  with no parameters
+  with parameters 
+    void 
   returning const volatile int 
 
 
 errors/declaration.cfa:28:1 error: duplicate const qualifier(s) in declaration of f05: static inline function
-  with no parameters
+  with parameters 
+    void 
   returning const volatile int 
 
 
 errors/declaration.cfa:29:1 error: duplicate volatile qualifier(s) in declaration of f06: static inline function
-  with no parameters
+  with parameters 
+    void 
   returning const volatile int 
 
 
 errors/declaration.cfa:30:1 error: duplicate const qualifier(s) in declaration of f07: static inline function
-  with no parameters
+  with parameters 
+    void 
   returning const volatile int 
 
 
 errors/declaration.cfa:31:1 error: duplicate const volatile qualifier(s) in declaration of f08: static inline function
-  with no parameters
+  with parameters 
+    void 
   returning const volatile int 
 
 
 errors/declaration.cfa:33:1 error: duplicate const volatile qualifier(s) in declaration of f09: static inline function
-  with no parameters
+  with parameters 
+    void 
   returning const volatile int 
 
 
 errors/declaration.cfa:34:1 error: duplicate const qualifier(s), duplicate _Atomic qualifier(s), duplicate _Atomic qualifier(s), duplicate const restrict volatile qualifier(s) in declaration of f09: static inline function
-  with no parameters
+  with parameters 
+    void 
   returning const restrict volatile _Atomic int 
 

tests/errors/.expect/signature.txt

@@ -2 +2 @@
 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:5:1 error: Constructors, destructors, and assignment functions require at least one parameter.
+errors/signature.cfa:6:1 error: Constructors, destructors, and assignment functions require at least one parameter.
+errors/signature.cfa:7:1 error: Constructors, destructors, and assignment functions require at least one parameter.
 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.

tests/errors/declaration.cfa

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// declarationErrors.cfa -- 
-// 
+//
+// declarationErrors.cfa --
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed Aug 17 08:23:43 2016
@@ -12 +12 @@
 // Last Modified On : Tue Nov  6 17:52:47 2018
 // Update Count     : 32
-// 
+//
 
 static short int volatile static const x1;                              // duplicate static