Changeset f53acdf8 for libcfa/src

Timestamp:

Jul 19, 2019, 2:16:01 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

4eb43fa

Parents:

1f1c102 (diff), 8ac3b0e (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' into new-ast

Location:

libcfa/src

Files:

• Makefile.am (modified) (6 diffs)
• Makefile.in (modified) (13 diffs)
• bits/containers.hfa (modified) (8 diffs)
• bits/debug.cfa (modified) (2 diffs)
• bits/defs.hfa (modified) (1 diff)
• bits/locks.hfa (modified) (1 diff)
• concurrency/alarm.cfa (modified) (1 diff)
• concurrency/coroutine.cfa (modified) (2 diffs)
• concurrency/invoke.c (modified) (2 diffs)
• concurrency/invoke.h (modified) (1 diff)
• concurrency/kernel.cfa (modified) (2 diffs)
• concurrency/kernel_private.hfa (modified) (1 diff)
• concurrency/monitor.cfa (modified) (1 diff)
• concurrency/mutex.cfa (modified) (1 diff)
• concurrency/preemption.cfa (modified) (1 diff)
• concurrency/thread.cfa (modified) (1 diff)
• executor.cfa (added)
• expat.h (deleted)
• fstream.cfa (modified) (18 diffs)
• fstream.hfa (modified) (5 diffs)
• gmp.hfa (modified) (2 diffs)
• interpose.cfa (modified) (6 diffs)
• iostream.cfa (modified) (40 diffs)
• iostream.hfa (modified) (13 diffs)
• rational.cfa (modified) (3 diffs)
• stdlib.cfa (modified) (3 diffs)
• stdlib.hfa (modified) (2 diffs)
• time.cfa (modified) (10 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
+lib_LTLIBRARIES = libcfa.la libcfathread.la
 
 VPATH += :../prelude
@@ -41 +41 @@
           containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
 
-# not all platforms support concurrency, add option do disable it
-headers_nosrc += concurrency/invoke.h
-headers += concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
-
 libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
 
 # not all platforms support concurrency, add option do disable it
-libsrc += concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa
+thread_headers_nosrc = concurrency/invoke.h
+thread_headers = concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
+thread_libsrc = concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa ${thread_headers:.hfa=.cfa}
 else
 headers =
+thread_headers =
 headers_nosrc =
+thread_headers_nosrc =
 libsrc =
 endif
@@ -64 +64 @@
 $(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
 
+thread_libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(thread_libsrc))))
+$(thread_libobjs) : @CFACC@ @CFACPP@ prelude.cfa
+
 
 # .deps inclusion is not done automatically by automake for new languages
@@ -72 +75 @@
 
 -include $(libdeps)
+
+thread_libdeps = $(join \
+        $(addsuffix $(DEPDIR)/ , $(dir $(thread_libobjs) ) ), \
+        $(notdir ${thread_libobjs:.lo=.Plo}) \
+)
+
+-include $(thread_libdeps)
+
 
 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
@@ -85 +96 @@
 libcfa_la_LDFLAGS = -version-info @CFA_VERSION@
 
+libcfathread_la_SOURCES = ${thread_libsrc}
+libcfathread_la_LDFLAGS = -version-info @CFA_VERSION@
+
 stdhdr = $(shell find $(srcdir)/stdhdr -type f -printf "%p ")
 
 cfa_includedir = $(CFA_INCDIR)
-nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc}
+nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc} ${thread_headers} ${thread_headers_nosrc}
 
 #----------------------------------------------------------------------------------------------------------------

libcfa/src/Makefile.in

@@ -142 +142 @@
         time.cfa stdlib.cfa common.cfa containers/maybe.cfa \
         containers/pair.cfa containers/result.cfa \
-        containers/vector.cfa concurrency/coroutine.cfa \
-        concurrency/thread.cfa concurrency/kernel.cfa \
-        concurrency/monitor.cfa concurrency/mutex.cfa \
-        concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
-        concurrency/invoke.c concurrency/preemption.cfa
+        containers/vector.cfa
 am__dirstamp = $(am__leading_dot)dirstamp
 @BUILDLIB_TRUE@am__objects_1 = fstream.lo iostream.lo iterator.lo \
@@ -152 +148 @@
 @BUILDLIB_TRUE@ common.lo containers/maybe.lo \
 @BUILDLIB_TRUE@ containers/pair.lo containers/result.lo \
-@BUILDLIB_TRUE@ containers/vector.lo concurrency/coroutine.lo \
-@BUILDLIB_TRUE@ concurrency/thread.lo concurrency/kernel.lo \
-@BUILDLIB_TRUE@ concurrency/monitor.lo concurrency/mutex.lo
+@BUILDLIB_TRUE@ containers/vector.lo
 @BUILDLIB_TRUE@am__objects_2 = startup.lo interpose.lo bits/debug.lo \
 @BUILDLIB_TRUE@ assert.lo exception.lo virtual.lo heap.lo \
-@BUILDLIB_TRUE@ $(am__objects_1) \
-@BUILDLIB_TRUE@ concurrency/CtxSwitch-@ARCHITECTURE@.lo \
-@BUILDLIB_TRUE@ concurrency/alarm.lo concurrency/invoke.lo \
-@BUILDLIB_TRUE@ concurrency/preemption.lo
+@BUILDLIB_TRUE@ $(am__objects_1)
 am_libcfa_la_OBJECTS = prelude.lo $(am__objects_2)
 libcfa_la_OBJECTS = $(am_libcfa_la_OBJECTS)
@@ -170 +161 @@
         $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
         $(libcfa_la_LDFLAGS) $(LDFLAGS) -o $@
+libcfathread_la_LIBADD =
+am__libcfathread_la_SOURCES_DIST =  \
+        concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
+        concurrency/invoke.c concurrency/preemption.cfa \
+        concurrency/coroutine.cfa concurrency/thread.cfa \
+        concurrency/kernel.cfa concurrency/monitor.cfa \
+        concurrency/mutex.cfa
+@BUILDLIB_TRUE@am__objects_3 = concurrency/coroutine.lo \
+@BUILDLIB_TRUE@ concurrency/thread.lo concurrency/kernel.lo \
+@BUILDLIB_TRUE@ concurrency/monitor.lo concurrency/mutex.lo
+@BUILDLIB_TRUE@am__objects_4 =  \
+@BUILDLIB_TRUE@ concurrency/CtxSwitch-@ARCHITECTURE@.lo \
+@BUILDLIB_TRUE@ concurrency/alarm.lo concurrency/invoke.lo \
+@BUILDLIB_TRUE@ concurrency/preemption.lo $(am__objects_3)
+am_libcfathread_la_OBJECTS = $(am__objects_4)
+libcfathread_la_OBJECTS = $(am_libcfathread_la_OBJECTS)
+libcfathread_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+        $(AM_CFLAGS) $(CFLAGS) $(libcfathread_la_LDFLAGS) $(LDFLAGS) \
+        -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -214 +225 @@
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(libcfa_la_SOURCES)
-DIST_SOURCES = $(am__libcfa_la_SOURCES_DIST)
+SOURCES = $(libcfa_la_SOURCES) $(libcfathread_la_SOURCES)
+DIST_SOURCES = $(am__libcfa_la_SOURCES_DIST) \
+        $(am__libcfathread_la_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
@@ -225 +237 @@
         limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
         containers/maybe.hfa containers/pair.hfa containers/result.hfa \
-        containers/vector.hfa concurrency/coroutine.hfa \
+        containers/vector.hfa math.hfa gmp.hfa time_t.hfa \
+        bits/align.hfa bits/containers.hfa bits/defs.hfa \
+        bits/debug.hfa bits/locks.hfa concurrency/coroutine.hfa \
         concurrency/thread.hfa concurrency/kernel.hfa \
-        concurrency/monitor.hfa concurrency/mutex.hfa math.hfa gmp.hfa \
-        time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa \
-        bits/debug.hfa bits/locks.hfa concurrency/invoke.h
+        concurrency/monitor.hfa concurrency/mutex.hfa \
+        concurrency/invoke.h
 HEADERS = $(nobase_cfa_include_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
@@ -421 +434 @@
 am__v_UPP_0 = @echo "  UPP     " $@;
 am__v_UPP_1 = 
-lib_LTLIBRARIES = libcfa.la
+lib_LTLIBRARIES = libcfa.la libcfathread.la
 
 # AM_CFLAGS for all cfa source
@@ -433 +446 @@
 
 #----------------------------------------------------------------------------------------------------------------
+@BUILDLIB_TRUE@headers_nosrc = math.hfa gmp.hfa time_t.hfa bits/align.hfa bits/containers.hfa bits/defs.hfa bits/debug.hfa bits/locks.hfa
+@BUILDLIB_FALSE@headers = 
+@BUILDLIB_TRUE@headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
+@BUILDLIB_TRUE@   containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
+
+@BUILDLIB_FALSE@libsrc = 
+@BUILDLIB_TRUE@libsrc = startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa ${headers:.hfa=.cfa}
+@BUILDLIB_FALSE@thread_headers_nosrc = 
 
 # not all platforms support concurrency, add option do disable it
-@BUILDLIB_TRUE@headers_nosrc = math.hfa gmp.hfa time_t.hfa \
-@BUILDLIB_TRUE@ bits/align.hfa bits/containers.hfa \
-@BUILDLIB_TRUE@ bits/defs.hfa bits/debug.hfa bits/locks.hfa \
-@BUILDLIB_TRUE@ concurrency/invoke.h
-@BUILDLIB_FALSE@headers = 
-@BUILDLIB_TRUE@headers = fstream.hfa iostream.hfa iterator.hfa \
-@BUILDLIB_TRUE@ limits.hfa rational.hfa time.hfa stdlib.hfa \
-@BUILDLIB_TRUE@ common.hfa containers/maybe.hfa \
-@BUILDLIB_TRUE@ containers/pair.hfa containers/result.hfa \
-@BUILDLIB_TRUE@ containers/vector.hfa concurrency/coroutine.hfa \
-@BUILDLIB_TRUE@ concurrency/thread.hfa concurrency/kernel.hfa \
-@BUILDLIB_TRUE@ concurrency/monitor.hfa concurrency/mutex.hfa
-@BUILDLIB_FALSE@libsrc = 
-
-# not all platforms support concurrency, add option do disable it
-@BUILDLIB_TRUE@libsrc = startup.cfa interpose.cfa bits/debug.cfa \
-@BUILDLIB_TRUE@ assert.cfa exception.c virtual.c heap.cfa \
-@BUILDLIB_TRUE@ ${headers:.hfa=.cfa} \
-@BUILDLIB_TRUE@ concurrency/CtxSwitch-@ARCHITECTURE@.S \
-@BUILDLIB_TRUE@ concurrency/alarm.cfa concurrency/invoke.c \
-@BUILDLIB_TRUE@ concurrency/preemption.cfa
+@BUILDLIB_TRUE@thread_headers_nosrc = concurrency/invoke.h
+@BUILDLIB_FALSE@thread_headers = 
+@BUILDLIB_TRUE@thread_headers = concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
+@BUILDLIB_TRUE@thread_libsrc = concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa ${thread_headers:.hfa=.cfa}
 
 #----------------------------------------------------------------------------------------------------------------
@@ -463 +467 @@
 # add dependency of cfa files
 libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(libsrc))))
+thread_libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(thread_libsrc))))
 
 # .deps inclusion is not done automatically by automake for new languages
@@ -470 +475 @@
 )
 
+thread_libdeps = $(join \
+        $(addsuffix $(DEPDIR)/ , $(dir $(thread_libobjs) ) ), \
+        $(notdir ${thread_libobjs:.lo=.Plo}) \
+)
+
 
 #----------------------------------------------------------------------------------------------------------------
 libcfa_la_SOURCES = prelude.cfa ${libsrc}
 libcfa_la_LDFLAGS = -version-info @CFA_VERSION@
+libcfathread_la_SOURCES = ${thread_libsrc}
+libcfathread_la_LDFLAGS = -version-info @CFA_VERSION@
 stdhdr = $(shell find $(srcdir)/stdhdr -type f -printf "%p ")
 cfa_includedir = $(CFA_INCDIR)
-nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc}
+nobase_cfa_include_HEADERS = ${stdhdr} ${headers} ${headers_nosrc} ${thread_headers} ${thread_headers_nosrc}
 all: all-am
 
@@ -567 +579 @@
 containers/vector.lo: containers/$(am__dirstamp) \
         containers/$(DEPDIR)/$(am__dirstamp)
+
+libcfa.la: $(libcfa_la_OBJECTS) $(libcfa_la_DEPENDENCIES) $(EXTRA_libcfa_la_DEPENDENCIES) 
+        $(AM_V_CCLD)$(libcfa_la_LINK) -rpath $(libdir) $(libcfa_la_OBJECTS) $(libcfa_la_LIBADD) $(LIBS)
 concurrency/$(am__dirstamp):
         @$(MKDIR_P) concurrency
@@ -573 +588 @@
         @$(MKDIR_P) concurrency/$(DEPDIR)
         @: > concurrency/$(DEPDIR)/$(am__dirstamp)
+concurrency/CtxSwitch-@ARCHITECTURE@.lo: concurrency/$(am__dirstamp) \
+        concurrency/$(DEPDIR)/$(am__dirstamp)
+concurrency/alarm.lo: concurrency/$(am__dirstamp) \
+        concurrency/$(DEPDIR)/$(am__dirstamp)
+concurrency/invoke.lo: concurrency/$(am__dirstamp) \
+        concurrency/$(DEPDIR)/$(am__dirstamp)
+concurrency/preemption.lo: concurrency/$(am__dirstamp) \
+        concurrency/$(DEPDIR)/$(am__dirstamp)
 concurrency/coroutine.lo: concurrency/$(am__dirstamp) \
         concurrency/$(DEPDIR)/$(am__dirstamp)
@@ -583 +606 @@
 concurrency/mutex.lo: concurrency/$(am__dirstamp) \
         concurrency/$(DEPDIR)/$(am__dirstamp)
-concurrency/CtxSwitch-@ARCHITECTURE@.lo: concurrency/$(am__dirstamp) \
-        concurrency/$(DEPDIR)/$(am__dirstamp)
-concurrency/alarm.lo: concurrency/$(am__dirstamp) \
-        concurrency/$(DEPDIR)/$(am__dirstamp)
-concurrency/invoke.lo: concurrency/$(am__dirstamp) \
-        concurrency/$(DEPDIR)/$(am__dirstamp)
-concurrency/preemption.lo: concurrency/$(am__dirstamp) \
-        concurrency/$(DEPDIR)/$(am__dirstamp)
-
-libcfa.la: $(libcfa_la_OBJECTS) $(libcfa_la_DEPENDENCIES) $(EXTRA_libcfa_la_DEPENDENCIES) 
-        $(AM_V_CCLD)$(libcfa_la_LINK) -rpath $(libdir) $(libcfa_la_OBJECTS) $(libcfa_la_LIBADD) $(LIBS)
+
+libcfathread.la: $(libcfathread_la_OBJECTS) $(libcfathread_la_DEPENDENCIES) $(EXTRA_libcfathread_la_DEPENDENCIES) 
+        $(AM_V_CCLD)$(libcfathread_la_LINK) -rpath $(libdir) $(libcfathread_la_OBJECTS) $(libcfathread_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -922 +937 @@
         $(am__mv) $$depbase.Tpo $$depbase.Plo
 $(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
+$(thread_libobjs) : @CFACC@ @CFACPP@ prelude.cfa
 
 -include $(libdeps)
+
+-include $(thread_libdeps)
 
 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@

libcfa/src/bits/containers.hfa

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Tue Oct 31 16:38:50 2017
-// Last Modified By : --
-// Last Modified On : --
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jun 26 08:52:20 2019
+// Update Count     : 4
 
 #pragma once
@@ -78 +78 @@
 //-----------------------------------------------------------------------------
 #ifdef __cforall
-        forall(dtype TYPE | is_node(TYPE))
+        forall(dtype TYPE)
         #define T TYPE
 #else
@@ -95 +95 @@
 
 #ifdef __cforall
-        forall(dtype T | is_node(T))
+        forall(dtype T)
         static inline void ?{}( __stack(T) & this ) {
                 (this.top){ NULL };
@@ -116 +116 @@
                 return top;
         }
+
+        forall(dtype T | is_node(T))
+        static inline int ?!=?( const __stack(T) & this, __attribute__((unused)) zero_t zero ) {
+                return this.top != 0;
+        }
 #endif
 
@@ -122 +127 @@
 //-----------------------------------------------------------------------------
 #ifdef __cforall
-        forall(dtype TYPE | is_node(TYPE))
+        forall(dtype TYPE)
         #define T TYPE
 #else
@@ -141 +146 @@
 #ifdef __cforall
 
-        forall(dtype T | is_node(T))
+        forall(dtype T)
         static inline void ?{}( __queue(T) & this ) with( this ) {
                 head{ NULL };
@@ -186 +191 @@
 
         forall(dtype T | is_node(T))
-        static inline bool ?!=?( __queue(T) & this, __attribute__((unused)) zero_t zero ) {
+        static inline int ?!=?( const __queue(T) & this, __attribute__((unused)) zero_t zero ) {
                 return this.head != 0;
         }
@@ -268 +273 @@
 
         forall(dtype T | sized(T))
-        static inline bool ?!=?( __dllist(T) & this, __attribute__((unused)) zero_t zero ) {
+        static inline int ?!=?( const __dllist(T) & this, __attribute__((unused)) zero_t zero ) {
                 return this.head != 0;
         }

libcfa/src/bits/debug.cfa

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Thu Mar 30 12:30:01 2017
-// Last Modified By :
-// Last Modified On :
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun Jul 14 22:17:35 2019
+// Update Count     : 4
 //
 
@@ -23 +23 @@
 }
 
-enum { buffer_size = 512 };
+enum { buffer_size = 4096 };
 static char buffer[ buffer_size ];
 

libcfa/src/bits/defs.hfa

@@ -41 +41 @@
 }
 #endif
+
+#if defined(__cforall_thread__)
+#define OPTIONAL_THREAD
+#else
+#define OPTIONAL_THREAD __attribute__((weak))
+#endif

libcfa/src/bits/locks.hfa

@@ -50 +50 @@
 #ifdef __cforall
         extern "C" {
-                extern void disable_interrupts();
-                extern void enable_interrupts_noPoll();
+                extern void disable_interrupts() OPTIONAL_THREAD;
+                extern void enable_interrupts_noPoll() OPTIONAL_THREAD;
 
                 #ifdef __CFA_DEBUG__

libcfa/src/concurrency/alarm.cfa

@@ -13 +13 @@
 // Update Count     : 67
 //
+
+#define __cforall_thread__
 
 extern "C" {

libcfa/src/concurrency/coroutine.cfa

@@ -13 +13 @@
 // Update Count     : 9
 //
+
+#define __cforall_thread__
 
 #include "coroutine.hfa"
@@ -98 +100 @@
 
 void ^?{}(coroutine_desc& this) {
-        if(this.state != Halted && this.state != Start) {
+        if(this.state != Halted && this.state != Start && this.state != Primed) {
                 coroutine_desc * src = TL_GET( this_thread )->curr_cor;
                 coroutine_desc * dst = &this;

libcfa/src/concurrency/invoke.c

@@ -13 +13 @@
 // Update Count     : 5
 //
+
+#define __cforall_thread__
 
 #include <stdbool.h>
@@ -31 +33 @@
 extern void __finish_creation( struct thread_desc * );
 extern void __leave_thread_monitor( struct thread_desc * this );
-extern void disable_interrupts();
+extern void disable_interrupts() OPTIONAL_THREAD;
 extern void enable_interrupts( __cfaabi_dbg_ctx_param );
 

libcfa/src/concurrency/invoke.h

@@ -46 +46 @@
         #ifdef __cforall
         extern "Cforall" {
-                static inline struct thread_desc             *& get_next( struct thread_desc             & this );
-                static inline struct __condition_criterion_t *& get_next( struct __condition_criterion_t & this );
-
                 extern thread_local struct KernelThreadData {
                         struct thread_desc    * volatile this_thread;

libcfa/src/concurrency/kernel.cfa

@@ -13 +13 @@
 // Update Count     : 25
 //
+
+#define __cforall_thread__
 
 //C Includes
@@ -943 +945 @@
         }
 )
+
+//-----------------------------------------------------------------------------
+// Debug
+bool threading_enabled(void) {
+        return true;
+}
 // Local Variables: //
 // mode: c //

libcfa/src/concurrency/kernel_private.hfa

@@ -26 +26 @@
 
 extern "C" {
-        void disable_interrupts();
+        void disable_interrupts() OPTIONAL_THREAD;
         void enable_interrupts_noPoll();
         void enable_interrupts( __cfaabi_dbg_ctx_param );

libcfa/src/concurrency/monitor.cfa

@@ -13 +13 @@
 // Update Count     : 9
 //
+
+#define __cforall_thread__
 
 #include "monitor.hfa"

libcfa/src/concurrency/mutex.cfa

@@ -15 +15 @@
 // Update Count     : 0
 //
+
+#define __cforall_thread__
 
 #include "mutex.hfa"

libcfa/src/concurrency/preemption.cfa

@@ -13 +13 @@
 // Update Count     : 37
 //
+
+#define __cforall_thread__
 
 #include "preemption.hfa"

libcfa/src/concurrency/thread.cfa

@@ -13 +13 @@
 // Update Count     : 8
 //
+
+#define __cforall_thread__
 
 #include "thread.hfa"

libcfa/src/fstream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu May 16 08:33:28 2019
-// Update Count     : 328
+// Last Modified On : Mon Jul 15 18:11:26 2019
+// Update Count     : 349
 //
 
@@ -24 +24 @@
 #include <assert.h>
 #include <errno.h>                                                                              // errno
+
+
+//*********************************** ofstream ***********************************
+
 
 #define IO_MSG "I/O error: "
@@ -37 +41 @@
         sepSetCur( os, sepGet( os ) );
         sepSetTuple( os, ", " );
-}
+} // ?{}
 
 // private
@@ -56 +60 @@
 void ?{}( ofstream & os, const char * name, const char * mode ) {
         open( os, name, mode );
-}
+} // ?{}
+
 void ?{}( ofstream & os, const char * name ) {
         open( os, name, "w" );
-}
+} // ?{}
 
 void sepOn( ofstream & os ) { os.sepOnOff = ! getNL( os ); }
@@ -95 +100 @@
 } // sepSet
 
+void ends( ofstream & os ) {
+        if ( getANL( os ) ) nl( os );
+        else setPrt( os, false );                                                       // turn off
+        if ( &os == &exit ) exit( EXIT_FAILURE );
+        if ( &os == &abort ) abort();
+} // ends
+
 int fail( ofstream & os ) {
         return os.file == 0 || ferror( (FILE *)(os.file) );
@@ -107 +119 @@
         #ifdef __CFA_DEBUG__
         if ( file == 0 ) {
-                abort( IO_MSG "open output file \"%s\", %s", name, strerror( errno ) );
+                abort | IO_MSG "open output file \"" | name | "\"" | nl | strerror( errno );
         } // if
         #endif // __CFA_DEBUG__
@@ -121 +133 @@
 
         if ( fclose( (FILE *)(os.file) ) == EOF ) {
-                abort( IO_MSG "close output %s", strerror( errno ) );
+                abort | IO_MSG "close output" | nl | strerror( errno );
         } // if
 } // close
@@ -127 +139 @@
 ofstream & write( ofstream & os, const char * data, size_t size ) {
         if ( fail( os ) ) {
-                abort( "attempt write I/O on failed stream\n" );
+                abort | IO_MSG "attempt write I/O on failed stream";
         } // if
 
         if ( fwrite( data, 1, size, (FILE *)(os.file) ) != size ) {
-                abort( IO_MSG "write %s", strerror( errno ) );
+                abort | IO_MSG "write" | nl | strerror( errno );
         } // if
         return os;
@@ -142 +154 @@
         if ( len == EOF ) {
                 if ( ferror( (FILE *)(os.file) ) ) {
-                        abort( "invalid write\n" );
+                        abort | IO_MSG "invalid write";
                 } // if
         } // if
@@ -153 +165 @@
 
 static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_) };
-ofstream & sout = soutFile;
+ofstream & sout = soutFile, & stdout = soutFile;
 static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_) };
-ofstream & serr = serrFile;
-
-// static ofstream sexitFile = { (FILE *)(&_IO_2_1_stdout_) };
-// ofstream & sexit = sexitFile;
-// static ofstream sabortFile = { (FILE *)(&_IO_2_1_stderr_) };
-// ofstream & sabort = sabortFile;
-
-void nl( ofstream & os ) {
-        if ( getANL( os ) ) (ofstream &)(nl( os ));                     // implementation only
-        else setPrt( os, false );                                                       // turn off
-}
-
-//---------------------------------------
+ofstream & serr = serrFile, & stderr = serrFile;
+
+static ofstream exitFile = { (FILE *)(&_IO_2_1_stdout_) };
+ofstream & exit = exitFile;
+static ofstream abortFile = { (FILE *)(&_IO_2_1_stderr_) };
+ofstream & abort = abortFile;
+
+
+//*********************************** ifstream ***********************************
+
 
 // private
@@ -173 +182 @@
         is.file = file;
         is.nlOnOff = false;
-}
+} // ?{}
 
 // public
@@ -180 +189 @@
 void ?{}( ifstream & is, const char * name, const char * mode ) {
         open( is, name, mode );
-}
+} // ?{}
+
 void ?{}( ifstream & is, const char * name ) {
         open( is, name, "r" );
-}
+} // ?{}
 
 void nlOn( ifstream & os ) { os.nlOnOff = true; }
@@ -201 +211 @@
         #ifdef __CFA_DEBUG__
         if ( file == 0 ) {
-                abort( IO_MSG "open input file \"%s\", %s\n", name, strerror( errno ) );
+                abort | IO_MSG "open input file \"" | name | "\"" | nl | strerror( errno );
         } // if
         #endif // __CFA_DEBUG__
@@ -215 +225 @@
 
         if ( fclose( (FILE *)(is.file) ) == EOF ) {
-                abort( IO_MSG "close input %s", strerror( errno ) );
+                abort | IO_MSG "close input" | nl | strerror( errno );
         } // if
 } // close
@@ -221 +231 @@
 ifstream & read( ifstream & is, char * data, size_t size ) {
         if ( fail( is ) ) {
-                abort( "attempt read I/O on failed stream\n" );
+                abort | IO_MSG "attempt read I/O on failed stream";
         } // if
 
         if ( fread( data, size, 1, (FILE *)(is.file) ) == 0 ) {
-                abort( IO_MSG "read %s", strerror( errno ) );
+                abort | IO_MSG "read" | nl | strerror( errno );
         } // if
         return is;
@@ -232 +242 @@
 ifstream &ungetc( ifstream & is, char c ) {
         if ( fail( is ) ) {
-                abort( "attempt ungetc I/O on failed stream\n" );
+                abort | IO_MSG "attempt ungetc I/O on failed stream";
         } // if
 
         if ( ungetc( c, (FILE *)(is.file) ) == EOF ) {
-                abort( IO_MSG "ungetc %s", strerror( errno ) );
+                abort | IO_MSG "ungetc" | nl | strerror( errno );
         } // if
         return is;
@@ -248 +258 @@
         if ( len == EOF ) {
                 if ( ferror( (FILE *)(is.file) ) ) {
-                        abort( "invalid read\n" );
+                        abort | IO_MSG "invalid read";
                 } // if
         } // if
@@ -257 +267 @@
 
 static ifstream sinFile = { (FILE *)(&_IO_2_1_stdin_) };
-ifstream & sin = sinFile;
+ifstream & sin = sinFile, & stdin = sinFile;
 
 // Local Variables: //

libcfa/src/fstream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu May 16 08:34:10 2019
-// Update Count     : 157
+// Last Modified On : Mon Jul 15 18:10:23 2019
+// Update Count     : 167
 //
 
@@ -17 +17 @@
 
 #include "iostream.hfa"
+
+
+//*********************************** ofstream ***********************************
+
 
 enum { sepSize = 16 };
@@ -56 +60 @@
 void sepSetTuple( ofstream &, const char * );
 
+void ends( ofstream & os );
 int fail( ofstream & );
 int flush( ofstream & );
@@ -68 +73 @@
 void ?{}( ofstream & os, const char * name );
 
-extern ofstream & sout, & serr;
+extern ofstream & sout, & stdout, & serr, & stderr;             // aliases
+extern ofstream & exit, & abort;
 
-// extern ofstream & sout, & serr, & sexit, & sabort;
-// void nl( ofstream & os );
+
+//*********************************** ifstream ***********************************
 
 
@@ -96 +102 @@
 void ?{}( ifstream & is, const char * name );
 
-extern ifstream & sin;
+extern ifstream & sin, & stdin;                                                 // aliases
 
 // Local Variables: //

libcfa/src/gmp.hfa

@@ -10 +10 @@
 // Created On       : Tue Apr 19 08:43:43 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Apr 20 09:01:52 2019
-// Update Count     : 24
+// Last Modified On : Sat Jul 13 15:25:05 2019
+// Update Count     : 27
 //
 
@@ -19 +19 @@
 
 #include <gmp.h>                                                                                // GNU multi-precise integers
-#include <fstream.hfa>                                                                          // sout
+#include <fstream.hfa>                                                                  // sout
 
 struct Int { mpz_t mpz; };                                                              // wrap GMP implementation
 
-// constructor
-static inline void ?{}( Int & this ) { mpz_init( this.mpz ); }
-static inline void ?{}( Int & this, Int init ) { mpz_init_set( this.mpz, init.mpz ); }
-static inline void ?{}( Int & this, zero_t ) { mpz_init_set_si( this.mpz, 0 ); }
-static inline void ?{}( Int & this, one_t ) { mpz_init_set_si( this.mpz, 1 ); }
-static inline void ?{}( Int & this, signed long int init ) { mpz_init_set_si( this.mpz, init ); }
-static inline void ?{}( Int & this, unsigned long int init ) { mpz_init_set_ui( this.mpz, init ); }
-static inline void ?{}( Int & this, const char * val ) { if ( mpz_init_set_str( this.mpz, val, 0 ) ) abort(); }
-static inline void ^?{}( Int & this ) { mpz_clear( this.mpz ); }
-
-// literal
-static inline Int ?`mp( signed long int init ) { return (Int){ init }; }
-static inline Int ?`mp( unsigned long int init ) { return (Int){ init }; }
-static inline Int ?`mp( const char * init ) { return (Int){ init }; }
-
-// assignment
-static inline Int ?=?( Int & lhs, Int rhs ) { mpz_set( lhs.mpz, rhs.mpz ); return lhs; }
-static inline Int ?=?( Int & lhs, long int rhs ) { mpz_set_si( lhs.mpz, rhs ); return lhs; }
-static inline Int ?=?( Int & lhs, unsigned long int rhs ) { mpz_set_ui( lhs.mpz, rhs ); return lhs; }
-static inline Int ?=?( Int & lhs, const char * rhs ) { if ( mpz_set_str( lhs.mpz, rhs, 0 ) ) { printf( "invalid string conversion\n" ); abort(); } return lhs; }
-
-static inline char ?=?( char & lhs, Int rhs ) { char val = mpz_get_si( rhs.mpz ); lhs = val; return lhs; }
-static inline short int ?=?( short int & lhs, Int rhs ) { short int val = mpz_get_si( rhs.mpz ); lhs = val; return lhs; }
-static inline int ?=?( int & lhs, Int rhs ) { int val = mpz_get_si( rhs.mpz ); lhs = val; return lhs; }
-static inline long int ?=?( long int & lhs, Int rhs ) { long int val = mpz_get_si( rhs.mpz ); lhs = val; return lhs; }
-static inline unsigned char ?=?( unsigned char & lhs, Int rhs ) { unsigned char val = mpz_get_ui( rhs.mpz ); lhs = val; return lhs; }
-static inline unsigned short int ?=?( unsigned short int & lhs, Int rhs ) { unsigned short int val = mpz_get_ui( rhs.mpz ); lhs = val; return lhs; }
-static inline unsigned int ?=?( unsigned int & lhs, Int rhs ) { unsigned int val = mpz_get_ui( rhs.mpz ); lhs = val; return lhs; }
-static inline unsigned long int ?=?( unsigned long int & lhs, Int rhs ) { unsigned long int val = mpz_get_ui( rhs.mpz ); lhs = val; return lhs; }
-
-// conversions
-static inline long int narrow( Int val ) { return mpz_get_si( val.mpz ); }
-static inline unsigned long int narrow( Int val ) { return mpz_get_ui( val.mpz ); }
-
-// comparison
-static inline int ?==?( Int oper1, Int oper2 ) { return mpz_cmp( oper1.mpz, oper2.mpz ) == 0; }
-static inline int ?==?( Int oper1, long int oper2 ) { return mpz_cmp_si( oper1.mpz, oper2 ) == 0; }
-static inline int ?==?( long int oper2, Int oper1 ) { return mpz_cmp_si( oper1.mpz, oper2 ) == 0; }
-static inline int ?==?( Int oper1, unsigned long int oper2 ) { return mpz_cmp_ui( oper1.mpz, oper2 ) == 0; }
-static inline int ?==?( unsigned long int oper2, Int oper1 ) { return mpz_cmp_ui( oper1.mpz, oper2 ) == 0; }
-
-static inline int ?!=?( Int oper1, Int oper2 ) { return ! ( oper1 == oper2 ); }
-static inline int ?!=?( Int oper1, long int oper2 ) { return ! ( oper1 == oper2 ); }
-static inline int ?!=?( long int oper1, Int oper2 ) { return ! ( oper1 == oper2 ); }
-static inline int ?!=?( Int oper1, unsigned long int oper2 ) { return ! ( oper1 == oper2 ); }
-static inline int ?!=?( unsigned long int oper1, Int oper2 ) { return ! ( oper1 == oper2 ); }
-
-static inline int ?<?( Int oper1, Int oper2 ) { return mpz_cmp( oper1.mpz, oper2.mpz ) < 0; }
-static inline int ?<?( Int oper1, long int oper2 ) { return mpz_cmp_si( oper1.mpz, oper2 ) < 0; }
-static inline int ?<?( long int oper2, Int oper1 ) { return mpz_cmp_si( oper1.mpz, oper2 ) < 0; }
-static inline int ?<?( Int oper1, unsigned long int oper2 ) { return mpz_cmp_ui( oper1.mpz, oper2 ) < 0; }
-static inline int ?<?( unsigned long int oper2, Int oper1 ) { return mpz_cmp_ui( oper1.mpz, oper2 ) < 0; }
-
-static inline int ?<=?( Int oper1, Int oper2 ) { return mpz_cmp( oper1.mpz, oper2.mpz ) <= 0; }
-static inline int ?<=?( Int oper1, long int oper2 ) { return mpz_cmp_si( oper1.mpz, oper2 ) <= 0; }
-static inline int ?<=?( long int oper2, Int oper1 ) { return mpz_cmp_si( oper1.mpz, oper2 ) <= 0; }
-static inline int ?<=?( Int oper1, unsigned long int oper2 ) { return mpz_cmp_ui( oper1.mpz, oper2 ) <= 0; }
-static inline int ?<=?( unsigned long int oper2, Int oper1 ) { return mpz_cmp_ui( oper1.mpz, oper2 ) <= 0; }
-
-static inline int ?>?( Int oper1, Int oper2 ) { return ! ( oper1 <= oper2 ); }
-static inline int ?>?( Int oper1, long int oper2 ) { return ! ( oper1 <= oper2 ); }
-static inline int ?>?( long int oper1, Int oper2 ) { return ! ( oper1 <= oper2 ); }
-static inline int ?>?( Int oper1, unsigned long int oper2 ) { return ! ( oper1 <= oper2 ); }
-static inline int ?>?( unsigned long int oper1, Int oper2 ) { return ! ( oper1 <= oper2 ); }
-
-static inline int ?>=?( Int oper1, Int oper2 ) { return ! ( oper1 < oper2 ); }
-static inline int ?>=?( Int oper1, long int oper2 ) { return ! ( oper1 < oper2 ); }
-static inline int ?>=?( long int oper1, Int oper2 ) { return ! ( oper1 < oper2 ); }
-static inline int ?>=?( Int oper1, unsigned long int oper2 ) { return ! ( oper1 < oper2 ); }
-static inline int ?>=?( unsigned long int oper1, Int oper2 ) { return ! ( oper1 < oper2 ); }
-
-// arithmetic
-static inline Int +?( Int oper ) { Int pos; mpz_set( pos.mpz, oper.mpz ); return pos; }
-static inline Int -?( Int oper ) { Int neg; mpz_neg( neg.mpz, oper.mpz ); return neg; }
-static inline Int ~?( Int oper ) { Int comp; mpz_com( comp.mpz, oper.mpz ); return comp; }
-
-static inline Int ?&?( Int oper1, Int oper2 ) { Int conjunction; mpz_and( conjunction.mpz, oper1.mpz, oper2.mpz ); return conjunction; }
-static inline Int ?&?( Int oper1, long int oper2 ) { Int conjunction, temp; mpz_set_si( temp.mpz, oper2 ); mpz_and( conjunction.mpz, oper1.mpz, temp.mpz ); return conjunction; }
-static inline Int ?&?( long int oper1, Int oper2 ) { Int conjunction, temp; mpz_set_si( temp.mpz, oper1 ); mpz_and( conjunction.mpz, temp.mpz, oper2.mpz ); return conjunction; }
-static inline Int ?&?( Int oper1, unsigned long int oper2 ) { Int conjunction, temp; mpz_set_ui( temp.mpz, oper2 ); mpz_and( conjunction.mpz, oper1.mpz, temp.mpz ); return conjunction; }
-static inline Int ?&?( unsigned long int oper1, Int oper2 ) { Int conjunction, temp; mpz_set_ui( temp.mpz, oper1 ); mpz_and( conjunction.mpz, temp.mpz, oper2.mpz ); return conjunction; }
-static inline Int ?&=?( Int & lhs, Int rhs ) { return lhs = lhs & rhs; }
-
-static inline Int ?|?( Int oper1, Int oper2 ) { Int disjunction; mpz_ior( disjunction.mpz, oper1.mpz, oper2.mpz ); return disjunction; }
-static inline Int ?|?( Int oper1, long int oper2 ) { Int disjunction, temp; mpz_set_si( temp.mpz, oper2 ); mpz_ior( disjunction.mpz, oper1.mpz, temp.mpz ); return disjunction; }
-static inline Int ?|?( long int oper1, Int oper2 ) { Int disjunction, temp; mpz_set_si( temp.mpz, oper1 ); mpz_ior( disjunction.mpz, temp.mpz, oper2.mpz ); return disjunction; }
-static inline Int ?|?( Int oper1, unsigned long int oper2 ) { Int disjunction, temp; mpz_set_ui( temp.mpz, oper2 ); mpz_ior( disjunction.mpz, oper1.mpz, temp.mpz ); return disjunction; }
-static inline Int ?|?( unsigned long int oper1, Int oper2 ) { Int disjunction, temp; mpz_set_ui( temp.mpz, oper1 ); mpz_ior( disjunction.mpz, temp.mpz, oper2.mpz ); return disjunction; }
-static inline Int ?|=?( Int & lhs, Int rhs ) { return lhs = lhs | rhs; }
-
-static inline Int ?^?( Int oper1, Int oper2 ) { Int disjunction; mpz_xor( disjunction.mpz, oper1.mpz, oper2.mpz ); return disjunction; }
-static inline Int ?^?( Int oper1, long int oper2 ) { Int disjunction, temp; mpz_set_si( temp.mpz, oper2 ); mpz_ior( disjunction.mpz, oper1.mpz, temp.mpz ); return disjunction; }
-static inline Int ?^?( long int oper1, Int oper2 ) { Int disjunction, temp; mpz_set_si( temp.mpz, oper1 ); mpz_ior( disjunction.mpz, temp.mpz, oper2.mpz ); return disjunction; }
-static inline Int ?^?( Int oper1, unsigned long int oper2 ) { Int disjunction, temp; mpz_set_ui( temp.mpz, oper2 ); mpz_ior( disjunction.mpz, oper1.mpz, temp.mpz ); return disjunction; }
-static inline Int ?^?( unsigned long int oper1, Int oper2 ) { Int disjunction, temp; mpz_set_ui( temp.mpz, oper1 ); mpz_ior( disjunction.mpz, temp.mpz, oper2.mpz ); return disjunction; }
-static inline Int ?^=?( Int & lhs, Int rhs ) { return lhs = lhs ^ rhs; }
-
-static inline Int ?+?( Int addend1, Int addend2 ) { Int sum; mpz_add( sum.mpz, addend1.mpz, addend2.mpz ); return sum; }
-static inline Int ?+?( Int addend1, long int addend2 ) { Int sum; if ( addend2 >= 0 ) mpz_add_ui( sum.mpz, addend1.mpz, addend2 ); else mpz_sub_ui( sum.mpz, addend1.mpz, -addend2 ); return sum; }
-static inline Int ?+?( long int addend2, Int addend1 ) { Int sum; if ( addend2 >= 0 ) mpz_add_ui( sum.mpz, addend1.mpz, addend2 ); else mpz_sub_ui( sum.mpz, addend1.mpz, -addend2 ); return sum; }
-static inline Int ?+?( Int addend1, unsigned long int addend2 ) { Int sum; mpz_add_ui( sum.mpz, addend1.mpz, addend2 ); return sum; }
-static inline Int ?+?( unsigned long int addend2, Int addend1 ) { Int sum; mpz_add_ui( sum.mpz, addend1.mpz, addend2 ); return sum; }
-static inline Int ?+=?( Int & lhs, Int rhs ) { return lhs = lhs + rhs; }
-static inline Int ?+=?( Int & lhs, long int rhs ) { return lhs = lhs + rhs; }
-static inline Int ?+=?( Int & lhs, unsigned long int rhs ) { return lhs = lhs + rhs; }
-static inline Int ++?( Int & lhs ) { return lhs += 1; }
-static inline Int ?++( Int & lhs ) { Int ret = lhs; lhs += 1; return ret; }
-
-static inline Int ?-?( Int minuend, Int subtrahend ) { Int diff; mpz_sub( diff.mpz, minuend.mpz, subtrahend.mpz ); return diff; }
-static inline Int ?-?( Int minuend, long int subtrahend ) { Int diff; if ( subtrahend >= 0 ) mpz_sub_ui( diff.mpz, minuend.mpz, subtrahend ); else mpz_add_ui( diff.mpz, minuend.mpz, -subtrahend ); return diff; }
-static inline Int ?-?( long int minuend, Int subtrahend ) { Int diff; if ( subtrahend >= 0 ) mpz_ui_sub( diff.mpz, minuend, subtrahend.mpz ); else { mpz_add_ui( diff.mpz, subtrahend.mpz, -minuend ); mpz_neg( diff.mpz, diff.mpz ); } return diff; }
-static inline Int ?-?( Int minuend, unsigned long int subtrahend ) { Int diff; mpz_sub_ui( diff.mpz, minuend.mpz, subtrahend ); return diff; }
-static inline Int ?-?( unsigned long int minuend, Int subtrahend ) { Int diff; mpz_ui_sub( diff.mpz, minuend, subtrahend.mpz ); return diff; }
-static inline Int ?-=?( Int & lhs, Int rhs ) { return lhs = lhs - rhs; }
-static inline Int ?-=?( Int & lhs, long int rhs ) { return lhs = lhs - rhs; }
-static inline Int ?-=?( Int & lhs, unsigned long int rhs ) { return lhs = lhs - rhs; }
-static inline Int --?( Int & lhs ) { return lhs -= 1; }
-static inline Int ?--( Int & lhs ) { Int ret = lhs; lhs -= 1; return ret; }
-
-static inline Int ?*?( Int multiplicator, Int multiplicand ) { Int product; mpz_mul( product.mpz, multiplicator.mpz, multiplicand.mpz ); return product; }
-static inline Int ?*?( Int multiplicator, long int multiplicand ) { Int product; mpz_mul_si( product.mpz, multiplicator.mpz, multiplicand ); return product; }
-static inline Int ?*?( long int multiplicand, Int multiplicator ) { Int product; mpz_mul_si( product.mpz, multiplicator.mpz, multiplicand ); return product; }
-static inline Int ?*?( Int multiplicator, unsigned long int multiplicand ) { Int product; mpz_mul_ui( product.mpz, multiplicator.mpz, multiplicand ); return product; }
-static inline Int ?*?( unsigned long int multiplicand, Int multiplicator ) { Int product; mpz_mul_ui( product.mpz, multiplicator.mpz, multiplicand ); return product; }
-static inline Int ?*=?( Int & lhs, Int rhs ) { return lhs = lhs * rhs; }
-static inline Int ?*=?( Int & lhs, long int rhs ) { return lhs = lhs * rhs; }
-static inline Int ?*=?( Int & lhs, unsigned long int rhs ) { return lhs = lhs * rhs; }
-
-// some code for operators "/" and "%" taken from g++ gmpxx.h
-static inline Int ?/?( Int dividend, Int divisor ) { Int quotient; mpz_tdiv_q( quotient.mpz, dividend.mpz, divisor.mpz ); return quotient; }
-static inline Int ?/?( Int dividend, unsigned long int divisor ) { Int quotient; mpz_tdiv_q_ui( quotient.mpz, dividend.mpz, divisor ); return quotient; }
-static inline Int ?/?( unsigned long int dividend, Int divisor ) {
-        Int quotient;
-    if ( mpz_sgn( divisor.mpz ) >= 0 ) {
-                if ( mpz_fits_ulong_p( divisor.mpz ) )
-                        mpz_set_ui( quotient.mpz, dividend / mpz_get_ui( divisor.mpz ) );
-                else
-                        mpz_set_ui( quotient.mpz, 0 );
-        } else {
-                mpz_neg( quotient.mpz, divisor.mpz );
-                if ( mpz_fits_ulong_p( quotient.mpz ) ) {
-                        mpz_set_ui( quotient.mpz, dividend / mpz_get_ui( quotient.mpz ) );
+static inline {
+        // constructor
+        void ?{}( Int & this ) { mpz_init( this.mpz ); }
+        void ?{}( Int & this, Int init ) { mpz_init_set( this.mpz, init.mpz ); }
+        void ?{}( Int & this, zero_t ) { mpz_init_set_si( this.mpz, 0 ); }
+        void ?{}( Int & this, one_t ) { mpz_init_set_si( this.mpz, 1 ); }
+        void ?{}( Int & this, signed long int init ) { mpz_init_set_si( this.mpz, init ); }
+        void ?{}( Int & this, unsigned long int init ) { mpz_init_set_ui( this.mpz, init ); }
+        void ?{}( Int & this, const char * val ) { if ( mpz_init_set_str( this.mpz, val, 0 ) ) abort(); }
+        void ^?{}( Int & this ) { mpz_clear( this.mpz ); }
+
+        // literal
+        Int ?`mp( signed long int init ) { return (Int){ init }; }
+        Int ?`mp( unsigned long int init ) { return (Int){ init }; }
+        Int ?`mp( const char * init ) { return (Int){ init }; }
+
+        // assignment
+        Int ?=?( Int & lhs, Int rhs ) { mpz_set( lhs.mpz, rhs.mpz ); return lhs; }
+        Int ?=?( Int & lhs, long int rhs ) { mpz_set_si( lhs.mpz, rhs ); return lhs; }
+        Int ?=?( Int & lhs, unsigned long int rhs ) { mpz_set_ui( lhs.mpz, rhs ); return lhs; }
+        Int ?=?( Int & lhs, const char * rhs ) { if ( mpz_set_str( lhs.mpz, rhs, 0 ) ) { abort | "invalid string conversion"; } return lhs; }
+
+        char ?=?( char & lhs, Int rhs ) { char val = mpz_get_si( rhs.mpz ); lhs = val; return lhs; }
+        short int ?=?( short int & lhs, Int rhs ) { short int val = mpz_get_si( rhs.mpz ); lhs = val; return lhs; }
+        int ?=?( int & lhs, Int rhs ) { int val = mpz_get_si( rhs.mpz ); lhs = val; return lhs; }
+        long int ?=?( long int & lhs, Int rhs ) { long int val = mpz_get_si( rhs.mpz ); lhs = val; return lhs; }
+        unsigned char ?=?( unsigned char & lhs, Int rhs ) { unsigned char val = mpz_get_ui( rhs.mpz ); lhs = val; return lhs; }
+        unsigned short int ?=?( unsigned short int & lhs, Int rhs ) { unsigned short int val = mpz_get_ui( rhs.mpz ); lhs = val; return lhs; }
+        unsigned int ?=?( unsigned int & lhs, Int rhs ) { unsigned int val = mpz_get_ui( rhs.mpz ); lhs = val; return lhs; }
+        unsigned long int ?=?( unsigned long int & lhs, Int rhs ) { unsigned long int val = mpz_get_ui( rhs.mpz ); lhs = val; return lhs; }
+
+        // conversions
+        long int narrow( Int val ) { return mpz_get_si( val.mpz ); }
+        unsigned long int narrow( Int val ) { return mpz_get_ui( val.mpz ); }
+
+        // comparison
+        int ?==?( Int oper1, Int oper2 ) { return mpz_cmp( oper1.mpz, oper2.mpz ) == 0; }
+        int ?==?( Int oper1, long int oper2 ) { return mpz_cmp_si( oper1.mpz, oper2 ) == 0; }
+        int ?==?( long int oper2, Int oper1 ) { return mpz_cmp_si( oper1.mpz, oper2 ) == 0; }
+        int ?==?( Int oper1, unsigned long int oper2 ) { return mpz_cmp_ui( oper1.mpz, oper2 ) == 0; }
+        int ?==?( unsigned long int oper2, Int oper1 ) { return mpz_cmp_ui( oper1.mpz, oper2 ) == 0; }
+
+        int ?!=?( Int oper1, Int oper2 ) { return ! ( oper1 == oper2 ); }
+        int ?!=?( Int oper1, long int oper2 ) { return ! ( oper1 == oper2 ); }
+        int ?!=?( long int oper1, Int oper2 ) { return ! ( oper1 == oper2 ); }
+        int ?!=?( Int oper1, unsigned long int oper2 ) { return ! ( oper1 == oper2 ); }
+        int ?!=?( unsigned long int oper1, Int oper2 ) { return ! ( oper1 == oper2 ); }
+
+        int ?<?( Int oper1, Int oper2 ) { return mpz_cmp( oper1.mpz, oper2.mpz ) < 0; }
+        int ?<?( Int oper1, long int oper2 ) { return mpz_cmp_si( oper1.mpz, oper2 ) < 0; }
+        int ?<?( long int oper2, Int oper1 ) { return mpz_cmp_si( oper1.mpz, oper2 ) < 0; }
+        int ?<?( Int oper1, unsigned long int oper2 ) { return mpz_cmp_ui( oper1.mpz, oper2 ) < 0; }
+        int ?<?( unsigned long int oper2, Int oper1 ) { return mpz_cmp_ui( oper1.mpz, oper2 ) < 0; }
+
+        int ?<=?( Int oper1, Int oper2 ) { return mpz_cmp( oper1.mpz, oper2.mpz ) <= 0; }
+        int ?<=?( Int oper1, long int oper2 ) { return mpz_cmp_si( oper1.mpz, oper2 ) <= 0; }
+        int ?<=?( long int oper2, Int oper1 ) { return mpz_cmp_si( oper1.mpz, oper2 ) <= 0; }
+        int ?<=?( Int oper1, unsigned long int oper2 ) { return mpz_cmp_ui( oper1.mpz, oper2 ) <= 0; }
+        int ?<=?( unsigned long int oper2, Int oper1 ) { return mpz_cmp_ui( oper1.mpz, oper2 ) <= 0; }
+
+        int ?>?( Int oper1, Int oper2 ) { return ! ( oper1 <= oper2 ); }
+        int ?>?( Int oper1, long int oper2 ) { return ! ( oper1 <= oper2 ); }
+        int ?>?( long int oper1, Int oper2 ) { return ! ( oper1 <= oper2 ); }
+        int ?>?( Int oper1, unsigned long int oper2 ) { return ! ( oper1 <= oper2 ); }
+        int ?>?( unsigned long int oper1, Int oper2 ) { return ! ( oper1 <= oper2 ); }
+
+        int ?>=?( Int oper1, Int oper2 ) { return ! ( oper1 < oper2 ); }
+        int ?>=?( Int oper1, long int oper2 ) { return ! ( oper1 < oper2 ); }
+        int ?>=?( long int oper1, Int oper2 ) { return ! ( oper1 < oper2 ); }
+        int ?>=?( Int oper1, unsigned long int oper2 ) { return ! ( oper1 < oper2 ); }
+        int ?>=?( unsigned long int oper1, Int oper2 ) { return ! ( oper1 < oper2 ); }
+
+        // arithmetic
+        Int +?( Int oper ) { Int pos; mpz_set( pos.mpz, oper.mpz ); return pos; }
+        Int -?( Int oper ) { Int neg; mpz_neg( neg.mpz, oper.mpz ); return neg; }
+        Int ~?( Int oper ) { Int comp; mpz_com( comp.mpz, oper.mpz ); return comp; }
+
+        Int ?&?( Int oper1, Int oper2 ) { Int conjunction; mpz_and( conjunction.mpz, oper1.mpz, oper2.mpz ); return conjunction; }
+        Int ?&?( Int oper1, long int oper2 ) { Int conjunction, temp; mpz_set_si( temp.mpz, oper2 ); mpz_and( conjunction.mpz, oper1.mpz, temp.mpz ); return conjunction; }
+        Int ?&?( long int oper1, Int oper2 ) { Int conjunction, temp; mpz_set_si( temp.mpz, oper1 ); mpz_and( conjunction.mpz, temp.mpz, oper2.mpz ); return conjunction; }
+        Int ?&?( Int oper1, unsigned long int oper2 ) { Int conjunction, temp; mpz_set_ui( temp.mpz, oper2 ); mpz_and( conjunction.mpz, oper1.mpz, temp.mpz ); return conjunction; }
+        Int ?&?( unsigned long int oper1, Int oper2 ) { Int conjunction, temp; mpz_set_ui( temp.mpz, oper1 ); mpz_and( conjunction.mpz, temp.mpz, oper2.mpz ); return conjunction; }
+        Int ?&=?( Int & lhs, Int rhs ) { return lhs = lhs & rhs; }
+
+        Int ?|?( Int oper1, Int oper2 ) { Int disjunction; mpz_ior( disjunction.mpz, oper1.mpz, oper2.mpz ); return disjunction; }
+        Int ?|?( Int oper1, long int oper2 ) { Int disjunction, temp; mpz_set_si( temp.mpz, oper2 ); mpz_ior( disjunction.mpz, oper1.mpz, temp.mpz ); return disjunction; }
+        Int ?|?( long int oper1, Int oper2 ) { Int disjunction, temp; mpz_set_si( temp.mpz, oper1 ); mpz_ior( disjunction.mpz, temp.mpz, oper2.mpz ); return disjunction; }
+        Int ?|?( Int oper1, unsigned long int oper2 ) { Int disjunction, temp; mpz_set_ui( temp.mpz, oper2 ); mpz_ior( disjunction.mpz, oper1.mpz, temp.mpz ); return disjunction; }
+        Int ?|?( unsigned long int oper1, Int oper2 ) { Int disjunction, temp; mpz_set_ui( temp.mpz, oper1 ); mpz_ior( disjunction.mpz, temp.mpz, oper2.mpz ); return disjunction; }
+        Int ?|=?( Int & lhs, Int rhs ) { return lhs = lhs | rhs; }
+
+        Int ?^?( Int oper1, Int oper2 ) { Int disjunction; mpz_xor( disjunction.mpz, oper1.mpz, oper2.mpz ); return disjunction; }
+        Int ?^?( Int oper1, long int oper2 ) { Int disjunction, temp; mpz_set_si( temp.mpz, oper2 ); mpz_ior( disjunction.mpz, oper1.mpz, temp.mpz ); return disjunction; }
+        Int ?^?( long int oper1, Int oper2 ) { Int disjunction, temp; mpz_set_si( temp.mpz, oper1 ); mpz_ior( disjunction.mpz, temp.mpz, oper2.mpz ); return disjunction; }
+        Int ?^?( Int oper1, unsigned long int oper2 ) { Int disjunction, temp; mpz_set_ui( temp.mpz, oper2 ); mpz_ior( disjunction.mpz, oper1.mpz, temp.mpz ); return disjunction; }
+        Int ?^?( unsigned long int oper1, Int oper2 ) { Int disjunction, temp; mpz_set_ui( temp.mpz, oper1 ); mpz_ior( disjunction.mpz, temp.mpz, oper2.mpz ); return disjunction; }
+        Int ?^=?( Int & lhs, Int rhs ) { return lhs = lhs ^ rhs; }
+
+        Int ?+?( Int addend1, Int addend2 ) { Int sum; mpz_add( sum.mpz, addend1.mpz, addend2.mpz ); return sum; }
+        Int ?+?( Int addend1, long int addend2 ) { Int sum; if ( addend2 >= 0 ) mpz_add_ui( sum.mpz, addend1.mpz, addend2 ); else mpz_sub_ui( sum.mpz, addend1.mpz, -addend2 ); return sum; }
+        Int ?+?( long int addend2, Int addend1 ) { Int sum; if ( addend2 >= 0 ) mpz_add_ui( sum.mpz, addend1.mpz, addend2 ); else mpz_sub_ui( sum.mpz, addend1.mpz, -addend2 ); return sum; }
+        Int ?+?( Int addend1, unsigned long int addend2 ) { Int sum; mpz_add_ui( sum.mpz, addend1.mpz, addend2 ); return sum; }
+        Int ?+?( unsigned long int addend2, Int addend1 ) { Int sum; mpz_add_ui( sum.mpz, addend1.mpz, addend2 ); return sum; }
+        Int ?+=?( Int & lhs, Int rhs ) { return lhs = lhs + rhs; }
+        Int ?+=?( Int & lhs, long int rhs ) { return lhs = lhs + rhs; }
+        Int ?+=?( Int & lhs, unsigned long int rhs ) { return lhs = lhs + rhs; }
+        Int ++?( Int & lhs ) { return lhs += 1; }
+        Int ?++( Int & lhs ) { Int ret = lhs; lhs += 1; return ret; }
+
+        Int ?-?( Int minuend, Int subtrahend ) { Int diff; mpz_sub( diff.mpz, minuend.mpz, subtrahend.mpz ); return diff; }
+        Int ?-?( Int minuend, long int subtrahend ) { Int diff; if ( subtrahend >= 0 ) mpz_sub_ui( diff.mpz, minuend.mpz, subtrahend ); else mpz_add_ui( diff.mpz, minuend.mpz, -subtrahend ); return diff; }
+        Int ?-?( long int minuend, Int subtrahend ) { Int diff; if ( subtrahend >= 0 ) mpz_ui_sub( diff.mpz, minuend, subtrahend.mpz ); else { mpz_add_ui( diff.mpz, subtrahend.mpz, -minuend ); mpz_neg( diff.mpz, diff.mpz ); } return diff; }
+        Int ?-?( Int minuend, unsigned long int subtrahend ) { Int diff; mpz_sub_ui( diff.mpz, minuend.mpz, subtrahend ); return diff; }
+        Int ?-?( unsigned long int minuend, Int subtrahend ) { Int diff; mpz_ui_sub( diff.mpz, minuend, subtrahend.mpz ); return diff; }
+        Int ?-=?( Int & lhs, Int rhs ) { return lhs = lhs - rhs; }
+        Int ?-=?( Int & lhs, long int rhs ) { return lhs = lhs - rhs; }
+        Int ?-=?( Int & lhs, unsigned long int rhs ) { return lhs = lhs - rhs; }
+        Int --?( Int & lhs ) { return lhs -= 1; }
+        Int ?--( Int & lhs ) { Int ret = lhs; lhs -= 1; return ret; }
+
+        Int ?*?( Int multiplicator, Int multiplicand ) { Int product; mpz_mul( product.mpz, multiplicator.mpz, multiplicand.mpz ); return product; }
+        Int ?*?( Int multiplicator, long int multiplicand ) { Int product; mpz_mul_si( product.mpz, multiplicator.mpz, multiplicand ); return product; }
+        Int ?*?( long int multiplicand, Int multiplicator ) { Int product; mpz_mul_si( product.mpz, multiplicator.mpz, multiplicand ); return product; }
+        Int ?*?( Int multiplicator, unsigned long int multiplicand ) { Int product; mpz_mul_ui( product.mpz, multiplicator.mpz, multiplicand ); return product; }
+        Int ?*?( unsigned long int multiplicand, Int multiplicator ) { Int product; mpz_mul_ui( product.mpz, multiplicator.mpz, multiplicand ); return product; }
+        Int ?*=?( Int & lhs, Int rhs ) { return lhs = lhs * rhs; }
+        Int ?*=?( Int & lhs, long int rhs ) { return lhs = lhs * rhs; }
+        Int ?*=?( Int & lhs, unsigned long int rhs ) { return lhs = lhs * rhs; }
+
+        // some code for operators "/" and "%" taken from g++ gmpxx.h
+        Int ?/?( Int dividend, Int divisor ) { Int quotient; mpz_tdiv_q( quotient.mpz, dividend.mpz, divisor.mpz ); return quotient; }
+        Int ?/?( Int dividend, unsigned long int divisor ) { Int quotient; mpz_tdiv_q_ui( quotient.mpz, dividend.mpz, divisor ); return quotient; }
+        Int ?/?( unsigned long int dividend, Int divisor ) {
+                Int quotient;
+                if ( mpz_sgn( divisor.mpz ) >= 0 ) {
+                        if ( mpz_fits_ulong_p( divisor.mpz ) )
+                                mpz_set_ui( quotient.mpz, dividend / mpz_get_ui( divisor.mpz ) );
+                        else
+                                mpz_set_ui( quotient.mpz, 0 );
+                } else {
+                        mpz_neg( quotient.mpz, divisor.mpz );
+                        if ( mpz_fits_ulong_p( quotient.mpz ) ) {
+                                mpz_set_ui( quotient.mpz, dividend / mpz_get_ui( quotient.mpz ) );
+                                mpz_neg( quotient.mpz, quotient.mpz );
+                        } else
+                                mpz_set_ui( quotient.mpz, 0 );
+                } // if
+                return quotient;
+        } // ?/?
+        Int ?/?( Int dividend, long int divisor ) {
+                Int quotient;
+                if ( divisor >= 0 )
+                        mpz_tdiv_q_ui( quotient.mpz, dividend.mpz, divisor );
+                else {
+                        mpz_tdiv_q_ui( quotient.mpz, dividend.mpz, -divisor );
                         mpz_neg( quotient.mpz, quotient.mpz );
-                } else
-                        mpz_set_ui( quotient.mpz, 0 );
-        } // if
-        return quotient;
-} // ?/?
-static inline Int ?/?( Int dividend, long int divisor ) {
-        Int quotient;
-    if ( divisor >= 0 )
-                mpz_tdiv_q_ui( quotient.mpz, dividend.mpz, divisor );
-    else {
-                mpz_tdiv_q_ui( quotient.mpz, dividend.mpz, -divisor );
-                mpz_neg( quotient.mpz, quotient.mpz );
-        } // if
-        return quotient;
-} // ?/?
-static inline Int ?/?( long int dividend, Int divisor ) {
-        Int quotient;
-    if ( mpz_fits_slong_p( divisor.mpz ) )
-                mpz_set_si( quotient.mpz, dividend / mpz_get_si( divisor.mpz ) );
-    else {
-        // if divisor is bigger than a long then the quotient must be zero, unless dividend==LONG_MIN and
-        // dividend==-LONG_MIN in which case the quotient is -1
-        mpz_set_si( quotient.mpz, mpz_cmpabs_ui( divisor.mpz, (dividend >= 0 ? dividend : -dividend)) == 0 ? -1 : 0 );
-        } // if
-        return quotient;
-} // ?/?
-static inline Int ?/=?( Int & lhs, Int rhs ) { return lhs = lhs / rhs; }
-static inline Int ?/=?( Int & lhs, long int rhs ) { return lhs = lhs / rhs; }
-static inline Int ?/=?( Int & lhs, unsigned long int rhs ) { return lhs = lhs / rhs; }
-
-static inline [ Int, Int ] div( Int dividend, Int divisor ) { Int quotient, remainder; mpz_fdiv_qr( quotient.mpz, remainder.mpz, dividend.mpz, divisor.mpz ); return [ quotient, remainder ]; }
-static inline [ Int, Int ] div( Int dividend, unsigned long int divisor ) { Int quotient, remainder; mpz_fdiv_qr_ui( quotient.mpz, remainder.mpz, dividend.mpz, divisor ); return [ quotient, remainder ]; }
-
-static inline Int ?%?( Int dividend, Int divisor ) { Int remainder; mpz_tdiv_r( remainder.mpz, dividend.mpz, divisor.mpz ); return remainder; }
-static inline Int ?%?( Int dividend, unsigned long int divisor ) { Int remainder; mpz_tdiv_r_ui( remainder.mpz, dividend.mpz, divisor ); return remainder; }
-static inline Int ?%?( unsigned long int dividend, Int divisor ) {
-        Int remainder;
-    if ( mpz_sgn( divisor.mpz ) >= 0 ) {
-                if ( mpz_fits_ulong_p( divisor.mpz ) )
-                        mpz_set_ui( remainder.mpz, dividend % mpz_get_ui( divisor.mpz ) );
-                else
-                        mpz_set_ui( remainder.mpz, dividend );
-        } else {
-                mpz_neg( remainder.mpz, divisor.mpz );
-                if ( mpz_fits_ulong_p( remainder.mpz ) )
-                        mpz_set_ui( remainder.mpz, dividend % mpz_get_ui( remainder.mpz ) );
-                else
-                        mpz_set_ui( remainder.mpz, dividend );
-        } // if
-        return remainder;
-} // ?%?
-static inline Int ?%?( Int dividend, long int divisor ) {
-        Int remainder;
-    mpz_tdiv_r_ui( remainder.mpz, dividend.mpz, (divisor >= 0 ? divisor : -divisor));
-        return remainder;
-} // ?%?
-static inline Int ?%?( long int dividend, Int divisor ) {
-        Int remainder;
-    if ( mpz_fits_slong_p( divisor.mpz ) )
-                mpz_set_si( remainder.mpz, dividend % mpz_get_si( divisor.mpz ) );
-        else {
-                // if divisor is bigger than a long then the remainder is dividend unchanged, unless dividend==LONG_MIN and
-                // dividend==-LONG_MIN in which case the remainder is 0
-        mpz_set_si( remainder.mpz, mpz_cmpabs_ui( divisor.mpz, (dividend >= 0 ? dividend : -dividend)) == 0 ? 0 : dividend);
-        } // if
-        return remainder;
-} // ?%?
-static inline Int ?%=?( Int & lhs, Int rhs ) { return lhs = lhs % rhs; }
-static inline Int ?%=?( Int & lhs, long int rhs ) { return lhs = lhs % rhs; }
-static inline Int ?%=?( Int & lhs, unsigned long int rhs ) { return lhs = lhs % rhs; }
-
-static inline Int ?<<?( Int shiften, mp_bitcnt_t shift ) { Int shifted; mpz_mul_2exp( shifted.mpz, shiften.mpz, shift ); return shifted; }
-static inline Int ?<<=?( Int & lhs, mp_bitcnt_t shift ) { return lhs = lhs << shift; }
-static inline Int ?>>?( Int shiften, mp_bitcnt_t shift ) { Int shifted; mpz_fdiv_q_2exp( shifted.mpz, shiften.mpz, shift ); return shifted; }
-static inline Int ?>>=?( Int & lhs, mp_bitcnt_t shift ) { return lhs = lhs >> shift; }
-
-// number functions
-static inline Int abs( Int oper ) { Int positive; mpz_abs( positive.mpz, oper.mpz ); return positive; }
-static inline Int fact( unsigned long int N ) { Int factorial; mpz_fac_ui( factorial.mpz, N ); return factorial; }
-static inline Int gcd( Int oper1, Int oper2 ) { Int gcdret; mpz_gcd( gcdret.mpz, oper1.mpz, oper2.mpz ); return gcdret; }
-static inline Int pow( Int base, unsigned long int exponent ) { Int power; mpz_pow_ui( power.mpz, base.mpz, exponent ); return power; }
-static inline Int pow( unsigned long int base, unsigned long int exponent ) { Int power; mpz_ui_pow_ui( power.mpz, base, exponent ); return power; }
-static inline void srandom( gmp_randstate_t state ) { gmp_randinit_default( state ); }
-static inline Int random( gmp_randstate_t state, mp_bitcnt_t n ) { Int rand; mpz_urandomb( rand.mpz, state, n ); return rand; }
-static inline Int random( gmp_randstate_t state, Int n ) { Int rand; mpz_urandomm( rand.mpz, state, n.mpz ); return rand; }
-static inline Int random( gmp_randstate_t state, mp_size_t max_size ) { Int rand; mpz_random( rand.mpz, max_size ); return rand; }
-static inline int sgn( Int oper ) { return mpz_sgn( oper.mpz ); }
-static inline Int sqrt( Int oper ) { Int root; mpz_sqrt( root.mpz, oper.mpz ); return root; }
-
-// I/O
-static inline forall( dtype istype | istream( istype ) )
-istype & ?|?( istype & is, Int & mp ) {
-        gmp_scanf( "%Zd", &mp );
-        return is;
-} // ?|?
-
-static inline forall( dtype ostype | ostream( ostype ) ) {
-        ostype & ?|?( ostype & os, Int mp ) {
-                if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
-                gmp_printf( "%Zd", mp.mpz );
-                sepOn( os );
-                return os;
+                } // if
+                return quotient;
+        } // ?/?
+        Int ?/?( long int dividend, Int divisor ) {
+                Int quotient;
+                if ( mpz_fits_slong_p( divisor.mpz ) )
+                        mpz_set_si( quotient.mpz, dividend / mpz_get_si( divisor.mpz ) );
+                else {
+                        // if divisor is bigger than a long then the quotient must be zero, unless dividend==LONG_MIN and
+                        // dividend==-LONG_MIN in which case the quotient is -1
+                        mpz_set_si( quotient.mpz, mpz_cmpabs_ui( divisor.mpz, (dividend >= 0 ? dividend : -dividend)) == 0 ? -1 : 0 );
+                } // if
+                return quotient;
+        } // ?/?
+        Int ?/=?( Int & lhs, Int rhs ) { return lhs = lhs / rhs; }
+        Int ?/=?( Int & lhs, long int rhs ) { return lhs = lhs / rhs; }
+        Int ?/=?( Int & lhs, unsigned long int rhs ) { return lhs = lhs / rhs; }
+
+        [ Int, Int ] div( Int dividend, Int divisor ) { Int quotient, remainder; mpz_fdiv_qr( quotient.mpz, remainder.mpz, dividend.mpz, divisor.mpz ); return [ quotient, remainder ]; }
+        [ Int, Int ] div( Int dividend, unsigned long int divisor ) { Int quotient, remainder; mpz_fdiv_qr_ui( quotient.mpz, remainder.mpz, dividend.mpz, divisor ); return [ quotient, remainder ]; }
+
+        Int ?%?( Int dividend, Int divisor ) { Int remainder; mpz_tdiv_r( remainder.mpz, dividend.mpz, divisor.mpz ); return remainder; }
+        Int ?%?( Int dividend, unsigned long int divisor ) { Int remainder; mpz_tdiv_r_ui( remainder.mpz, dividend.mpz, divisor ); return remainder; }
+        Int ?%?( unsigned long int dividend, Int divisor ) {
+                Int remainder;
+                if ( mpz_sgn( divisor.mpz ) >= 0 ) {
+                        if ( mpz_fits_ulong_p( divisor.mpz ) )
+                                mpz_set_ui( remainder.mpz, dividend % mpz_get_ui( divisor.mpz ) );
+                        else
+                                mpz_set_ui( remainder.mpz, dividend );
+                } else {
+                        mpz_neg( remainder.mpz, divisor.mpz );
+                        if ( mpz_fits_ulong_p( remainder.mpz ) )
+                                mpz_set_ui( remainder.mpz, dividend % mpz_get_ui( remainder.mpz ) );
+                        else
+                                mpz_set_ui( remainder.mpz, dividend );
+                } // if
+                return remainder;
+        } // ?%?
+        Int ?%?( Int dividend, long int divisor ) {
+                Int remainder;
+                mpz_tdiv_r_ui( remainder.mpz, dividend.mpz, (divisor >= 0 ? divisor : -divisor));
+                return remainder;
+        } // ?%?
+        Int ?%?( long int dividend, Int divisor ) {
+                Int remainder;
+                if ( mpz_fits_slong_p( divisor.mpz ) )
+                        mpz_set_si( remainder.mpz, dividend % mpz_get_si( divisor.mpz ) );
+                else {
+                        // if divisor is bigger than a long then the remainder is dividend unchanged, unless dividend==LONG_MIN and
+                        // dividend==-LONG_MIN in which case the remainder is 0
+                        mpz_set_si( remainder.mpz, mpz_cmpabs_ui( divisor.mpz, (dividend >= 0 ? dividend : -dividend)) == 0 ? 0 : dividend);
+                } // if
+                return remainder;
+        } // ?%?
+        Int ?%=?( Int & lhs, Int rhs ) { return lhs = lhs % rhs; }
+        Int ?%=?( Int & lhs, long int rhs ) { return lhs = lhs % rhs; }
+        Int ?%=?( Int & lhs, unsigned long int rhs ) { return lhs = lhs % rhs; }
+
+        Int ?<<?( Int shiften, mp_bitcnt_t shift ) { Int shifted; mpz_mul_2exp( shifted.mpz, shiften.mpz, shift ); return shifted; }
+        Int ?<<=?( Int & lhs, mp_bitcnt_t shift ) { return lhs = lhs << shift; }
+        Int ?>>?( Int shiften, mp_bitcnt_t shift ) { Int shifted; mpz_fdiv_q_2exp( shifted.mpz, shiften.mpz, shift ); return shifted; }
+        Int ?>>=?( Int & lhs, mp_bitcnt_t shift ) { return lhs = lhs >> shift; }
+
+        // number functions
+        Int abs( Int oper ) { Int positive; mpz_abs( positive.mpz, oper.mpz ); return positive; }
+        Int fact( unsigned long int N ) { Int factorial; mpz_fac_ui( factorial.mpz, N ); return factorial; }
+        Int gcd( Int oper1, Int oper2 ) { Int gcdret; mpz_gcd( gcdret.mpz, oper1.mpz, oper2.mpz ); return gcdret; }
+        Int pow( Int base, unsigned long int exponent ) { Int power; mpz_pow_ui( power.mpz, base.mpz, exponent ); return power; }
+        Int pow( unsigned long int base, unsigned long int exponent ) { Int power; mpz_ui_pow_ui( power.mpz, base, exponent ); return power; }
+        void srandom( gmp_randstate_t state ) { gmp_randinit_default( state ); }
+        Int random( gmp_randstate_t state, mp_bitcnt_t n ) { Int rand; mpz_urandomb( rand.mpz, state, n ); return rand; }
+        Int random( gmp_randstate_t state, Int n ) { Int rand; mpz_urandomm( rand.mpz, state, n.mpz ); return rand; }
+        Int random( gmp_randstate_t state, mp_size_t max_size ) { Int rand; mpz_random( rand.mpz, max_size ); return rand; }
+        int sgn( Int oper ) { return mpz_sgn( oper.mpz ); }
+        Int sqrt( Int oper ) { Int root; mpz_sqrt( root.mpz, oper.mpz ); return root; }
+
+        // I/O
+        forall( dtype istype | istream( istype ) )
+                istype & ?|?( istype & is, Int & mp ) {
+                gmp_scanf( "%Zd", &mp );
+                return is;
         } // ?|?
 
-        void ?|?( ostype & os, Int mp ) {
-                (ostype)(os | mp); nl( os );
-        } // ?|?
+        forall( dtype ostype | ostream( ostype ) ) {
+                ostype & ?|?( ostype & os, Int mp ) {
+                        if ( sepPrt( os ) ) fmt( os, "%s", sepGetCur( os ) );
+                        gmp_printf( "%Zd", mp.mpz );
+                        sepOn( os );
+                        return os;
+                } // ?|?
+
+                void ?|?( ostype & os, Int mp ) {
+                        (ostype)(os | mp); ends( os );
+                } // ?|?
+        } // distribution
 } // distribution
 

libcfa/src/interpose.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May  5 11:37:35 2018
-// Update Count     : 111
+// Last Modified On : Sun Jul 14 22:57:16 2019
+// Update Count     : 116
 //
 
@@ -81 +81 @@
 //=============================================================================================
 
-void sigHandler_segv ( __CFA_SIGPARMS__ );
-void sigHandler_ill  ( __CFA_SIGPARMS__ );
-void sigHandler_fpe  ( __CFA_SIGPARMS__ );
-void sigHandler_abort( __CFA_SIGPARMS__ );
-void sigHandler_term ( __CFA_SIGPARMS__ );
+void sigHandler_segv( __CFA_SIGPARMS__ );
+void sigHandler_ill ( __CFA_SIGPARMS__ );
+void sigHandler_fpe ( __CFA_SIGPARMS__ );
+void sigHandler_abrt( __CFA_SIGPARMS__ );
+void sigHandler_term( __CFA_SIGPARMS__ );
 
 struct {
@@ -110 +110 @@
                 __cfaabi_sigaction( SIGILL , sigHandler_ill  , SA_SIGINFO );
                 __cfaabi_sigaction( SIGFPE , sigHandler_fpe  , SA_SIGINFO );
-                __cfaabi_sigaction( SIGABRT, sigHandler_abort, SA_SIGINFO | SA_RESETHAND);
+                __cfaabi_sigaction( SIGABRT, sigHandler_abrt, SA_SIGINFO | SA_RESETHAND);
                 __cfaabi_sigaction( SIGTERM, sigHandler_term , SA_SIGINFO );
                 __cfaabi_sigaction( SIGINT , sigHandler_term , SA_SIGINFO );
@@ -204 +204 @@
                         if ( *p == '(' ) {
                                 name = p;
-                        }
-                        else if ( *p == '+' ) {
+                        } else if ( *p == '+' ) {
                                 offset_begin = p;
-                        }
-                        else if ( *p == ')' ) {
+                        } else if ( *p == ')' ) {
                                 offset_end = p;
                                 break;
@@ -223 +221 @@
 
                         __cfaabi_dbg_bits_print_nolock( "(%i) %s : %s + %s %s\n", frameNo, messages[i], name, offset_begin, offset_end);
-                }
-                // otherwise, print the whole line
-                else {
+                } else {                                                                                // otherwise, print the whole line
                         __cfaabi_dbg_bits_print_nolock( "(%i) %s\n", frameNo, messages[i] );
                 }
@@ -258 +254 @@
 }
 
-void sigHandler_abort( __CFA_SIGPARMS__ ) {
+void sigHandler_abrt( __CFA_SIGPARMS__ ) {
         __cfaabi_backtrace();
 

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun 13 17:21:10 2019
-// Update Count     : 812
+// Last Modified On : Sat Jul 13 08:07:59 2019
+// Update Count     : 821
 //
 
@@ -30 +30 @@
 
 
-//*********************************** Ostream ***********************************
+//*********************************** ostream ***********************************
 
 
@@ -40 +40 @@
         } // ?|?
         void ?|?( ostype & os, zero_t z ) {
-                (ostype &)(os | z); nl( os );
+                (ostype &)(os | z); ends( os );
         } // ?|?
 
@@ -49 +49 @@
         } // ?|?
         void ?|?( ostype & os, one_t o ) {
-                (ostype &)(os | o); nl( os );
+                (ostype &)(os | o); ends( os );
         } // ?|?
 
@@ -58 +58 @@
         } // ?|?
         void ?|?( ostype & os, bool b ) {
-                (ostype &)(os | b); nl( os );
+                (ostype &)(os | b); ends( os );
         } // ?|?
 
@@ -67 +67 @@
         } // ?|?
         void ?|?( ostype & os, char c ) {
-                (ostype &)(os | c); nl( os );
+                (ostype &)(os | c); ends( os );
         } // ?|?
 
@@ -76 +76 @@
         } // ?|?
         void ?|?( ostype & os, signed char sc ) {
-                (ostype &)(os | sc); nl( os );
+                (ostype &)(os | sc); ends( os );
         } // ?|?
 
@@ -85 +85 @@
         } // ?|?
         void ?|?( ostype & os, unsigned char usc ) {
-                (ostype &)(os | usc); nl( os );
+                (ostype &)(os | usc); ends( os );
         } // ?|?
 
@@ -94 +94 @@
         } // ?|?
         void & ?|?( ostype & os, short int si ) {
-                (ostype &)(os | si); nl( os );
+                (ostype &)(os | si); ends( os );
         } // ?|?
 
@@ -103 +103 @@
         } // ?|?
         void & ?|?( ostype & os, unsigned short int usi ) {
-                (ostype &)(os | usi); nl( os );
+                (ostype &)(os | usi); ends( os );
         } // ?|?
 
@@ -112 +112 @@
         } // ?|?
         void & ?|?( ostype & os, int i ) {
-                (ostype &)(os | i); nl( os );
+                (ostype &)(os | i); ends( os );
         } // ?|?
 
@@ -121 +121 @@
         } // ?|?
         void & ?|?( ostype & os, unsigned int ui ) {
-                (ostype &)(os | ui); nl( os );
+                (ostype &)(os | ui); ends( os );
         } // ?|?
 
@@ -130 +130 @@
         } // ?|?
         void & ?|?( ostype & os, long int li ) {
-                (ostype &)(os | li); nl( os );
+                (ostype &)(os | li); ends( os );
         } // ?|?
 
@@ -139 +139 @@
         } // ?|?
         void & ?|?( ostype & os, unsigned long int uli ) {
-                (ostype &)(os | uli); nl( os );
+                (ostype &)(os | uli); ends( os );
         } // ?|?
 
@@ -148 +148 @@
         } // ?|?
         void & ?|?( ostype & os, long long int lli ) {
-                (ostype &)(os | lli); nl( os );
+                (ostype &)(os | lli); ends( os );
         } // ?|?
 
@@ -157 +157 @@
         } // ?|?
         void & ?|?( ostype & os, unsigned long long int ulli ) {
-                (ostype &)(os | ulli); nl( os );
+                (ostype &)(os | ulli); ends( os );
         } // ?|?
 
@@ -180 +180 @@
         } // ?|?
         void & ?|?( ostype & os, float f ) {
-                (ostype &)(os | f); nl( os );
+                (ostype &)(os | f); ends( os );
         } // ?|?
 
@@ -189 +189 @@
         } // ?|?
         void & ?|?( ostype & os, double d ) {
-                (ostype &)(os | d); nl( os );
+                (ostype &)(os | d); ends( os );
         } // ?|?
 
@@ -198 +198 @@
         } // ?|?
         void & ?|?( ostype & os, long double ld ) {
-                (ostype &)(os | ld); nl( os );
+                (ostype &)(os | ld); ends( os );
         } // ?|?
 
@@ -210 +210 @@
         } // ?|?
         void & ?|?( ostype & os, float _Complex fc ) {
-                (ostype &)(os | fc); nl( os );
+                (ostype &)(os | fc); ends( os );
         } // ?|?
 
@@ -222 +222 @@
         } // ?|?
         void & ?|?( ostype & os, double _Complex dc ) {
-                (ostype &)(os | dc); nl( os );
+                (ostype &)(os | dc); ends( os );
         } // ?|?
 
@@ -234 +234 @@
         } // ?|?
         void & ?|?( ostype & os, long double _Complex ldc ) {
-                (ostype &)(os | ldc); nl( os );
+                (ostype &)(os | ldc); ends( os );
         } // ?|?
 
@@ -276 +276 @@
         } // ?|?
         void ?|?( ostype & os, const char * str ) {
-                (ostype &)(os | str); nl( os );
+                (ostype &)(os | str); ends( os );
         } // ?|?
 
@@ -305 +305 @@
         } // ?|?
         void ?|?( ostype & os, const void * p ) {
-                (ostype &)(os | p); nl( os );
+                (ostype &)(os | p); ends( os );
         } // ?|?
 
@@ -315 +315 @@
         void ?|?( ostype & os, ostype & (* manip)( ostype & ) ) {
                 (ostype &)(manip( os ));
-                if ( getPrt( os ) ) nl( os );                                   // something printed ?
+                if ( getPrt( os ) ) ends( os );                                 // something printed ?
                 setPrt( os, false );                                                    // turn off
         } // ?|?
@@ -335 +335 @@
         } // nl
 
-        void nl( ostype & os ) {
-                if ( getANL( os ) ) (ostype &)(nl( os ));               // implementation only
-                else setPrt( os, false );                                               // turn off
-        } // nl
-
         ostype & nonl( ostype & os ) {
                 setPrt( os, false );                                                    // turn off
@@ -386 +381 @@
         } // ?|?
         void ?|?( ostype & os, T arg, Params rest ) {
-                // (ostype &)(?|?( os, arg, rest )); nl( os );
+                // (ostype &)(?|?( os, arg, rest )); ends( os );
                 (ostype &)(os | arg);                                                   // print first argument
                 sepSetCur( os, sepGetTuple( os ) );                             // switch to tuple separator
                 (ostype &)(os | rest);                                                  // print remaining arguments
                 sepSetCur( os, sepGet( os ) );                                  // switch to regular separator
-                nl( os );
+                ends( os );
         } // ?|?
 } // distribution
@@ -408 +403 @@
 } // distribution
 
-//*********************************** Manipulators ***********************************
-
-//*********************************** Integral ***********************************
+//*********************************** manipulators ***********************************
+
+//*********************************** integral ***********************************
 
 static const char * shortbin[] = { "0", "1", "10", "11", "100", "101", "110", "111", "1000", "1001", "1010", "1011", "1100", "1101", "1110", "1111" };
@@ -478 +473 @@
                 return os; \
         } /* ?|? */ \
-        void ?|?( ostype & os, _Ostream_Manip(T) f ) { (ostype &)(os | f); nl( os ); } \
+        void ?|?( ostype & os, _Ostream_Manip(T) f ) { (ostype &)(os | f); ends( os ); } \
 } // distribution
 
@@ -492 +487 @@
 IntegralFMTImpl( unsigned long long int, 'u', "%    *ll ", "%    *.*ll " )
 
-//*********************************** Floating Point ***********************************
+//*********************************** floating point ***********************************
 
 #define PrintWithDP2( os, format, val, ... ) \
@@ -504 +499 @@
                                 if ( ! f.flags.left ) { \
                                         buf[i] = '.'; buf[i + 1] = '\0'; \
-                                        if ( buf[0] == ' ' ) bufbeg = 1; /* decimal point within width */ \
+                                        if ( buf[0] == ' ' ) bufbeg = 1;        /* decimal point within width */ \
                                 } else { \
                                         for ( i = 0; i < len && buf[i] != ' '; i += 1 ); /* trailing blank ? */ \
@@ -541 +536 @@
                 return os; \
         } /* ?|? */ \
-        void ?|?( ostype & os, _Ostream_Manip(T) f ) { (ostype &)(os | f); nl( os ); } \
+        void ?|?( ostype & os, _Ostream_Manip(T) f ) { (ostype &)(os | f); ends( os ); } \
 } // distribution
 
@@ -547 +542 @@
 FloatingPointFMTImpl( long double, "%    *L ", "%    *.*L " )
 
-//*********************************** Character ***********************************
+//*********************************** character ***********************************
 
 forall( dtype ostype | ostream( ostype ) ) {
         ostype & ?|?( ostype & os, _Ostream_Manip(char) f ) {
-                if ( f.base != 'c' ) {                                                          // bespoke binary/octal/hex format
+                if ( f.base != 'c' ) {                                                  // bespoke binary/octal/hex format
                         _Ostream_Manip(unsigned char) fmtuc @= { f.val, f.wd, f.pc, f.base, {'\0'} };
                         fmtuc.flags.pc = f.flags.pc;
@@ -563 +558 @@
 
                 #define CFMTNP "% * "
-                char fmtstr[sizeof(CFMTNP)];                                            // sizeof includes '\0'
+                char fmtstr[sizeof(CFMTNP)];                                    // sizeof includes '\0'
                 memcpy( &fmtstr, CFMTNP, sizeof(CFMTNP) );
-                int star = 1;                                                                           // position before first '*'
+                int star = 1;                                                                   // position before first '*'
 
                 // Insert flags into spaces before '*', from right to left.
@@ -571 +566 @@
                 fmtstr[star] = '%';
 
-                fmtstr[sizeof(CFMTNP)-2] = f.base;                                      // sizeof includes '\0'
+                fmtstr[sizeof(CFMTNP)-2] = f.base;                              // sizeof includes '\0'
                 // printf( "%d %s\n", f.wd, &fmtstr[star] );
                 fmt( os, &fmtstr[star], f.wd, f.val );
                 return os;
         } // ?|?
-        void ?|?( ostype & os, _Ostream_Manip(char) f ) { (ostype &)(os | f); nl( os ); }
+        void ?|?( ostype & os, _Ostream_Manip(char) f ) { (ostype &)(os | f); ends( os ); }
 } // distribution
 
-//*********************************** C String ***********************************
+//*********************************** C string ***********************************
 
 forall( dtype ostype | ostream( ostype ) ) {
@@ -621 +616 @@
                 return os;
         } // ?|?
-        void ?|?( ostype & os, _Ostream_Manip(const char *) f ) { (ostype &)(os | f); nl( os ); }
+        void ?|?( ostype & os, _Ostream_Manip(const char *) f ) { (ostype &)(os | f); ends( os ); }
 } // distribution
 
 
-//*********************************** Istream ***********************************
+//*********************************** istream ***********************************
 
 
@@ -636 +631 @@
                 else {
                         fprintf( stderr, "invalid Boolean constant\n" );
-                        abort();
+                        abort();                                                                        // cannot use abort stream
                 } // if
                 return is;
@@ -644 +639 @@
                 char temp;
                 for () {
-                        fmt( is, "%c", &temp );                                                 // must pass pointer through varg to fmt
+                        fmt( is, "%c", &temp );                                         // must pass pointer through varg to fmt
                         // do not overwrite parameter with newline unless appropriate
                         if ( temp != '\n' || getANL( is ) ) { c = temp; break; }
@@ -771 +766 @@
 } // distribution
 
-//*********************************** Manipulators ***********************************
+//*********************************** manipulators ***********************************
 
 forall( dtype istype | istream( istype ) )
@@ -778 +773 @@
         if ( ! f.s ) {
                 // printf( "skip %s %d\n", f.scanset, f.wd );
-                if ( f.wd == -1 ) fmt( is, f.scanset, "" ); // no input arguments
+                if ( f.wd == -1 ) fmt( is, f.scanset, "" );             // no input arguments
                 else for ( f.wd ) fmt( is, "%*c" );
                 return is;

libcfa/src/iostream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun 13 17:20:21 2019
-// Update Count     : 325
+// Last Modified On : Fri Jul 12 12:08:38 2019
+// Update Count     : 334
 //
 
@@ -19 +19 @@
 
 
-//*********************************** Ostream ***********************************
+//*********************************** ostream ***********************************
 
 
@@ -47 +47 @@
         void sepSetTuple( ostype &, const char * );                     // set tuple separator to string (15 character maximum)
 
+        void ends( ostype & os );                                                       // end of output statement
         int fail( ostype & );
         int flush( ostype & );
@@ -98 +99 @@
         void ?|?( ostype &, unsigned long long int );
 
-        ostype & ?|?( ostype &, float ); // FIX ME: should not be required
-        void ?|?( ostype &, float ); // FIX ME: should not be required
+        ostype & ?|?( ostype &, float );
+        void ?|?( ostype &, float );
         ostype & ?|?( ostype &, double );
         void ?|?( ostype &, double );
@@ -126 +127 @@
         void ?|?( ostype &, ostype & (*)( ostype & ) );
         ostype & nl( ostype & );
-        void nl( ostype & );
         ostype & nonl( ostype & );
         ostype & sep( ostype & );
@@ -150 +150 @@
 } // distribution
 
-//*********************************** Manipulators ***********************************
+//*********************************** manipulators ***********************************
 
 forall( otype T )
@@ -169 +169 @@
 }; // _Ostream_Manip
 
-//*********************************** Integral ***********************************
+//*********************************** integral ***********************************
 
 // See 6.7.9. 19) The initialization shall occur in initializer list order, each initializer provided for a particular
@@ -207 +207 @@
 IntegralFMTDecl( unsigned long long int, 'u' )
 
-//*********************************** Floating Point ***********************************
+//*********************************** floating point ***********************************
 
 // Default suffix for values with no fraction is "."
@@ -236 +236 @@
 FloatingPointFMTDecl( long double )
 
-//*********************************** Character ***********************************
+//*********************************** character ***********************************
 
 static inline {
@@ -253 +253 @@
 } // ?|?
 
-//*********************************** C String ***********************************
+//*********************************** C string ***********************************
 
 static inline {
@@ -272 +272 @@
 
 
-//*********************************** Istream ***********************************
+//*********************************** istream ***********************************
 
 
@@ -326 +326 @@
 } // distribution
 
-//*********************************** Manipulators ***********************************
+//*********************************** manipulators ***********************************
 
 struct _Istream_Cstr {
@@ -403 +403 @@
 
 
-//*********************************** Time ***********************************
+//*********************************** time ***********************************
 
 

libcfa/src/rational.cfa

@@ -10 +10 @@
 // Created On       : Wed Apr  6 17:54:28 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 28 17:33:03 2019
-// Update Count     : 181
+// Last Modified On : Fri Jul 12 18:12:08 2019
+// Update Count     : 184
 //
 
@@ -35 +35 @@
         static RationalImpl simplify( RationalImpl & n, RationalImpl & d ) {
                 if ( d == (RationalImpl){0} ) {
-                        abort( "Invalid rational number construction: denominator cannot be equal to 0.\n" );
+                        abort | "Invalid rational number construction: denominator cannot be equal to 0.";
                 } // exit
                 if ( d < (RationalImpl){0} ) { d = -d; n = -n; } // move sign to numerator
@@ -167 +167 @@
 
                 void ?|?( ostype & os, Rational(RationalImpl) r ) {
-                        (ostype &)(os | r); nl( os );
+                        (ostype &)(os | r); ends( os );
                 } // ?|?
         } // distribution

libcfa/src/stdlib.cfa

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 12 08:03:59 2018
-// Update Count     : 458
+// Last Modified On : Mon Jun 24 17:34:44 2019
+// Update Count     : 462
 //
 
@@ -65 +65 @@
 forall( dtype T | sized(T), ttype Params | { void ?{}( T &, Params ); } )
 T * anew( size_t dim, Params p ) {
-        T *arr = alloc( dim );
+        T * arr = alloc( dim );
         for ( unsigned int i = 0; i < dim; i += 1 ) {
                 (arr[i]){ p };                                                                  // run constructor
@@ -252 +252 @@
 long double _Complex random( void ) { return (long double)drand48() + (long double _Complex)(drand48() * _Complex_I); }
 
+//---------------------------------------
+
+bool threading_enabled(void) __attribute__((weak)) {
+        return false;
+}
 
 // Local Variables: //

libcfa/src/stdlib.hfa

@@ -15 +15 @@
 
 #pragma once
+
+#include "bits/defs.hfa"
 
 #include <stdlib.h>                                                                             // *alloc, strto*, ato*
@@ -246 +248 @@
 #include "common.hfa"
 
+//---------------------------------------
+
+extern bool threading_enabled(void) OPTIONAL_THREAD;
+
 // Local Variables: //
 // mode: c //

libcfa/src/time.cfa

@@ -10 +10 @@
 // Created On       : Tue Mar 27 13:33:14 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Dec 23 22:57:48 2018
-// Update Count     : 57
+// Last Modified On : Sat Jul 13 08:41:55 2019
+// Update Count     : 65
 //
 
 #include "time.hfa"
-#include "iostream.hfa"
+#include "fstream.hfa"
 #include <stdio.h>                                                                              // snprintf
 #include <assert.h>
@@ -37 +37 @@
                 if ( ns != 0 ) {                                                                // some ?
                         char buf[16];
-                        (ostype &)(os | nanomsd( ns, buf ));                    // print nanoseconds
+                        (ostype &)(os | nanomsd( ns, buf ));            // print nanoseconds
                 } // if
                 return os;
@@ -43 +43 @@
 
         void ?|?( ostype & os, Duration dur ) with( dur ) {
-                (ostype &)(os | dur); nl( os );
+                (ostype &)(os | dur); ends( os );
         } // ?|?
 } // distribution
@@ -52 +52 @@
 
 #ifdef __CFA_DEBUG__
-#define CreateFmt "Attempt to create Time( year=%d (>=1970), month=%d (1-12), day=%d (1-31), hour=%d (0-23), min=%d (0-59), sec=%d (0-60), nsec=%d (0-999_999_999), " \
-        "which exceeds range 00:00:00 UTC, January 1, 1970 to 03:14:07 UTC, January 19, 2038."
+static void tabort( int year, int month, int day, int hour, int min, int sec, int nsec ) {
+        abort | "Attempt to create Time( year=" | year | "(>=1970), month=" | month | "(1-12), day=" | day | "(1-31), hour=" | hour | "(0-23), min=" | min | "(0-59), sec=" | sec
+                  | "(0-60), nsec=" | nsec | "(0-999_999_999), which exceeds range 00:00:00 UTC, January 1, 1970 to 03:14:07 UTC, January 19, 2038.";
+} // tabort
 #endif // __CFA_DEBUG__
 
@@ -63 +65 @@
 #ifdef __CFA_DEBUG__
         if ( month < 1 || 12 < month ) {
-                abort( CreateFmt, year, month, day, hour, (int)min, sec, nsec );
+                tabort( year, month, day, hour, min, sec, nsec );
         } // if
 #endif // __CFA_DEBUG__
@@ -69 +71 @@
 #ifdef __CFA_DEBUG__
         if ( day < 1 || 31 < day ) {
-                abort( CreateFmt, year, month, day, hour, (int)min, sec, nsec );
+                tabort( year, month, day, hour, min, sec, nsec );
         } // if
 #endif // __CFA_DEBUG__
@@ -79 +81 @@
 #ifdef __CFA_DEBUG__
         if ( epochsec == (time_t)-1 ) {
-                abort( CreateFmt, year, month, day, hour, (int)min, sec, nsec );
+                tabort( year, month, day, hour, min, sec, nsec );
         } // if
 #endif // __CFA_DEBUG__
@@ -85 +87 @@
 #ifdef __CFA_DEBUG__
         if ( tv > 2147483647LL * TIMEGRAN ) {                           // between 00:00:00 UTC, January 1, 1970 and 03:14:07 UTC, January 19, 2038.
-                abort( CreateFmt, year, month, day, hour, (int)min, sec, nsec );
+                tabort( year, month, day, hour, min, sec, nsec );
         } // if
 #endif // __CFA_DEBUG__
@@ -150 +152 @@
                 long int ns = (tv < 0 ? -tv : tv) % TIMEGRAN;   // compute nanoseconds
                 if ( ns == 0 ) {                                                                // none ?
-                        (ostype &)(os | buf);                                                   // print date/time/year
+                        (ostype &)(os | buf);                                           // print date/time/year
                 } else {
                         buf[19] = '\0';                                                         // truncate to "Wed Jun 30 21:49:08"
                         char buf2[16];
                         nanomsd( ns, buf2 );                                            // compute nanoseconds
-                        (ostype &)(os | buf | buf2 | ' ' | &buf[20]);   // print date/time, nanoseconds and year
+                        (ostype &)(os | buf | buf2 | ' ' | &buf[20]); // print date/time, nanoseconds and year
                 } // if
                 return os;
@@ -161 +163 @@
 
         void ?|?( ostype & os, Time time ) with( time ) {
-                (ostype &)(os | time); nl( os );
+                (ostype &)(os | time); ends( os );
         } // ?|?
 } // distribution