Changeset d63eeb0 for src/examples/minmax.c

Timestamp:

Feb 9, 2016, 3:25:05 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, with_gc

Children:

7528ba1

Parents:

771b3c3 (diff), bd85400 (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 ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/GenPoly/Box.cc
src/Makefile.in
src/Parser/ParseNode.h
src/Parser/parser.cc
src/Parser/parser.yy
src/SymTab/Validate.cc
src/SynTree/Initializer.h
src/SynTree/ObjectDecl.cc
src/SynTree/Visitor.h
src/main.cc

File:

• src/examples/minmax.c (moved) (moved from src/examples/min.c ) (2 diffs)

src/examples/minmax.c

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// min.c -- 
+// minmax.c -- 
 //
 // Author           : Richard C. Bilson
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan  4 11:40:51 2016
-// Update Count     : 26
+// Last Modified On : Wed Feb  3 11:14:49 2016
+// Update Count     : 46
 //
 
-#include "fstream.h"
-
-forall( type T | { int ?<?( T, T ); } )
-T min( const T t1, const T t2 ) {
-        return t1 < t2 ? t1 : t2;
-} // min
+#include <fstream>
+#include <stdlib>                                                                               // min, max
 
 int main( void ) {
         ofstream *sout = ofstream_stdout();
-        // char does not have less than.
+        // char does not have less or greater than.
         int ?<?( char op1, char op2 ) { return (int)op1 < (int)op2; }
+        int ?>?( char op1, char op2 ) { return (int)op1 > (int)op2; }
 
         sout | "char\t\t\t"                                     | 'z' | ' ' | 'a' | "\tmin " | min( 'z', 'a' ) | endl;
@@ -36 +33 @@
         sout | "double\t\t\t"                           | 4.0 | ' ' | 3.1 | "\tmin " | min( 4.0, 3.1 ) | endl;
         sout | "long double\t\t"                        | 4.0l | ' ' | 3.1l | "\tmin " | min( 4.0l, 3.1l ) | endl;
+
+        sout | endl;
+
+        sout | "char\t\t\t"                                     | 'z' | ' ' | 'a' | "\tmax " | max( 'z', 'a' ) | endl;
+        sout | "signed int\t\t"                         | 4 | ' ' | 3 | "\tmax " | max( 4, 3 ) | endl;
+        sout | "unsigned int\t\t"                       | 4u | ' ' | 3u | "\tmax " | max( 4u, 3u ) | endl;
+        sout | "signed long int\t\t"            | 4l | ' ' | 3l | "\tmax " | max( 4l, 3l ) | endl;
+        sout | "unsigned long int\t"            | 4ul | ' ' | 3ul | "\tmax " | max( 4ul, 3ul ) | endl;
+        sout | "signed long long int\t"         | 4ll | ' ' | 3ll | "\tmax " | max( 4ll, 3ll ) | endl;
+        sout | "unsigned long long int\t"       | 4ull | ' ' | 3ull | "\tmax " | max( 4ull, 3ull ) | endl;
+        sout | "float\t\t\t"                            | 4.0f | ' ' | 3.1f | "\tmax " | max( 4.0f, 3.1f ) | endl;
+        sout | "double\t\t\t"                           | 4.0 | ' ' | 3.1 | "\tmax " | max( 4.0, 3.1 ) | endl;
+        sout | "long double\t\t"                        | 4.0l | ' ' | 3.1l | "\tmax " | max( 4.0l, 3.1l ) | endl;
 } // main
 
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa min.c fstream.o iostream.o iterator.o" //
+// compile-command: "cfa minmax.c" //
 // End: //