Changeset f80e0218 for src/examples/sum.c

Timestamp:

Jun 30, 2016, 4:32:56 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:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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 gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

• src/examples/sum.c (modified) (6 diffs)

src/examples/sum.c

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// sum.c -- 
+// sum.c -- test resolvers ability to deal with many variables with the same name and to use the minimum number of casts
+//    necessary to disambiguate overloaded variable names.
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar  4 15:06:47 2016
-// Update Count     : 196
+// Last Modified On : Thu May 26 09:25:42 2016
+// Update Count     : 201
 //
 
@@ -48 +49 @@
         } // for
         sout | "sum from" | low | "to" | High | "is"
-                 | (int)sum( size, a ) | "" | ", check" | (int)s | endl;
+                 | (int)sum( size, a ) | ", check" | (int)s | endl;
 
         int s = 0, a[size], v = low;
@@ -56 +57 @@
         } // for
         sout | "sum from" | low | "to" | High | "is"
-                 | sum( size, (int *)a ) | "" | ", check" | (int)s | endl;
+                 | sum( size, (int *)a ) | ", check" | (int)s | endl;
 
         float s = 0.0, a[size], v = low / 10.0;
@@ -64 +65 @@
         } // for
         sout | "sum from" | low / 10.0 | "to" | High / 10.0 | "is"
-                 | sum( size, (float *)a ) | "" | ", check" | (float)s | endl;
+                 | sum( size, (float *)a ) | ", check" | (float)s | endl;
 
         double s = 0, a[size], v = low / 10.0;
@@ -72 +73 @@
         } // for
         sout | "sum from" | low / 10.0 | "to" | High / 10.0 | "is"
-                 | sum( size, (double *)a ) | "" | ", check" | (double)s | endl;
+                 | sum( size, (double *)a ) | ", check" | (double)s | endl;
 
         struct S { int i, j; } 0 = { 0, 0 }, 1 = { 1, 1 };
-        S ?+?( S t1, S t2 ) { S s = { t1.i + t2.i, t1.j + t2.j }; return s; }
+        S ?+?( S t1, S t2 ) { return (S){ t1.i + t2.i, t1.j + t2.j }; }
         S ?+=?( S *t1, S t2 ) { *t1 = *t1 + t2; return *t1; }
         S ++?( S *t ) { *t += 1; return *t; }
@@ -87 +88 @@
         } // for
         sout | "sum from" | low | "to" | High | "is"
-                 | sum( size, (S *)a ) | "" | ", check" | (S)s | endl;
+                 | sum( size, (S *)a ) | ", check" | (S)s | endl;
 } // main