Changeset 8ac3b0e

Timestamp:

Jul 19, 2019, 1:50:01 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

6130304, 85dac33, f53acdf8

Parents:

2026bb6 (diff), 8e87f37 (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:software/cfa/cfa-cc

Files:

• libcfa/src/Makefile.am (modified) (2 diffs)
• libcfa/src/expat.h (deleted)
• tests/.expect/copyfile.txt (added)
• tests/.in/copyfile.txt (added)
• tests/copyfile.cfa (added)
• tests/sum.cfa (modified) (2 diffs)

libcfa/src/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Tue Jul 24 17:25:39 2018
-## Update Count     : 240
+## Last Modified On : Mon Jul 15 22:43:27 2019
+## Update Count     : 241
 ###############################################################################
 
@@ -22 +22 @@
 
 libdir = ${CFA_LIBDIR}
-lib_LTLIBRARIES =  libcfa.la libcfathread.la
+lib_LTLIBRARIES = libcfa.la libcfathread.la
 
 VPATH += :../prelude

tests/sum.cfa

@@ -11 +11 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 12 12:05:16 2019
-// Update Count     : 335
+// Last Modified On : Tue Jul 16 09:51:37 2019
+// Update Count     : 336
 //
 
@@ -186 +186 @@
         void ?|?( ofstream & os, S v ) { (ofstream &)(os | v); ends( os ); }
 
-        S s = (S){0}, a[size], v = { low, low };
+        S s = 0, a[size], v = { low, low };
         for ( int i = 0; i < size; i += 1, v += (S){1} ) {
                 s += (S)v;