Changeset dafbde8 for tests/zombies/it_out.c

Timestamp:

Jan 20, 2021, 4:49:40 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

454f478

Parents:

92bfda0 (diff), fd54fef (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

File:

• tests/zombies/it_out.c (modified) (3 diffs)

tests/zombies/it_out.c

@@ -16 +16 @@
 typedef unsigned long streamsize_type;
 
-trait ostream( dtype os_type ) {
+trait ostream( os_type & ) {
         os_type *write( os_type *, const char *, streamsize_type );
         int fail( os_type * );
 };
 
-trait writeable( otype T ) {
-        forall( dtype os_type | ostream( os_type ) ) os_type * ?<<?( os_type *, T );
+trait writeable( T ) {
+        forall( os_type & | ostream( os_type ) ) os_type * ?<<?( os_type *, T );
 };
 
-forall( dtype os_type | ostream( os_type ) ) os_type * ?<<?( os_type *, char );
-forall( dtype os_type | ostream( os_type ) ) os_type * ?<<?( os_type *, int );
-forall( dtype os_type | ostream( os_type ) ) os_type * ?<<?( os_type *, const char * );
+forall( os_type & | ostream( os_type ) ) os_type * ?<<?( os_type *, char );
+forall( os_type & | ostream( os_type ) ) os_type * ?<<?( os_type *, int );
+forall( os_type & | ostream( os_type ) ) os_type * ?<<?( os_type *, const char * );
 
-trait istream( dtype is_type ) {
+trait istream( is_type & ) {
         is_type *read( is_type *, char *, streamsize_type );
         is_type *unread( is_type *, char );
@@ -36 +36 @@
 };
 
-trait readable( otype T ) {
-        forall( dtype is_type | istream( is_type ) ) is_type * ?<<?( is_type *, T );
+trait readable( T ) {
+        forall( is_type & | istream( is_type ) ) is_type * ?<<?( is_type *, T );
 };
 
-forall( dtype is_type | istream( is_type ) ) is_type * ?>>?( is_type *, char* );
-forall( dtype is_type | istream( is_type ) ) is_type * ?>>?( is_type *, int* );
+forall( is_type & | istream( is_type ) ) is_type * ?>>?( is_type *, char* );
+forall( is_type & | istream( is_type ) ) is_type * ?>>?( is_type *, int* );
 
-trait iterator( otype iterator_type, otype elt_type ) {
+trait iterator( iterator_type, elt_type ) {
         iterator_type ?++( iterator_type* );
         iterator_type ++?( iterator_type* );
@@ -52 +52 @@
 };
 
-forall( otype elt_type | writeable( elt_type ),
-                otype iterator_type | iterator( iterator_type, elt_type ),
-                dtype os_type | ostream( os_type ) )
+forall( elt_type | writeable( elt_type ),
+                iterator_type | iterator( iterator_type, elt_type ),
+                os_type & | ostream( os_type ) )
 void write_all( iterator_type begin, iterator_type end, os_type *os );
 
-forall( otype elt_type | writeable( elt_type ),
-                otype iterator_type | iterator( iterator_type, elt_type ),
-                dtype os_type | ostream( os_type ) )
+forall( elt_type | writeable( elt_type ),
+                iterator_type | iterator( iterator_type, elt_type ),
+                os_type & | ostream( os_type ) )
 void write_all( elt_type begin, iterator_type end, os_type *os ) {
         os << begin;