Index: src/libcfa/Makefile.am =================================================================== --- src/libcfa/Makefile.am (revision 40404257da8f22441f6123bdbff37bdb54e0e5f3) +++ src/libcfa/Makefile.am (revision b63e3760197cb5f480cf1cdfd5886fdd0411d103) @@ -11,6 +11,6 @@ ## Created On : Sun May 31 08:54:01 2015 ## Last Modified By : Peter A. Buhr -## Last Modified On : Wed Feb 3 11:19:35 2016 -## Update Count : 117 +## Last Modified On : Wed Mar 2 22:59:23 2016 +## Update Count : 119 ############################################################################### @@ -63,5 +63,5 @@ libcfa_a_SOURCES = libcfa-prelude.c ${libs:=.c} -cheaders = bfd bfdlink demangle dialog evdns evhttp evrpc expat fcntl form gcrypt math +cheaders = # expat cfaheaders = limits include_HEADERS = ${cheaders:=.h} ${libs} ${cfaheaders} Index: src/libcfa/Makefile.in =================================================================== --- src/libcfa/Makefile.in (revision 40404257da8f22441f6123bdbff37bdb54e0e5f3) +++ src/libcfa/Makefile.in (revision b63e3760197cb5f480cf1cdfd5886fdd0411d103) @@ -215,5 +215,5 @@ libs = stdlib iostream fstream iterator libcfa_a_SOURCES = libcfa-prelude.c ${libs:=.c} -cheaders = bfd bfdlink demangle dialog evdns evhttp evrpc expat fcntl form gcrypt math +cheaders = # expat cfaheaders = limits include_HEADERS = ${cheaders:=.h} ${libs} ${cfaheaders} Index: src/libcfa/bfd.h =================================================================== --- src/libcfa/bfd.h (revision 40404257da8f22441f6123bdbff37bdb54e0e5f3) +++ (revision ) @@ -1,33 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// bfd.h -- -// -// Author : Peter A. Buhr -// Created On : Thu Jan 8 15:50:56 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Dec 21 08:44:41 2015 -// Update Count : 9 - -// This include file uses the CFA keyword "type" as a field name of a structure. - -#if ! defined( type ) // nesting ? -#define type `type` -#define __CFA_BFD_H__ -#endif // ! type - -#include_next // has internal check for multiple expansion - -#if defined( type ) && defined( __CFA_BFD_H__ ) // reset only if set -#undef type -#undef __CFA_BFD_H__ -#endif // type && __CFA_BFD_H__ - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/libcfa/bfdlink.h =================================================================== --- src/libcfa/bfdlink.h (revision 40404257da8f22441f6123bdbff37bdb54e0e5f3) +++ (revision ) @@ -1,33 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// bfdlink.h -- -// -// Author : Peter A. Buhr -// Created On : Sat Jun 27 09:14:00 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Dec 21 08:47:03 2015 -// Update Count : 4 - -// This include file uses the CFA keyword "type" as a field name of a structure. - -#if ! defined( type ) // nesting ? -#define type `type` -#define __CFA_BFDLINK_H__ -#endif // ! type - -#include_next // has internal check for multiple expansion - -#if defined( type ) && defined( __CFA_BFDLINK_H__ ) // reset only if set -#undef type -#undef __CFA_BFDLINK_H__ -#endif // type && __CFA_BFDLINK_H__ - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/libcfa/demangle.h =================================================================== --- src/libcfa/demangle.h (revision 40404257da8f22441f6123bdbff37bdb54e0e5f3) +++ (revision ) @@ -1,33 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// demangle.h -- -// -// Author : Peter A. Buhr -// Created On : Sat Jun 27 16:45:01 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Dec 21 08:48:30 2015 -// Update Count : 9 - -// This include file uses the CFA keyword "type" as a field name of a structure. - -#if ! defined( type ) // nesting ? -#define type `type` -#define __CFA_DEMANGLE_H__ -#endif // ! type - -#include_next // has internal check for multiple expansion - -#if defined( type ) && defined( __CFA_DEMANGLE_H__ ) // reset only if set -#undef type -#undef __CFA_DEMANGLE_H__ -#endif // type && __CFA_DEMANGLE_H__ - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/libcfa/dialog.h =================================================================== --- src/libcfa/dialog.h (revision 40404257da8f22441f6123bdbff37bdb54e0e5f3) +++ (revision ) @@ -1,33 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// dialog.h -- -// -// Author : Peter A. Buhr -// Created On : Sun Jun 28 08:34:16 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Dec 21 08:38:21 2015 -// Update Count : 11 - -// This include file uses the CFA keyword "type" as a field name of a structure. - -#if ! defined( type ) // nesting ? -#define type `type` -#define __CFA_DIALOG_H__ -#endif // ! type - -#include_next // has internal check for multiple expansion - -#if defined( type ) && defined( __CFA_DIALOG_H__ ) // reset only if set -#undef type -#undef __CFA_DIALOG_H__ -#endif // type && __CFA_DIALOG_H__ - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/libcfa/evdns.h =================================================================== --- src/libcfa/evdns.h (revision 40404257da8f22441f6123bdbff37bdb54e0e5f3) +++ (revision ) @@ -1,33 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// evdns.h -- -// -// Author : Peter A. Buhr -// Created On : Sun Jun 28 10:09:23 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Dec 21 08:51:06 2015 -// Update Count : 3 - -// This include file uses the CFA keyword "type" as a field name of a structure. - -#if ! defined( type ) // nesting ? -#define type `type` -#define __CFA_EVDNS_H__ -#endif // ! type - -#include_next // has internal check for multiple expansion - -#if defined( type ) && defined( __CFA_EVDNS_H__ ) // reset only if set -#undef type -#undef __CFA_EVDNS_H__ -#endif // type && __CFA_EVDNS_H__ - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/libcfa/evhttp.h =================================================================== --- src/libcfa/evhttp.h (revision 40404257da8f22441f6123bdbff37bdb54e0e5f3) +++ (revision ) @@ -1,33 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// evhttp.h -- -// -// Author : Peter A. Buhr -// Created On : Sun Jun 28 10:59:02 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Dec 21 08:52:19 2015 -// Update Count : 2 - -// This include file uses the CFA keyword "type" as a field name of a structure. - -#if ! defined( type ) // nesting ? -#define type `type` -#define __CFA_EVHTTP_H__ -#endif // ! type - -#include_next // has internal check for multiple expansion - -#if defined( type ) && defined( __CFA_EVHTTP_H__ ) // reset only if set -#undef type -#undef __CFA_EVHTTP_H__ -#endif // type && __CFA_EVHTTP_H__ - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/libcfa/evrpc.h =================================================================== --- src/libcfa/evrpc.h (revision 40404257da8f22441f6123bdbff37bdb54e0e5f3) +++ (revision ) @@ -1,33 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// evrpc.h -- -// -// Author : Peter A. Buhr -// Created On : Sun Jun 28 11:01:31 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Dec 21 08:53:14 2015 -// Update Count : 2 - -// This include file uses the CFA keyword "type" as a field name of a structure. - -#if ! defined( type ) // nesting ? -#define type `type` -#define __CFA_EVRPC_H__ -#endif // ! type - -#include_next // has internal check for multiple expansion - -#if defined( type ) && defined( __CFA_EVRPC_H__ ) // reset only if set -#undef type -#undef __CFA_EVRPC_H__ -#endif // type && __CFA_EVRPC_H__ - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/libcfa/fcntl.h =================================================================== --- src/libcfa/fcntl.h (revision 40404257da8f22441f6123bdbff37bdb54e0e5f3) +++ (revision ) @@ -1,33 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// fcntl.h -- -// -// Author : Peter A. Buhr -// Created On : Sun Jun 28 23:03:14 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Dec 21 08:38:39 2015 -// Update Count : 14 - -// This include file uses the CFA keyword "type" as a field name of a structure. - -#if ! defined( type ) // nesting ? -#define type `type` -#define __CFA_FCNTL_H__ -#endif // ! type - -#include_next // has internal check for multiple expansion - -#if defined( type ) && defined( __CFA_FCNTL_H__ ) // reset only if set -#undef type -#undef __CFA_FCNTL_H__ -#endif // type && __CFA_FCNTL_H__ - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/libcfa/form.h =================================================================== --- src/libcfa/form.h (revision 40404257da8f22441f6123bdbff37bdb54e0e5f3) +++ (revision ) @@ -1,33 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// form.h -- -// -// Author : Peter A. Buhr -// Created On : Sun Jun 28 11:23:56 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Dec 21 08:59:46 2015 -// Update Count : 2 - -// This include file uses the CFA keyword "type" as a field name of a structure. - -#if ! defined( type ) // nesting ? -#define type `type` -#define __CFA_FORM_H__ -#endif // ! type - -#include_next // has internal check for multiple expansion - -#if defined( type ) && defined( __CFA_FORM_H__ ) // reset only if set -#undef type -#undef __CFA_FORM_H__ -#endif // type && __CFA_FORM_H__ - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/libcfa/gcrypt.h =================================================================== --- src/libcfa/gcrypt.h (revision 40404257da8f22441f6123bdbff37bdb54e0e5f3) +++ (revision ) @@ -1,33 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// gcrypt.h -- -// -// Author : Peter A. Buhr -// Created On : Sun Jun 28 11:36:26 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Dec 21 09:01:25 2015 -// Update Count : 8 - -// This include file uses the CFA keyword "type" as a field name of a structure. - -#if ! defined( type ) // nesting ? -#define type `type` -#define __CFA_GCRYPT_H__ -#endif // ! type - -#include_next // has internal check for multiple expansion - -#if defined( type ) && defined( __CFA_GCRYPT_H__ ) // reset only if set -#undef type -#undef __CFA_GCRYPT_H__ -#endif // type && __CFA_GCRYPT_H__ - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: // Index: src/libcfa/iostream.c =================================================================== --- src/libcfa/iostream.c (revision 40404257da8f22441f6123bdbff37bdb54e0e5f3) +++ src/libcfa/iostream.c (revision b63e3760197cb5f480cf1cdfd5886fdd0411d103) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Mar 2 18:06:35 2016 -// Update Count : 208 +// Last Modified On : Mon Mar 7 13:51:23 2016 +// Update Count : 227 // @@ -133,14 +133,27 @@ forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *os, const char *cp ) { + enum { Open = 1, Close, OpenClose }; + static const char mask[256] = { + // opening delimiters + ['('] : Open, ['['] : Open, ['{'] : Open, + ['$'] : Open, [L'£'] : Open, [L'¥'] : Open, [L'¢'] : Open, [L'¿'] : Open, [L'«'] : Open, + // closing delimiters + [','] : Close, ['.'] : Close, [':'] : Close, [';'] : Close, ['!'] : Close, ['?'] : Close, + [')'] : Close, [']'] : Close, ['}'] : Close, + ['%'] : Close, [L'»'] : Close, + // opening-closing delimiters + ['\''] : OpenClose, ['`'] : OpenClose, ['"'] : OpenClose, + }; // mask + int len = strlen( cp ); // null string => no separator if ( len == 0 ) { sepOff( os ); return os; } - // first character NOT spacing or special punctuation => add left separator - if ( sepPrt( os ) && isspace( cp[0] ) == 0 && cp[0] != '.' && cp[0] != ',' ) { + // first character NOT spacing or closing punctuation => add left separator + if ( sepPrt( os ) && isspace( cp[0] ) == 0 && mask[ cp[0] ] != Close && mask[ cp[0] ] != OpenClose ) { prtfmt( os, "%s", sepGet( os ) ); } // if - // last character is spacing or special punctuation => turn off separator for next item + // last character IS spacing or opening punctuation => turn off separator for next item unsigned int posn = len - 1; - if ( isspace( cp[posn] ) || cp[posn] == ':' || cp[posn] == '$' ) { + if ( isspace( cp[posn] ) || mask[ cp[posn] ] == Open || mask[ cp[posn] ] == OpenClose ) { sepOff( os ); } else { Index: src/libcfa/math.h =================================================================== --- src/libcfa/math.h (revision 40404257da8f22441f6123bdbff37bdb54e0e5f3) +++ (revision ) @@ -1,33 +1,0 @@ -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// math.h -- -// -// Author : Peter A. Buhr -// Created On : Mon Nov 10 23:41:29 2014 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Dec 21 08:37:57 2015 -// Update Count : 12 - -// This include file uses the CFA keyword "type" as a field name of a structure. - -#if ! defined( type ) // nesting ? -#define type `type` -#define __CFA_MATH_H__ -#endif // ! type - -#include_next // has internal check for multiple expansion - -#if defined( type ) && defined( __CFA_MATH_H__ ) // reset only if set -#undef type -#undef __CFA_MATH_H__ -#endif // type && __CFA_MATH_H__ - -// Local Variables: // -// tab-width: 4 // -// mode: c++ // -// compile-command: "make install" // -// End: //