Index: src/examples/Tuple.c
===================================================================
--- src/examples/Tuple.c	(revision 26f4dbed8a133e64646f5b7efa404a3c51008ee5)
+++ src/examples/Tuple.c	(revision c3a8ecd0bbe8d200fc1cf6a5b71e9800b25fd679)
@@ -1,5 +1,6 @@
 int f( int, int );
 int g( int, int, int );
-static [ int, int *, * int, int ] h( int a, int b, * int c, [] char d );
+static
+[ int, int *, * int, int ] h( int a, int b, * int c, [] char d );
 
 struct inner {
@@ -14,5 +15,5 @@
 
 const volatile [ int, int ] t1;
-static const [ int, const int ] t2;
+static const [ int, int ] t2;
 const static [ int, const int ] t3;
 
@@ -21,14 +22,14 @@
 
 [ short x, unsigned y ] f1( int w ) {
-	[ y, x ] = [ x, y ] = [ w, 23 ];
+// 	return [ y, x ] = [ x, y ] = [ w, 23 ];
 }
 
 [ [ int, char, long, int ] r ] g1() {
-	short x, p;
+	short int x, p;
 	unsigned int y;
 	[ int, int ] z;
 
-	[ x, y, z ] = [ p, f( 17 ), 3 ];
-	[ x, y, z ] = ([short, unsigned int, [int, int]])([ p, f( 17 ), 3 ]);
+	[ x, y, z ] = [ p, f( 17, 18 ), 4, 3 ];
+//	[ x, y, z ] = ([short, unsigned int, [int, int]])([ p, f( 17, 18 ), 4, 3 ]);
 	r = [ x, y, z ];
 }
@@ -36,5 +37,5 @@
 [ int rc ] main( int argc, ** char argv ) {
 	int a, b, c, d;
-	struct outer t = { .[ f1,f4 ] : [ 1,7.0 ] };
+//	struct outer t = { .[ f1, f4 ] : [ 1, 7.0 ] };
 	f( [ 3,5 ] );
 	g( [ 3,5 ], 3 );
@@ -42,10 +43,12 @@
 	g( t1, 3 );
 
-	[ , , , ];						/* empty tuple */
+//	[ , , , ];						/* empty tuple */
 	[ 3, 5 ];
 	[ a, b ] = 3;
-	[ a, b ] = [ 4.6 ];
+//	[ a, b ] = [ 4.6 ];
+	[ a, b ] = 4.6;
 	[ a, b ] = [ c, d ] = [ 3, 5 ];
-	[ a, b, [ c ] ] = [ 2,[ a, b ] ];
+//	[ a, b, [ c ] ] = [ 2, [ a, b ] ];
+	[ a, b, c ] = [ 2, [ a, b ] ];
 	[ a, b ] = 3 > 4 ? [ b, 6 ] : [ 7, 8 ];
 
@@ -56,10 +59,10 @@
 	[ a, b ] = t1 = [ c, d ];
 	[ a, b ] = t1 = t2 = [ c, d ];
-	t1 = [ 3, 4 ] = [ 3, 4 ] = t1 = [ 3, 4 ];
+//	t1 = [ 3, 4 ] = [ 3, 4 ] = t1 = [ 3, 4 ];
 
 	s.[ f1, i.[ f2, f3 ], f4 ] = [ 11, 12, 13, 3.14159 ];
-	s.[ f1, i.[ f2, f3 ], f4 ] = h( 3, 3, 0, "abc" );
-	[ a, , b, ] = h( 3, 3, 0, "abc" );			/* ignore some results */
-	sp->[ f4,f1 ] = sp->[ f1, f4 ];
+//	s.[ f1, i.[ f2, f3 ], f4 ] = h( 3, 3, (* int)0, "abc" );
+//	[ a, , b, ] = h( 3, 3, 0, "abc" );			/* ignore some results */
+	sp->[ f4, f1 ] = sp->[ f1, f4 ];
 	printf( "expecting 3, 17, 23, 4; got %d, %d, %d, %d\n", s.[ f4, i.[ f3, f2 ], f1 ] );
 	rc = 0;
Index: src/examples/includes.c
===================================================================
--- src/examples/includes.c	(revision 26f4dbed8a133e64646f5b7efa404a3c51008ee5)
+++ src/examples/includes.c	(revision c3a8ecd0bbe8d200fc1cf6a5b71e9800b25fd679)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:59:25 2016
-// Update Count     : 371
+// Last Modified On : Wed Nov 15 23:06:24 2017
+// Update Count     : 597
 //
 
@@ -22,9 +22,8 @@
 #endif // __CFA__
 
-#if 0
 #if 1
 #define _GNU_SOURCE
+#include <a.out.h>
 #include <aio.h>
-#include <a.out.h>
 #include <aliases.h>
 #include <alloca.h>
@@ -34,20 +33,19 @@
 #include <argz.h>
 #include <assert.h>
-#include <bfd.h>
-#include <bfdlink.h>
+//#include <bfd.h>
+// #include <bfdlink.h>				// keyword with
 #include <byteswap.h>
+#include <bzlib.h>
 #include <cblas.h>
 #include <cblas_f77.h>
 #include <complex.h>
+#include <com_err.h>
 #include <cpio.h>
 #include <crypt.h>
 #include <ctype.h>
 #include <curses.h>
-//#include <demangle.h>
 #include <dialog.h>
 #include <dirent.h>
 #include <dis-asm.h>
-#endif
-#if 0
 #include <dlfcn.h>
 #include <dlg_colors.h>
@@ -63,76 +61,179 @@
 #include <evdns.h>
 #include <event.h>
-#include <evhttp.h>
-#endif
-#if 0
-#include <evrpc.h>
-#include <evutil.h>
-#include <execinfo.h>
-#include <expat.h>
-#include <expat_config.h>
-#include <expat_external.h>
-#include <fcntl.h>
-#include <features.h>
-#include <fenv.h>
-#include <float.h>
-#include <fmtmsg.h>
-#include <fnmatch.h>
-#include <form.h>
-#include <fpu_control.h>
-#include <fstab.h>
-//#include <ft2build.h>
-#include <fts.h>
-#include <ftw.h>
-#include <gconv.h>
-//#include <gcrypt.h>
-//#include <gcrypt-module.h>
-#include <getopt.h>
-//#include <gettext-po.h>
-#include <glob.h>
-//#include <gmp.h>			// infinite loop
-////#include <gmpxx.h>
-//#include <gmp-x86_64.h>
-#include <gnu-versions.h>
-//#include <gpg-error.h>
-#include <grp.h>
-#include <gshadow.h>
-#include <iconv.h>
-#include <idna.h>
-#include <idn-free.h>
-#include <idn-int.h>
-#include <ieee754.h>
-#include <ifaddrs.h>
-#include <inttypes.h>
-#include <iso646.h>
-#include <jerror.h>
+
+// #include <evhttp.h>
+// #include <sys/queue.h>
+// #include <evrpc.h>					// evrpc.h depends on sys/queue.h
+// #include <evutil.h>
+// #include <execinfo.h>
+// #include <expat.h>
+// #include <expat_config.h>
+// #include <expat_external.h>
+// #include <fcntl.h>
+// #include <features.h>
+// #include <fenv.h>
+// #include <fmtmsg.h>
+// #include <fnmatch.h>
+// #include <form.h>
+// #include <fpu_control.h>
+// #include <fstab.h>
+// #include <fts.h>
+// #include <ftw.h>
+// #include <gconv.h>
+// #include <getopt.h>
+// #include <gettext-po.h>
+// #include <glob.h>
+// #include <gmp.h>
+// #include <gnu-versions.h>
+// #include <grp.h>
+// #include <gshadow.h>
+// #include <gssapi.h>
+// #include <hwloc.h>					// keyword thread (setjmp)
+// #include <iconv.h>
+// #include <idna.h>
+// #include <idn-free.h>
+// #include <idn-int.h>
+// #include <idn-int.h>
+// #include <ifaddrs.h>
+// #include <inttypes.h>
+// #include <jerror.h>
+
 //#include <jmorecfg.h>
 //#include <jpegint.h>
-//#include <jpeglib.h>
-#include <limits.h>
-#include <locale.h>
-#include <math.h>
-#include <ncurses.h>
+// #include <jpeglib.h>
+// #include <kdb.h>
+// #include <krb5.h>					// keyword enable
+// #include <langinfo.h>
+// #include <lastlog.h>
+// #include <lber.h>
+// #include <lber_types.h>
+// #include <ldap.h>
+// #include <ldap_cdefs.h>
+// #include <ldap_features.h>
+// #include <ldap_schema.h>
+// #include <ldap_utf8.h>
+// #include <ldif.h>
+// #include <libgen.h>
+// #include <libintl.h>
+// #include <libio.h>
+// #include <libtasn1.h>
+// #include <libudev.h>
+// #include <limits.h>
+// #include <link.h>
+// #include <locale.h>
+// #include <ltdl.h>
+// #include <lzma.h>
+// #include <malloc.h>
+// #include <math.h>
+// #include <mcheck.h>
+// #include <memory.h>
+// #include <menu.h>
+// #include <mntent.h>
+// #include <monetary.h>
+// #include <mqueue.h>
+// #include <ncurses.h>
+// #include <ncurses_dll.h>
+// #include <nc_tparm.h>
+// #include <netdb.h>
+// #include <nl_types.h>
+// #include <nss.h>
+// #include <numa.h>
+// #include <numacompat1.h>
+// #include <numaif.h>
+// #include <obstack.h>
+// #include <panel.h>
+// #include <paths.h>
+// #include <pciaccess.h>
+// #include <pcre.h>
+// //#include <pcreposix.h>			// conflicts with regex.h
+// #include <plugin-api.h>
+// #include <png.h>										// setjmp
+// #include <pngconf.h>									// setjmp
+// #include <poll.h>
+// #include <pr29.h>
+// #include <printf.h>
+// #include <profile.h>
+// #include <pthread.h>									// setjmp
+// #include <pty.h>
+// #include <punycode.h>
+// #include <pwd.h>
+// #define INIT ;						// needed for regex.h
+// #define GETC() 'a'
+// #define PEEKC() 'a'
+// #define UNGETC( c ) ;
+// #define RETURN( ptr ) ;
+// #define ERROR( val ) ;
+// #include <regex.h>
+// //#include <regexp.h>				// GNU C Library no longer implements
+// #include <resolv.h>
+// #include <re_comp.h>
+// #include <sched.h>
+// #include <search.h>
+// #include <semaphore.h>
+// #include <setjmp.h>
+// #include <sgtty.h>
+// #include <shadow.h>
+// #include <signal.h>
+// #include <spawn.h>
+// #include <stab.h>
+// #include <stdatomic.h>
+// #include <stdarg.h>
+// #include <stdbool.h>
+// #include <stdint.h>
+// #include <stddef.h>
+// #include <stdio.h>
+// #include <stdio_ext.h>
+// #include <stdlib.h>
+// #include <string.h>
+// #include <stringprep.h>
+// #include <strings.h>
+// #include <stropts.h>
+// #include <sudo_plugin.h>
+// #include <symcat.h>
+// #include <syscall.h>
+// #include <sysexits.h>
+// #include <syslog.h>
+// #include <tar.h>
+// #include <term.h>
+// #include <termcap.h>
+// #include <termio.h>
+// #include <termios.h>
+// //#include <term_entry.h>
+// #include <tgmath.h>
+// #include <thread_db.h>			// CFA bug
+// #include <tic.h>
+// #include <time.h>
+// #include <tld.h>
+// #include <ttyent.h>
+// #include <turbojpeg.h>
+// #include <ucontext.h>
+// #include <ulimit.h>
+// #include <unctrl.h>
+// #include <unistd.h>
+// #include <ustat.h>
+// #include <utime.h>
+// #include <utmp.h>
+// #include <utmpx.h>
+// #include <wait.h>
+// #include <wchar.h>
+// #include <wctype.h>
+// #include <wordexp.h>
+// #include <xlocale.h>
+// #include <values.h>
+// #include <zconf.h>
+// #include <zlib.h>
+// #include <_G_config.h>
+
+// #include <jpeglib.h>				// after stdlib.h/stdio.h
+// #include <jpegint.h>
+// #include <jmorecfg.h>
+#if 0
+#endif // 0
+
+#else
+
+#define _GNU_SOURCE
+
 #include <setjmp.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <tgmath.h>
-#include <time.h>
-#include <unistd.h>
-#include <wchar.h>
-#include <wctype.h>
-#endif // 0
-
-#else
-
-#define _GNU_SOURCE
-//#include <bfd.h>
-//#include <error.h>
-
-#include <demangle.h>
 
 #endif // 0
Index: src/examples/twice.c
===================================================================
--- src/examples/twice.c	(revision 26f4dbed8a133e64646f5b7efa404a3c51008ee5)
+++ src/examples/twice.c	(revision c3a8ecd0bbe8d200fc1cf6a5b71e9800b25fd679)
@@ -7,25 +7,26 @@
 // twice.c -- 
 //
-// Author           : Richard C. Bilson
+// Author           : Peter A. Buhr
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar  8 22:04:58 2016
-// Update Count     : 16
+// Last Modified On : Thu Oct 19 21:52:57 2017
+// Update Count     : 46
 //
 
 #include <fstream>
 
-forall( otype T | { T ?+?( T, T ); T ?++( T * ); [T] ?+=?( T *, T ); } )
+forall( otype T | { T ?+?( T, T ); } )
 T twice( const T t ) {
 	return t + t;
 }
 
+// char does not have addition
+char ?+?( char op1, char op2 ) { return (int)op1 + op2; } // cast forces integer addition or recursion
+
+// signed char does not have addition
+signed char ?+?( signed char op1, signed char op2 ) { return (int)op1 + op2; } // cast forces integer addition or recursion
+
 int main( void ) {
-	// char does not have addition
-	char ?+?( char op1, char op2 ) { return (int)op1 + op2; } // cast forces integer addition or recursion
-	char ++?( char *op ) { *op += 1; return *op; }
-	char ?++( char *op ) { char temp = *op; *op += 1; return temp; }
-
-	sout | twice( 'a' ) | ' ' | twice( 1 ) | twice( 3.2 ) | endl;
+	sout | twice( ' ' ) | ' ' | twice( (signed char)0 ) | twice( (int)1 ) | twice( 3.2 ) | endl;
 }