Changeset e5b96bf

Timestamp:

Jun 20, 2016, 11:30:03 AM (8 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:

439a2b4

Parents:

fbaebc6

Message:

fixed a several errors in tests

Location:

src/tests

Files:

• Context.c (modified) (1 diff)
• Forall.c (modified) (3 diffs)
• Operators.c (modified) (3 diffs)
• Scope.c (modified) (1 diff)
• Subrange.c (modified) (1 diff)
• Switch.c (modified) (1 diff)
• Typedef.c (modified) (2 diffs)

src/tests/Context.c

@@ -1 +1 @@
 //cforall context declaration
-context has_q( otype T ) {
+trait has_q( otype T ) {
         T q( T );
 };

src/tests/Forall.c

@@ -10 +10 @@
         void f( int );
         void h( void (*p)(void) );
-  
+
         int x;
         void (*y)(void);
         char z;
         float w;
-  
+
         f( x );
         f( y );
@@ -26 +26 @@
         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 );
@@ -46 +46 @@
 }
 
-context sumable( otype T ) {
+trait sumable( otype T ) {
         const T 0;
         T ?+?(T, T);

src/tests/Operators.c

@@ -1 @@
-int ?*?( int, int );
+int ?*?( int a, int b ) {
+        return 0;
+}
 
 int ?()( int number1, int number2 ) {
@@ -5 +7 @@
 }
 
-int ?+?( int, int );
+int ?+?( int a, int b ) {
+        return 0;
+}
 
-int ?=?( int *, int );
+int ?=?( int *a, int b ) {
+        return 0;
+}
 struct accumulator {
         int total;
 };
 
-char ?()( struct accumulator a, char number1, char number2 );
+char ?()( struct accumulator a, char number1, char number2 ) {
+        return 'a';
+}
 
 void f( void ) {
@@ -23 +31 @@
 }
 
+int main(int argc, char const *argv[]) {
+        /* code */
+        return 0;
+}
+
 // Local Variables: //
 // tab-width: 4 //

src/tests/Scope.c

@@ -15 +15 @@
 y p;
 
-context has_u( otype z ) {
+trait has_u( otype z ) {
         z u(z);
 };

src/tests/Subrange.c

@@ -1 +1 @@
 // A small context defining the notion of an ordered otype.  (The standard
 // library should probably contain a context for this purpose.)
-context ordered(otype T) {
+trait ordered(otype T) {
     int ?<?(T, T), ?<=?(T, T);
 };

src/tests/Switch.c

@@ -1 @@
-int fred() {
+int main(int argc, char const *argv[]) {
     int i;
     switch ( i ) case 3 : i = 1;

src/tests/Typedef.c

@@ -18 +18 @@
 a c;
 
-typedef otypeof(3) x, y;  // GCC
+typedef typeof(3) x, y;  // GCC
 
 x p;
@@ -24 +24 @@
 
 int main() {
-    typedef otypeof(3) z, p;
+    typedef typeof(3) z, p;
     z w;
     p x;