<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f858300b9dab84c1467100a721fa31b68c5c952d">https://github.com/macports/macports-ports/commit/f858300b9dab84c1467100a721fa31b68c5c952d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f858300 gprolog: update to 1.4.5
</span>f858300 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f858300b9dab84c1467100a721fa31b68c5c952d
</span>Author: Paulo Moura <pmoura@logtalk.org>
AuthorDate: Sat Jul 14 17:23:37 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> gprolog: update to 1.4.5
</span>---
lang/gprolog/Portfile | 14 +--
lang/gprolog/files/cflags.patch | 19 ---
lang/gprolog/files/clang.patch | 259 ----------------------------------------
3 files changed, 4 insertions(+), 288 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gprolog/Portfile b/lang/gprolog/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1bfee5c..153e900 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gprolog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gprolog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,6 @@
</span> PortSystem 1.0
name gprolog
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.4.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.4.5
</span>
categories lang
maintainers {logtalk.org:pmoura @pmoura}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,20 +26,15 @@ homepage http://gprolog.inria.fr/
</span> master_sites http://www.gprolog.org/
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 658b0efa5d916510dcddbbd980d90bc4d43a6e58 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 081ad0e6a2edd47de63db79ab1dc65a0e0d341da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 781c8fcffa180e63b821689589f5b02ab803135c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bfdcf00e051e0628b4f9af9d6638d4fde6ad793401e58a5619d1cc6105618c7c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3587361
</span>
worksrcdir ${name}-${version}/src
use_parallel_build no
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.dir ${worksrcpath}/..
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clang.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_autoconf yes
configure.args \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gprolog/files/cflags.patch b/lang/gprolog/files/cflags.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1f11467..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gprolog/files/cflags.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/configure.in 2013-01-30 00:41:04.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/configure.in 2013-01-30 00:41:54.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -464,16 +464,13 @@ dnl -fomit-frame-pointer does not work o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS_MACHINE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "$host" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- i*86*darwin1*) CFLAGS_MACHINE='-march=i686 -m32';;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mips*irix*) CFLAGS_MACHINE='-march=4000';;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *sparc*sunos4.1.3) CFLAGS_MACHINE='-msupersparc';;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *sparc*solaris) CFLAGS_MACHINE='-msupersparc';;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i686*) CFLAGS_MACHINE='-march=pentiumpro -m32';;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i586*) CFLAGS_MACHINE='-march=pentium -m32';;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i*86*) CFLAGS_MACHINE='-march=i486 -m32';;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- powerpc*darwin*) CFLAGS_MACHINE='-mpowerpc -no-cpp-precomp';;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x86_64*solaris*) CFLAGS_MACHINE='-m64';;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- x86_64*darwin*) CFLAGS_MACHINE='-march=x86-64 -m64';;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "$host" in
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gprolog/files/clang.patch b/lang/gprolog/files/clang.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0eb84f1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gprolog/files/clang.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,259 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gist.githubusercontent.com/jacknagel/7549696/raw/6d7ae0ba54eabb8a5dd123a29c17cf88a8822cea/gprolog-clang.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/examples/ExamplesFD/langford.pl b/examples/ExamplesFD/langford.pl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9434b9d..62198dd 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/examples/ExamplesFD/langford.pl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/examples/ExamplesFD/langford.pl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,29 +29,63 @@ q :-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nl.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--langford(N, L) :-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Find an assignment of [X1, X2, ..., Xn] (Xi is the position of the first occurrence of i).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * For each Xi the constraints are:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Xi in 1..(N+N-1-i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * if each pair Xi, Xj (i < j) the following holds:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Xj != Xi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Xj != Xi + i + 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Xj != Xi - j - 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Xj != Xi + i - j
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * This can be achieved using #=# in set_cstr (but slower at the end)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Here we keep the list of positions Ui (resp. Vi) is the position of the first (resp. second) occurrence of i
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * It is possible to only keep one list (i.e. Ui) but seems slower (see file LANGFORD.pl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+langford(N, LD) :-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ( N mod 4 =:= 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ; N mod 4 =:= 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ), !,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- length(U, N),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- length(V, N),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- append(U, V, UV),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ append(U, V, L),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- N2 is N * 2,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fd_set_vector_max(N2),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fd_domain(UV, 1, N2),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fd_all_different(UV),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fd_domain(L, 1, N2),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fd_all_different(L),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_cstr(U, V, 1),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- symetric(N, N2, UV),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ symetric(N, N2, L),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- % fd_labeling(U, [variable_method(random), value_method(random)]), % sometimes much better
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fd_labeling(U, [variable_method(ff), value_method(max)]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- decode(1, N, UV, L).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ decode(U, N2, LD).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Find an assignment of [X1, X2, ..., Xn] (Xi is the position of the first occurrence of i).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * For each Xi the constraints are:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Xi in 1..(N+N-1-i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * if each pair Xi, Xj (i < j) the following holds:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Xi != Xj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Xj != Xi + i + 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Xi != Xj + j + 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * Xi + i + 1 != Xj + j + 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * This can be achieved using #=# in set_cstr (but slower at the end)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_cstr([], [], _).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_cstr([X|U], [Y|V], I) :-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- I1 is I + 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Y - X #= I1, % also avoid some symetries since enforces X < Y
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Y #= X + I1, % also avoid some symetries since enforces X < Y
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+% Y #=# X + I1, % better pruning but slower for big values
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_cstr(U, V, I1).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,17 +96,20 @@ symetric(N, N2, UV) :-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--decode(I, N, _, []) :-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- I > N * 2, !.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--decode(I, N, UV, [Z1|L]) :-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+decode(L, N2, LD) :-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ length(LD, N2),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ decode1(L, 1, LD).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+decode1([], _, _).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+decode1([X|L], I, LD) :-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ nth(X, LD, I),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Y is X + I + 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ nth(Y, LD, I),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- I1 is I + 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- nth(Z, UV, I),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ( Z > N ->
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Z1 is Z - N
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ; Z1 = Z
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- decode(I1, N, UV, L).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ decode1(L, I1, LD).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/BipsPl/arith_inl_c.c b/src/BipsPl/arith_inl_c.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index deda82d..13f481a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/BipsPl/arith_inl_c.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/BipsPl/arith_inl_c.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -485,10 +485,10 @@ Pl_Succ_2(WamWord x_word, WamWord y_word)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double d; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (Tag_Is_INT(x)) /* error case */ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (Flag_Value(strict_iso)) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (Flag_Value(strict_iso)) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Pl_Err_Type(pl_type_float, x); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return x; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return x; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d = Pl_Obtain_Float(UnTag_FLT(x)); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -499,7 +499,11 @@ Pl_Succ_2(WamWord x_word, WamWord y_word)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FtoF(x, c_op) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double d; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (Tag_Is_INT(x)) /* error case */ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Pl_Err_Type(pl_type_float, x); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Pl_Err_Type(pl_type_float, x); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return x; /* for clang (avoid d uninit) */ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d = Pl_Obtain_Float(UnTag_FLT(x)); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return Make_Tagged_Float(c_op(d))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/BipsPl/scan_supp.c b/src/BipsPl/scan_supp.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1ce1897..0d8ae08 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/BipsPl/scan_supp.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/BipsPl/scan_supp.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -341,7 +341,7 @@ static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Scan_Number(StmInf *pstm, Bool integer_only)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int lg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int radix;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int radix, radix_c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *p, *f;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int c_orig0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -403,8 +403,14 @@ Scan_Number(StmInf *pstm, Bool integer_only)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c = '\'';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (c < 0) /* \ newline EOF newline tab other error */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (c == -2) /* \ newline */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Unget_Last_Char; /* push back \n */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Pl_Stream_Ungetc('\\', pstm); /* push back \ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Pl_Stream_Ungetc('\'', pstm); /* push back ' */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (c < 0) /* \ newline EOF newline tab other error */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Unget_Last_Char;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -412,12 +418,14 @@ Scan_Number(StmInf *pstm, Bool integer_only)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pl_token.line = pstm->line_count + 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pl_token.col = pstm->line_pos + 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- err_msg = "character expected here";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pl_token.int_num = c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ radix_c = c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- radix = (c == 'b') ? (f = "01", 2) :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (c == 'o') ? (f = "01234567", 8)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : (f = "0123456789abcdefABCDEF", 16);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -430,6 +438,15 @@ Scan_Number(StmInf *pstm, Bool integer_only)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *p = '\0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* empty sequence after radix: maybe an operator beginnig with b or o or x:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * op(9,yfx,bop) then 0bop 2 is 0 bop 2 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (p == pl_token.name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Unget_Last_Char; /* push back last char */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Pl_Stream_Ungetc(radix_c, pstm); /* push back \ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pl_token.int_num = Str_To_PlLong(pl_token.name, &p, radix);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto push_back;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/BipsPl/stream_c.c b/src/BipsPl/stream_c.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index af65cd1..b769726 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/BipsPl/stream_c.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/BipsPl/stream_c.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -208,7 +208,7 @@ Pl_Open_3(WamWord source_sink_word, WamWord mode_word, WamWord stm_word)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WamWord word, tag_mask;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int atom;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int mode;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int mode = STREAM_MODE_READ; /* to avoid clang warning */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Bool text;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- StmProp prop;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *path;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1193,7 +1193,7 @@ Pl_Seek_4(WamWord sora_word, WamWord whence_word, WamWord offset_word,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int stm;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- StmInf *pstm;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int whence;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int whence = SEEK_SET; /* to avoid clang warning */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PlLong offset;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int atom;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PlLong p[4];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/EnginePl/engine1.c b/src/EnginePl/engine1.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 400dac4..d6acb33 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/EnginePl/engine1.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/EnginePl/engine1.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,7 +65,6 @@ WamWord *pl_ensure_reserved;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * global variable to ensure the stack is not removed. *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *-------------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static long x;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Pl_Call_Compiled(CodePtr codep)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -116,9 +115,12 @@ Pl_Call_Compiled(CodePtr codep)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pl_ensure_reserved = (WamWord *) rb; /* to avoid gcc warning */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(M_x86_64_darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- register WamWord *rb asm("%r12") = pl_reg_bank;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pl_ensure_reserved = (WamWord *) rb; /* to avoid gcc warning */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __llvm__ /* the above does not assign r12 now by Apple gcc = llvm clang */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ asm("movq _pl_reg_bank@GOTPCREL(%rip), %r12");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ asm("movq (%r12), %r12");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/Linedit/terminal.c b/src/Linedit/terminal.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 89c0b21..ef5f8a8 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/Linedit/terminal.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/Linedit/terminal.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -304,6 +304,7 @@ Parse_Env_Var(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fd_out = strtol(p, NULL, 10);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ q = buff;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while(*p && isprint(*p) && !isspace(*p))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *q++ = *p++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>