Changeset 97f65d5 for src/tests

Timestamp:

Feb 15, 2017, 8:13:49 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

e6512c8

Parents:

aa9ee19 (diff), 3149e7e (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:/u/cforall/software/cfa/cfa-cc

Location:

src/tests

Files:

• .expect/castError.txt (modified) (1 diff)
• .expect/completeTypeError.txt (modified) (7 diffs)
• .expect/constant0-1DP.txt (modified) (1 diff)
• .expect/constant0-1NDDP.txt (modified) (1 diff)
• .expect/declarationErrors.txt (modified) (1 diff)
• .expect/dtor-early-exit-ERR1.txt (modified) (1 diff)
• .expect/dtor-early-exit-ERR2.txt (modified) (1 diff)
• .expect/memberCtors-ERR1.txt (modified) (1 diff)
• .expect/scopeErrors.txt (modified) (1 diff)
• thread.c (modified) (3 diffs)

src/tests/.expect/castError.txt

@@ -1 @@
-Error: Can't choose between 3 alternatives for expression Cast of:
+castError.c:7 error: Can't choose between 3 alternatives for expression Cast of:
   Name: f
 

src/tests/.expect/completeTypeError.txt

@@ -1 @@
-Error: No reasonable alternatives for expression Applying untyped: 
+completeTypeError.c:34 error: No reasonable alternatives for expression Applying untyped: 
   Name: *?
 ...to: 
@@ -5 +5 @@
 
 
-Error: No reasonable alternatives for expression Applying untyped: 
+completeTypeError.c:36 error: No reasonable alternatives for expression Applying untyped: 
   Name: baz
 ...to: 
@@ -11 +11 @@
 
 
-Error: No reasonable alternatives for expression Applying untyped: 
+completeTypeError.c:37 error: No reasonable alternatives for expression Applying untyped: 
   Name: quux
 ...to: 
@@ -17 +17 @@
 
 
-Error: No reasonable alternatives for expression Applying untyped: 
+completeTypeError.c:58 error: No reasonable alternatives for expression Applying untyped: 
   Name: baz
 ...to: 
@@ -23 +23 @@
 
 
-Error: No reasonable alternatives for expression Applying untyped: 
+completeTypeError.c:59 error: No reasonable alternatives for expression Applying untyped: 
   Name: quux
 ...to: 
@@ -29 +29 @@
 
 
-Error: No reasonable alternatives for expression Applying untyped: 
+completeTypeError.c:60 error: No reasonable alternatives for expression Applying untyped: 
   Name: *?
 ...to: 
@@ -35 +35 @@
 
 
-Error: No reasonable alternatives for expression Applying untyped: 
+completeTypeError.c:72 error: No reasonable alternatives for expression Applying untyped: 
   Name: baz
 ...to: 

src/tests/.expect/constant0-1DP.txt

@@ -1 @@
-Error: duplicate object definition for 0: signed int
-Error: duplicate object definition for 0: const signed int
-Error: duplicate object definition for 1: signed int
-Error: duplicate object definition for 1: const signed int
-Error: duplicate object definition for 0: signed int
-Error: duplicate object definition for 1: signed int
-Error: duplicate object definition for 0: signed int
-Error: duplicate object definition for 1: signed int
-Error: duplicate object definition for 0: const signed int
-Error: duplicate object definition for 1: const signed int
-Error: duplicate object definition for 0: const signed int
-Error: duplicate object definition for 1: const signed int
-Error: duplicate object definition for 0: pointer to signed int
-Error: duplicate object definition for 1: pointer to signed int
-Error: duplicate object definition for 0: pointer to signed int
-Error: duplicate object definition for 1: pointer to signed int
-Error: duplicate object definition for 0: pointer to signed int
-Error: duplicate object definition for 1: pointer to signed int
-Error: duplicate object definition for 0: pointer to signed int
-Error: duplicate object definition for 1: pointer to signed int
-Error: duplicate object definition for 0: const pointer to signed int
-Error: duplicate object definition for 1: const pointer to signed int
-Error: duplicate object definition for 0: const pointer to signed int
-Error: duplicate object definition for 1: const pointer to signed int
-Error: duplicate object definition for 0: const pointer to signed int
-Error: duplicate object definition for 1: const pointer to signed int
-Error: duplicate object definition for x: const pointer to pointer to signed int
-Error: duplicate object definition for 0: pointer to pointer to signed int
-Error: duplicate object definition for x: const pointer to pointer to signed int
-Error: duplicate object definition for 0: pointer to pointer to signed int
-Error: duplicate object definition for x: const pointer to pointer to signed int
-Error: duplicate object definition for 0: pointer to pointer to signed int
+constant0-1.c:14 error: duplicate object definition for 0: signed int
+constant0-1.c:15 error: duplicate object definition for 0: const signed int
+constant0-1.c:16 error: duplicate object definition for 1: signed int
+constant0-1.c:17 error: duplicate object definition for 1: const signed int
+constant0-1.c:18 error: duplicate object definition for 0: signed int
+constant0-1.c:18 error: duplicate object definition for 1: signed int
+constant0-1.c:19 error: duplicate object definition for 0: signed int
+constant0-1.c:19 error: duplicate object definition for 1: signed int
+constant0-1.c:20 error: duplicate object definition for 0: const signed int
+constant0-1.c:20 error: duplicate object definition for 1: const signed int
+constant0-1.c:21 error: duplicate object definition for 0: const signed int
+constant0-1.c:21 error: duplicate object definition for 1: const signed int
+constant0-1.c:39 error: duplicate object definition for 0: pointer to signed int
+constant0-1.c:39 error: duplicate object definition for 1: pointer to signed int
+constant0-1.c:40 error: duplicate object definition for 0: pointer to signed int
+constant0-1.c:40 error: duplicate object definition for 1: pointer to signed int
+constant0-1.c:41 error: duplicate object definition for 0: pointer to signed int
+constant0-1.c:41 error: duplicate object definition for 1: pointer to signed int
+constant0-1.c:42 error: duplicate object definition for 0: pointer to signed int
+constant0-1.c:42 error: duplicate object definition for 1: pointer to signed int
+constant0-1.c:43 error: duplicate object definition for 0: const pointer to signed int
+constant0-1.c:43 error: duplicate object definition for 1: const pointer to signed int
+constant0-1.c:44 error: duplicate object definition for 0: const pointer to signed int
+constant0-1.c:44 error: duplicate object definition for 1: const pointer to signed int
+constant0-1.c:45 error: duplicate object definition for 0: const pointer to signed int
+constant0-1.c:45 error: duplicate object definition for 1: const pointer to signed int
+constant0-1.c:46 error: duplicate object definition for x: const pointer to pointer to signed int
+constant0-1.c:46 error: duplicate object definition for 0: pointer to pointer to signed int
+constant0-1.c:47 error: duplicate object definition for x: const pointer to pointer to signed int
+constant0-1.c:47 error: duplicate object definition for 0: pointer to pointer to signed int
+constant0-1.c:50 error: duplicate object definition for x: const pointer to pointer to signed int
+constant0-1.c:50 error: duplicate object definition for 0: pointer to pointer to signed int
 make: *** [constant0-1DP] Error 1

src/tests/.expect/constant0-1NDDP.txt

@@ -1 @@
-Error: duplicate object definition for 0: signed int
-Error: duplicate object definition for 0: const signed int
-Error: duplicate object definition for 1: signed int
-Error: duplicate object definition for 1: const signed int
-Error: duplicate object definition for 0: signed int
-Error: duplicate object definition for 1: signed int
-Error: duplicate object definition for 0: signed int
-Error: duplicate object definition for 1: signed int
-Error: duplicate object definition for 0: const signed int
-Error: duplicate object definition for 1: const signed int
-Error: duplicate object definition for 0: const signed int
-Error: duplicate object definition for 1: const signed int
-Error: duplicate object definition for x: pointer to signed int
-Error: duplicate object definition for 0: pointer to signed int
-Error: duplicate object definition for x: const pointer to signed int
-Error: duplicate object definition for 0: const pointer to signed int
+constant0-1.c:14 error: duplicate object definition for 0: signed int
+constant0-1.c:15 error: duplicate object definition for 0: const signed int
+constant0-1.c:16 error: duplicate object definition for 1: signed int
+constant0-1.c:17 error: duplicate object definition for 1: const signed int
+constant0-1.c:18 error: duplicate object definition for 0: signed int
+constant0-1.c:18 error: duplicate object definition for 1: signed int
+constant0-1.c:19 error: duplicate object definition for 0: signed int
+constant0-1.c:19 error: duplicate object definition for 1: signed int
+constant0-1.c:20 error: duplicate object definition for 0: const signed int
+constant0-1.c:20 error: duplicate object definition for 1: const signed int
+constant0-1.c:21 error: duplicate object definition for 0: const signed int
+constant0-1.c:21 error: duplicate object definition for 1: const signed int
+constant0-1.c:66 error: duplicate object definition for x: pointer to signed int
+constant0-1.c:66 error: duplicate object definition for 0: pointer to signed int
+constant0-1.c:67 error: duplicate object definition for x: const pointer to signed int
+constant0-1.c:67 error: duplicate object definition for 0: const pointer to signed int
 make: *** [constant0-1NDDP] Error 1

src/tests/.expect/declarationErrors.txt

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

src/tests/.expect/dtor-early-exit-ERR1.txt

@@ -1 @@
-Error: jump to label 'L1' crosses initialization of y Branch (Goto)
+dtor-early-exit.c:142 error: jump to label 'L1' crosses initialization of y Branch (Goto)
 
 make: *** [dtor-early-exit-ERR1] Error 1

src/tests/.expect/dtor-early-exit-ERR2.txt

@@ -1 @@
-Error: jump to label 'L2' crosses initialization of y Branch (Goto)
+dtor-early-exit.c:142 error: jump to label 'L2' crosses initialization of y Branch (Goto)
 
 make: *** [dtor-early-exit-ERR2] Error 1

src/tests/.expect/memberCtors-ERR1.txt

@@ -1 @@
-Error: in void ?{}(struct B *b), field a2 used before being constructed
+error: in void ?{}(struct B *b), field a2 used before being constructed
 make: *** [memberCtors-ERR1] Error 1

src/tests/.expect/scopeErrors.txt

@@ -1 @@
-Error: duplicate object definition for thisIsAnError: signed int
-Error: duplicate function definition for butThisIsAnError: function
+scopeErrors.c:2 error: duplicate object definition for thisIsAnError: signed int
+scopeErrors.c:20 error: duplicate function definition for butThisIsAnError: function
   with parameters
     double

src/tests/thread.c

@@ -4 +4 @@
 #include <threads>
 
-struct First { thread t; simple_lock* lock; };
-struct Second { thread t; simple_lock* lock; };
+struct First { thread t; signal_once* lock; };
+struct Second { thread t; signal_once* lock; };
 
 DECL_THREAD(First);
 DECL_THREAD(Second);
 
-void ?{}( First * this, simple_lock* lock ) { this->lock = lock; }
-void ?{}( Second * this, simple_lock* lock ) { this->lock = lock; }
+void ?{}( First * this, signal_once* lock ) { this->lock = lock; }
+void ?{}( Second * this, signal_once* lock ) { this->lock = lock; }
 
 void main(First* this) {
@@ -18 +18 @@
                 yield();
         }
-        unlock(this->lock);
+        signal(this->lock);
 }
 
 void main(Second* this) {
-        lock(this->lock);       
+        wait(this->lock);
         for(int i = 0; i < 10; i++) {
                 sout | "Second : Suspend No." | i + 1 | endl;
@@ -31 +31 @@
 
 int main(int argc, char* argv[]) {
-        simple_lock lock;
+        signal_once lock;
         sout | "User main begin" | endl;
         {
-                // processor p;
+                processor p;
                 {
                         scoped(First)  f = { &lock };