Changeset f80e0218 for src/tests/forall.c

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

• src/tests/forall.c (moved) (moved from src/Tests/Forall.c ) (6 diffs)

src/tests/forall.c

@@ -7 +7 @@
 
 void g1() {
-        forall( type T ) T f( T );
+        forall( otype T ) T f( T );
         void f( int );
         void h( void (*p)(void) );
-  
+
         int x;
         void (*y)(void);
         char z;
         float w;
-  
+
         f( x );
         f( y );
@@ -24 +24 @@
 
 void g2() {
-        forall( type T ) void f( T, T );
-        forall( type T, type U ) void f( T, U );
-  
+        forall( otype T ) void f( T, T );
+        forall( otype T, otype U ) void f( T, U );
+
         int x;
         float y;
         int *z;
         float *w;
-  
+
         f( x, y );
         f( z, w );
@@ -37 +37 @@
 }
 
-typedef forall ( type T ) int (*f)( int );
+typedef forall ( otype T ) int (*f)( int );
 
-forall( type T )
+forall( otype T )
 void swap( T left, T right ) {
         T temp = left;
@@ -46 +46 @@
 }
 
-context sumable( type T ) {
+trait sumable( otype T ) {
         const T 0;
         T ?+?(T, T);
@@ -53 +53 @@
 };
 
-type T1 | { const T1 0; T1 ?+?(T1, T1); T1 ?++(T1); [T1] ?+=?(T1,T1); },
-        T2(type P1, type P2 ),
+otype T1 | { const T1 0; T1 ?+?(T1, T1); T1 ?++(T1); [T1] ?+=?(T1,T1); },
+        T2(otype P1, otype P2 ),
         T3 | sumable(T3);
 
-type T2(type P1, type P2) | sumable(T2(P1,P2)) = struct { P1 i; P2 j; };
+otype T2(otype P1, otype P2) | sumable(T2(P1,P2)) = struct { P1 i; P2 j; };
 
 T2(int, int) w1;
 typedef T2(int, int) w2;
 w2 g2;
-type w3 = T2(int, int);
+otype w3 = T2(int, int);
 w3 g3;
 
-forall( type T | sumable( T ) )
+forall( otype T | sumable( T ) )
 T sum( int n, T a[] ) {
         T total = 0;
@@ -74 +74 @@
 }
 
-forall( type T | { const T 0; T ?+?(T, T); T ?++(T); [T] ?+=?(T,T); } )
+forall( otype T | { const T 0; T ?+?(T, T); T ?++(T); [T] ?+=?(T,T); } )
 T twice( T t ) {
         return t + t;
 }
 
-forall( type T | { const T 0; int ?!=?(T, T); int ?<?(T, T); } )
+forall( otype T | { const T 0; int ?!=?(T, T); int ?<?(T, T); } )
 T min( T t1, T t2 ) {
         return t1 < t2 ? t1 : t2;