Changeset be8bd88 for src/libcfa

Timestamp:

Mar 8, 2017, 3:22:50 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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:

031a2c95, 0e7ea335

Parents:

87c3bef (diff), 6363ad1 (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

Location:

src/libcfa

Files:

• Makefile.am (modified) (4 diffs)
• Makefile.in (modified) (4 diffs)
• iostream (modified) (2 diffs)
• iostream.c (modified) (3 diffs)
• stdlib (modified) (1 diff)
• stdlib.c (modified) (1 diff)

src/libcfa/Makefile.am

@@ -18 +18 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
+libdir = ${CFA_LIBDIR}
 lib_LIBRARIES =
 
@@ -67 +68 @@
 ${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
 
-
 libcfa_a_SOURCES = ${libsrc}
 libcfa_a_CFLAGS = -nodebug -O2
@@ -75 +75 @@
 stdhdr = ${shell echo stdhdr/*}
 
-cfa_includedir = $(includedir)/cfa
+cfa_includedir = $(CFA_INCDIR)
 nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
 
@@ -81 +81 @@
 
 maintainer-clean-local:
-        -rm -rf ${includedir}/*
+        -rm -rf ${CFA_INCDIR} ${CFA_LIBDIR}

src/libcfa/Makefile.in

@@ -201 +201 @@
 CFA_INCDIR = @CFA_INCDIR@
 CFA_LIBDIR = @CFA_LIBDIR@
+CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = -quiet -no-include-stdhdr -XCFA -t -B${abs_top_srcdir}/src/driver ${EXTRA_FLAGS}
@@ -281 +282 @@
 infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
+libdir = ${CFA_LIBDIR}
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -315 +316 @@
 libcfa_d_a_CFLAGS = -debug -O0
 stdhdr = ${shell echo stdhdr/*}
-cfa_includedir = $(includedir)/cfa
+cfa_includedir = $(CFA_INCDIR)
 nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
 CLEANFILES = libcfa-prelude.c
@@ -1160 +1161 @@
 
 maintainer-clean-local:
-        -rm -rf ${includedir}/*
+        -rm -rf ${CFA_INCDIR} ${CFA_LIBDIR}
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

src/libcfa/iostream

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb 24 21:09:09 2017
-// Update Count     : 94
+// Last Modified On : Mon Mar  6 20:51:35 2017
+// Update Count     : 98
 //
 
@@ -68 +68 @@
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, const void * );
 
+// tuples
+forall( dtype ostype, otype T, ttype Params | ostream( ostype ) | writeable( T ) | { ostype * ?|?( ostype *, Params ); } ) ostype * ?|?( ostype * os, T arg, Params rest );
+
+// manipulators
 forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, ostype * (*)( ostype * ) );
-// manipulators
 forall( dtype ostype | ostream( ostype ) ) ostype * endl( ostype * );
 forall( dtype ostype | ostream( ostype ) ) ostype * sepOn( ostype * );

src/libcfa/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb 24 21:09:59 2017
-// Update Count     : 307
+// Last Modified On : Mon Mar  6 20:52:02 2017
+// Update Count     : 313
 //
 
@@ -155 +155 @@
         enum { Open = 1, Close, OpenClose };
         static const unsigned char mask[256] = {
-                // opening delimiters
+                // opening delimiters, no space after
                 ['('] : Open, ['['] : Open, ['{'] : Open,
-                ['$'] : Open, [(unsigned char)'£'] : Open, [(unsigned char)'¥'] : Open,
+                ['$'] : Open, ['='] : Open, [(unsigned char)'£'] : Open, [(unsigned char)'¥'] : Open,
                 [(unsigned char)'¡'] : Open, [(unsigned char)'¿'] : Open, [(unsigned char)'«'] : Open,
-                // closing delimiters
+                // closing delimiters, no space before
                 [','] : Close, ['.'] : Close, [':'] : Close, [';'] : Close, ['!'] : Close, ['?'] : Close,
                 [')'] : Close, [']'] : Close, ['}'] : Close,
                 ['%'] : Close, [(unsigned char)'¢'] : Close, [(unsigned char)'»'] : Close,
-                // opening-closing delimiters
+                // opening-closing delimiters, no space before or after
                 ['\''] : OpenClose, ['`'] : OpenClose, ['"'] : OpenClose,
                 [' '] : OpenClose, ['\f'] : OpenClose, ['\n'] : OpenClose, ['\r'] : OpenClose, ['\t'] : OpenClose, ['\v'] : OpenClose, // isspace
@@ -198 +198 @@
 
 
+// tuples
+forall( dtype ostype, otype T, ttype Params | ostream( ostype ) | writeable( T ) | { ostype * ?|?( ostype *, Params ); } )
+ostype * ?|?( ostype * os, T arg, Params rest ) {
+        os | arg | ", ";
+        os | rest;
+} // ?|?
+
+
+// manipulators
 forall( dtype ostype | ostream( ostype ) )
 ostype * ?|?( ostype * os, ostype * (* manip)( ostype * ) ) {

src/libcfa/stdlib

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb 24 21:07:16 2017
-// Update Count     : 101
+// Last Modified On : Sat Mar  4 22:03:54 2017
+// Update Count     : 102
 //
 

src/libcfa/stdlib.c

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb 24 21:08:11 2017
-// Update Count     : 171
+// Last Modified On : Sat Mar  4 22:02:22 2017
+// Update Count     : 172
 //