Changeset 7ff30d07 for src/Tests

Timestamp:

Jun 14, 2016, 1:23:18 PM (9 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:

545ef59, c738ca4, ee51534

Parents:

6cbc25a (diff), c8c03683 (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

Conflicts:

Makefile.in
aclocal.m4
configure
src/Makefile.in
src/Tests/Context.c
src/driver/Makefile.in
src/examples/Makefile.in
src/examples/ctxts.c
src/examples/esskaykay.c
src/libcfa/Makefile.in

Location:

src/Tests

Files:

• Abstype.c (modified) (2 diffs)
• Attributes.c (modified) (4 diffs)
• InferParam.c (modified) (3 diffs)
• Makefile (modified) (2 diffs)
• Members.c (modified) (1 diff)
• OccursError.c (modified) (1 diff)
• Quad.c (modified) (1 diff)
• Rank2.c (modified) (2 diffs)

src/Tests/Abstype.c

@@ -1 @@
-type T | { T x( T ); };
+otype T | { T x( T ); };
 
 T y( T t ) {
@@ -6 +6 @@
 }
 
-forall( type T ) lvalue T *?( T * );
+forall( otype T ) lvalue T *?( T * );
 int ?++( int * );
 int ?=?( int *, int );
 forall( dtype DT ) DT * ?=?( DT **, DT * );
 
-type U = int *;
+otype U = int *;
 
 U x( U u ) {

src/Tests/Attributes.c

@@ -6 +6 @@
 //    @max
 // 
-// 2. a direct application to a manifest type
+// 2. a direct application to a manifest otype
 // 
 //    @max( int )
 // 
-// 3. constraining a type variable; the application is implicitly performed at the call site as in (2)
+// 3. constraining a otype variable; the application is implicitly performed at the call site as in (2)
 // 
-//    forall( type T | { T @max( T ); } ) T x( T t );
+//    forall( otype T | { T @max( T ); } ) T x( T t );
 // 
 // 
@@ -23 +23 @@
 //    x = (*attr_var);
 // 
-// 2. an indirect application to a manifest type
+// 2. an indirect application to a manifest otype
 // 
 //    (*attr_var)( int )
 // 
-// 3. a direct application to a type variable
+// 3. a direct application to a otype variable
 // 
 //    @max( T )
@@ -47 +47 @@
 // 3. polymorphic
 // 
-//    forall( type T | constraint( T ) ) int @attr( T );
+//    forall( otype T | constraint( T ) ) int @attr( T );
 
 int @max = 3;
@@ -53 +53 @@
 int main() {
     int x;
-    type @type(type t);                                                                 // compiler intrinsic
-    type @widest(type t);
-    @type(x) *y;                                                                                // gcc: typeof(x) *y;
-    const @widest(double) *w;                                                   // gcc: const typeof(x) *w;
-    * @type(3 + 4) z;                                                                   // cfa declaration syntax
+    otype @otype(otype t);                                                                      // compiler intrinsic
+    otype @widest(otype t);
+    @otype(x) *y;                                                                               // gcc: otypeof(x) *y;
+    const @widest(double) *w;                                                   // gcc: const otypeof(x) *w;
+    * @otype(3 + 4) z;                                                                  // cfa declaration syntax
     y = @max;           
     z = @max(x) + @size(int);

src/Tests/InferParam.c

@@ -3 +3 @@
 double ?=?( double*, double );
 
-forall( type T, type U | { U f(T); } ) U g(T);
+forall( otype T, otype U | { U f(T); } ) U g(T);
 float f( int );
 double f( int );
@@ -13 +13 @@
 }
 
-context has_f_and_j( type T, type U ) {
+context has_f_and_j( otype T, otype U ) {
         U f( T );
         U j( T, U );
@@ -19 +19 @@
 
 float j( int, float );
-forall( type T, type U | has_f_and_j( T, U ) ) U k( T );
+forall( otype T, otype U | has_f_and_j( T, U ) ) U k( T );
 
 void l() {

src/Tests/Makefile

@@ -1 @@
-CFA ?= ../cfa-cpp
+CFA ?= ../driver/cfa-cpp
 CFAOPT ?= -a
 OUTPUT ?= Output
@@ -32 +32 @@
 
 ${OUTPUTDIR} :
-        mkdir $@
+        mkdir -p $@
 
 # remove the expected results directories to generate new ones from the current output

src/Tests/Members.c

@@ -3 +3 @@
 float ?=?( float*, float );
 forall( dtype DT ) DT * ?=?( DT**, DT* );
-forall(type T) lvalue T *?( T* );
+forall(otype T) lvalue T *?( T* );
 char *__builtin_memcpy();
 

src/Tests/OccursError.c

@@ -1 @@
-forall( type T ) void f( void (*)( T, T* ) );
-forall( type U ) void g( U*, U );
+forall( otype T ) void f( void (*)( T, T* ) );
+forall( otype U ) void g( U*, U );
 
 void test() {

src/Tests/Quad.c

@@ -2 +2 @@
 int ?*?( int, int );
 
-forall( type T | { T ?*?( T, T ); } )
+forall( otype T | { T ?*?( T, T ); } )
 T square( T t ) {
         return t * t;
 }
 
-forall( type U | { U square( U ); } )
+forall( otype U | { U square( U ); } )
 U quad( U u ) {
         return square( square( u ) );

src/Tests/Rank2.c

@@ -3 +3 @@
 
 void a() {
-        forall( type T ) void f( T );
-        void g( forall( type U ) void p( U ) );
+        forall( otype T ) void f( T );
+        void g( forall( otype U ) void p( U ) );
         g( f );
 }
@@ -10 +10 @@
 void g() {
         void h( int *null );
-        forall( type T ) T id( T );
+        forall( otype T ) T id( T );
         forall( dtype T ) T *0;
         int 0;