Changeset 8abfdb4 for src/examples

Timestamp:

Jun 7, 2016, 4:52:05 PM (9 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:

38bfe32a

Parents:

d0f8b19 (diff), ac78e25 (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

Location:

src/examples

Files:

• io.c (modified) (2 diffs)
• sum.c (modified) (2 diffs)

src/examples/io.c ¶

@@ -11 +11 @@
 // Created On       : Wed Mar  2 16:56:02 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Apr 30 08:34:13 2016
-// Update Count     : 27
+// Last Modified On : Thu May 26 10:06:00 2016
+// Update Count     : 28
 // 
 
@@ -92 +92 @@
                 | 25 | "`" | 27
                 | 25 | "\"" | 27
+                | 25 | " " | 27
                 | 25 | "\f" | 27
                 | 25 | "\n" | 27

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 : Mon May  2 15:07:57 2016
-// Update Count     : 198
+// Last Modified On : Thu May 26 09:25:42 2016
+// Update Count     : 201
 //
 
@@ -75 +76 @@
 
         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; }