Changes in / [74330e7:3ecfa13]

Files:

• libcfa/prelude/Makefile.am (modified) (2 diffs)
• libcfa/prelude/Makefile.in (modified) (4 diffs)
• libcfa/prelude/extras.regx (modified) (1 diff)
• libcfa/prelude/extras.regx2 (added)
• tests/pybin/tools.py (modified) (2 diffs)

libcfa/prelude/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Wed Dec 14 15:00:35 2016
-## Update Count     : 205
+## Last Modified On : Mon Feb  3 21:27:18 2020
+## Update Count     : 208
 ###############################################################################
 
@@ -36 +36 @@
 extras.cf : ${srcdir}/extras.regx ${srcdir}/extras.c
         ${AM_V_GEN}gcc ${AM_CFLAGS} -E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf
+        ${AM_V_GEN}gcc ${AM_CFLAGS} -E ${srcdir}/extras.c | grep -zo -f ${srcdir}/extras.regx2 | tr '\0' '\n' >> extras.cf
 
 # create forward declarations for gcc builtins

libcfa/prelude/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
@@ -331 +331 @@
             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
           *) \
-            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
         esac;
 
@@ -377 +377 @@
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+        $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
         @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -540 +543 @@
 extras.cf : ${srcdir}/extras.regx ${srcdir}/extras.c
         ${AM_V_GEN}gcc ${AM_CFLAGS} -E ${srcdir}/extras.c | grep -f ${srcdir}/extras.regx > extras.cf
+        ${AM_V_GEN}gcc ${AM_CFLAGS} -E ${srcdir}/extras.c | grep -zo -f ${srcdir}/extras.regx2 | tr '\0' '\n' >> extras.cf
 
 # create forward declarations for gcc builtins

libcfa/prelude/extras.regx

@@ -24 +24 @@
 typedef.* char32_t;
 typedef.* wchar_t;
-extern.*\*malloc\(.*\).*
-extern.* free\(.*\).*
-extern.* exit\(.*\).*
-extern.* atexit\(.*\).*
-extern.* abort\(.*\).*
-extern.* printf\(.*\).*

tests/pybin/tools.py

@@ -175 +175 @@
 
 def which(program):
-    fpath, fname = os.path.split(program)
-    if fpath:
-        if is_exe(program):
-            return program
-    else:
-        for path in os.environ["PATH"].split(os.pathsep):
-            exe_file = os.path.join(path, program)
-            if is_exe(exe_file):
-                return exe_file
-
-    return None
+        fpath, fname = os.path.split(program)
+        if fpath:
+                if is_exe(program):
+                        return program
+        else:
+                for path in os.environ["PATH"].split(os.pathsep):
+                        exe_file = os.path.join(path, program)
+                        if is_exe(exe_file):
+                                return exe_file
+        return None
 
 @contextlib.contextmanager
@@ -365 +364 @@
 
 class Timed:
-    def __enter__(self):
-        self.start = time.time()
-        return self
-
-    def __exit__(self, *args):
-        self.end = time.time()
-        self.duration = self.end - self.start
+        def __enter__(self):
+                self.start = time.time()
+                return self
+
+        def __exit__(self, *args):
+                self.end = time.time()
+                self.duration = self.end - self.start
 
 def timed(src, timeout):
         expire = time.time() + timeout
         i = iter(src)
-        while True:
-                yield i.next(max(expire - time.time(), 0))
+        with contextlib.suppress(StopIteration):
+                while True:
+                        yield i.next(max(expire - time.time(), 0))