Changeset 76934fb for src/examples/min.c

Timestamp:

Jun 1, 2015, 12:55:33 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, string, with_gc

Children:

6db50d5

Parents:

46cbfe1 (diff), db82596 (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 labels

File:

• src/examples/min.c (modified) (2 diffs)

src/examples/min.c

@@ +1 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// min.c -- 
+//
+// Author           : Richard C. Bilson
+// Created On       : Wed May 27 17:56:53 2015
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed May 27 18:23:19 2015
+// Update Count     : 2
+//
+
 extern "C" {
-    int printf( const char *, ... );
+        int printf( const char *, ... );
 //#include <stdio.h>
 }
@@ -6 +21 @@
 forall( type T | { int ?<?( T, T ); } )
 T min( const T t1, const T t2 ) {
-    return t1 < t2 ? t1 : t2;
+        return t1 < t2 ? t1 : t2;
 }
 
 int main() {
-    char c;
-//    c = min( 'z', 'a' );
-//    printf( "minimum %d\n", c );
-    int i;
-    i = min( 4, 3 );
-    printf( "minimum %d\n", min( 4, 3 ) );
-    float f;
-    f = min( 4.0, 3.1 );
-    printf( "minimum %g\n", f );
-    double d;
-    d = min( 4.0, 3.2 );
-    printf( "minimum %g\n", d );
+        char c;
+//      c = min( 'z', 'a' );
+//      printf( "minimum %d\n", c );
+        int i;
+        i = min( 4, 3 );
+        printf( "minimum %d\n", min( 4, 3 ) );
+        float f;
+        f = min( 4.0, 3.1 );
+        printf( "minimum %g\n", f );
+        double d;
+        d = min( 4.0, 3.2 );
+        printf( "minimum %g\n", d );
 }
 
 // Local Variables: //
-// compile-command: "../../bin/cfa min.c" //
+// tab-width: 4 //
+// compile-command: "cfa min.c" //
 // End: //