Changeset 370f6ef for src

Timestamp:

Feb 18, 2018, 9:33:18 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

23a1eb7b

Parents:

2b95887 (diff), 29f47139 (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' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

Location:

src

Files:

• ResolvExpr/AlternativeFinder.cc (modified) (2 diffs)
• ResolvExpr/Resolver.cc (modified) (2 diffs)
• tests/sum.c (modified) (2 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 23:52:08 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 28 13:47:24 2017
-// Update Count     : 32
+// Last Modified On : Sat Feb 17 11:19:39 2018
+// Update Count     : 33
 //
 
@@ -255 +255 @@
                                 stream << "Cannot choose between " << winners.size() << " alternatives for expression\n";
                                 expr->print( stream );
-                                stream << "Alternatives are:\n";
+                                stream << " Alternatives are:\n";
                                 printAlts( winners, stream, 1 );
                                 throw SemanticError( expr->location, stream.str() );

src/ResolvExpr/Resolver.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Tus Aug  8 16:06:00 2017
-// Update Count     : 212
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Feb 17 11:19:40 2018
+// Update Count     : 213
 //
 
@@ -179 +179 @@
                                 stream << "Cannot choose between " << winners.size() << " alternatives for " << kindStr << (kindStr != "" ? " " : "") << "expression\n";
                                 untyped->print( stream );
-                                stream << "Alternatives are:\n";
+                                stream << " Alternatives are:\n";
                                 printAlts( winners, stream, 1 );
                                 throw SemanticError( untyped->location, stream.str() );

src/tests/sum.c

@@ -11 +11 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jan 26 11:31:02 2018
-// Update Count     : 271
+// Last Modified On : Sat Feb 17 11:49:17 2018
+// Update Count     : 273
 //
 
@@ -84 +84 @@
         struct S { int i, j; };
         void ?{}( S & s ) { s.[i, j] = 0; }
-        void ?{}( S & s, int i, int j ) { s.[i,j] = [i, j]; }
-        void ?{}( S & s, zero_t ) { s.[i,j] = 0; }
-        void ?{}( S & s, one_t ) { s.[i,j] = 1; }
+        void ?{}( S & s, int i ) { s.[i, j] = [i, 0]; }
+        void ?{}( S & s, int i, int j ) { s.[i, j] = [i, j]; }
+        void ?{}( S & s, zero_t ) { s.[i, j] = 0; }
+        void ?{}( S & s, one_t ) { s.[i, j] = 1; }
         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; }