Changeset d63eeb0 for src/examples/sum.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/sum.c (modified) (5 diffs)

src/examples/sum.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan  4 07:40:24 2016
-// Update Count     : 126
+// Last Modified On : Fri Feb  5 16:47:44 2016
+// Update Count     : 139
 //
 
-#include "fstream.h"
+#include <fstream>
 
 context sumable( type T ) {
@@ -22 +22 @@
         T ++?( T * );
         T ?++( T * );
-};
+}; // sumable
 
 forall( type T | sumable( T ) )
@@ -30 +30 @@
                 total += a[i];                                                                  // select +
         return total;
-}
+} // sum
 
 // Required to satisfy sumable as char does not have addition.
-const char 0;
-char ?+?( char op1, char op2 ) { return (int)op1 + op2; } // cast forces integer addition or recursion
-char ++?( char *op ) { *op += 1; return *op; }
-char ?++( char *op ) { char temp = *op; *op += 1; return temp; }
+// const char 0;
+// char ?+?( char op1, char op2 ) { return (int)op1 + op2; } // cast forces integer addition or recursion
+// char ++?( char *op ) { *op += 1; return *op; }
+// char ?++( char *op ) { char temp = *op; *op += 1; return temp; }
 
 int main( void ) {
         const int low = 5, High = 15, size = High - low;
-
         ofstream *sout = ofstream_stdout();
+#if 0
 
         char s = 0, a[size];
@@ -61 +61 @@
                  | sum( size, (int *)a ) | ", check " | (int)s | endl;
 
-        double s = 0.0, a[size];
-        double v = low / 10.0;
-        for ( int i = 0; i < size; i += 1, v += 0.1 ) {
-                s += (double)v;
-                a[i] = (double)v;
-        }
-        sout | "sum from " | low / 10.0 | " to " | High / 10.0 | " is "
-                 | sum( size, (double *)a ) | ", check " | (double)s | endl;
-
         float s = 0.0, a[size];
         float v = low / 10.0;
@@ -78 +69 @@
         sout | "sum from " | low / 10.0 | " to " | High / 10.0 | " is "
                  | sum( size, (float *)a ) | ", check " | (float)s | endl;
-}
+#endif
+        double s = 0, a[size];
+        double v = low / 10.0;
+
+        for ( int i = 0; i < size; i += 1, v += 0.1 ) {
+                s += (double)v;
+                a[i] = (double)v;
+        }
+        sout | "sum from " | low / 10.0 | " to " | High / 10.0 | " is "
+                 | sum( size, (double *)a ) | ", check " | (double)s | endl;
+
+        // struct S { int i, j; } sarr[size];
+        // struct S 0 = { 0, 0 };
+        // struct S 1 = { 1, 1 };
+        // S ?+?( S t1, S t2 ) { S s = { t1.i + t1.j, t2.i + t2.j }; return s; }
+        // S ?+=?( S *t1, S t2 ) { *t1 = *t1 + t2; return *t1; }
+        // S ++?( S *t ) { *t += 1; return *t; }
+        // S ?++( S *t ) { S temp = *t; *t += 1; return temp; }
+        // sum( size, sarr );
+} // main
 
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa sum.c fstream.o iostream.o iterator.o" //
+// compile-command: "cfa sum.c" //
 // End: //