Hello community,
here is the log from the commit of package cdecl for openSUSE:Factory checked
in at 2020-01-22 22:45:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cdecl (Old)
and /work/SRC/openSUSE:Factory/.cdecl.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cdecl"
Wed Jan 22 22:45:01 2020 rev:13 rq:766170 version:6.8.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/cdecl/cdecl.changes 2020-01-13
22:23:06.810562455 +0100
+++ /work/SRC/openSUSE:Factory/.cdecl.new.26092/cdecl.changes 2020-01-22
22:45:08.552541539 +0100
@@ -1,0 +2,6 @@
+Tue Jan 21 22:24:31 UTC 2020 - Jan Engelhardt <jeng...@inai.de>
+
+- Update to release 6.8.1
+ * Reset lexer start-state
+
+-------------------------------------------------------------------
Old:
----
cdecl-6.8.tar.gz
New:
----
cdecl-6.8.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cdecl.spec ++++++
--- /var/tmp/diff_new_pack.8vvNyK/_old 2020-01-22 22:45:11.148542846 +0100
+++ /var/tmp/diff_new_pack.8vvNyK/_new 2020-01-22 22:45:11.188542867 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cdecl
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: cdecl
-Version: 6.8
+Version: 6.8.1
Release: 0
Summary: C/C++ function declaration translator
License: GPL-3.0-or-later
++++++ cdecl-6.8.tar.gz -> cdecl-6.8.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/ChangeLog new/cdecl-6.8.1/ChangeLog
--- old/cdecl-6.8/ChangeLog 2020-01-13 17:34:29.000000000 +0100
+++ new/cdecl-6.8.1/ChangeLog 2020-01-21 22:22:07.000000000 +0100
@@ -1,12 +1,19 @@
-2020-01-10 Paul J. Lucas <p...@lucasmail.org>
+2020-01-21 Paul J. Lucas <p...@lucasmail.org>
* NEWS, configure.ac: Updated version.
- * cdecl.1, help.c, help-c++.out, help-c.out, help_command-c++.out,
- help_command-c.out, help_commands-c++.out, help_commands-c.out: Reworked
- help to match new "set" command.
- * lexer.l: Added comment.
- * src/Makefile.am: Added (commented out) AM_LFLAGS.
- * src/Makefile.am, lexer.l, parser.y: Simplified set options.
+ * 00gnulib.m4, gnulib-common.m4, gnulib-comp.m4, zzgnulib.m4: Updated
+ GNUlib.
+
+2020-01-17 Paul J. Lucas <p...@lucasmail.org>
+
+ * c_sname.h: Tweaked comment.
+ * lexer.l: Added BEGIN( INITIAL ) to lexer_reset().
+
+2020-01-13 Paul J. Lucas <p...@lucasmail.org>
+
+ * NEWS, configure.ac, cdecl.1, src/Makefile.am, help.c, lexer.l, parser.y,
+ set.c, help-c++.out, help-c.out, help_command-c++.out, help_command-c.out,
+ help_commands-c++.out, help_commands-c.out: Now allowing set lang=<lang>.
2020-01-09 Paul J. Lucas <p...@lucasmail.org>
@@ -14,9 +21,6 @@
2020-01-07 Paul J. Lucas <p...@lucasmail.org>
- * help.c, lexer.l, parser.y, set.c, help-c++.out, help-c.out,
- help_command-c++.out, help_command-c.out, help_commands-c++.out,
- help_commands-c.out: Now allowing set lang=<lang>.
* help.c: Added explicit-int to set options in help.
2020-01-06 Paul J. Lucas <p...@lucasmail.org>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/Makefile.in new/cdecl-6.8.1/Makefile.in
--- old/cdecl-6.8/Makefile.in 2020-01-13 17:40:48.000000000 +0100
+++ new/cdecl-6.8.1/Makefile.in 2020-01-21 20:03:01.000000000 +0100
@@ -131,7 +131,7 @@
$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sysexits.m4 \
$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/warn-on-use.m4 \
$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/zzgnulib.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/NEWS new/cdecl-6.8.1/NEWS
--- old/cdecl-6.8/NEWS 2020-01-13 17:34:29.000000000 +0100
+++ new/cdecl-6.8.1/NEWS 2020-01-21 22:21:42.000000000 +0100
@@ -10,6 +10,13 @@
-------------------------------------------------------------------------------
+* Changes in Cdecl 6.8.1
+
+** Reset lexer start-state
+In 6.8, start states were added to the lexer. Resetting the lexer now includes
+also resetting the start state.
+
+
* Changes in Cdecl 6.8
** Added set lang=<lang>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/aclocal.m4 new/cdecl-6.8.1/aclocal.m4
--- old/cdecl-6.8/aclocal.m4 2020-01-13 17:40:47.000000000 +0100
+++ new/cdecl-6.8.1/aclocal.m4 2020-01-21 20:03:00.000000000 +0100
@@ -1189,3 +1189,4 @@
m4_include([m4/warn-on-use.m4])
m4_include([m4/wchar_t.m4])
m4_include([m4/wint_t.m4])
+m4_include([m4/zzgnulib.m4])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/configure new/cdecl-6.8.1/configure
--- old/cdecl-6.8/configure 2020-01-13 17:40:49.000000000 +0100
+++ new/cdecl-6.8.1/configure 2020-01-21 20:03:02.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for cdecl 6.8.
+# Generated by GNU Autoconf 2.69 for cdecl 6.8.1.
#
# Report bugs to <https://github.com/paul-j-lucas/cdecl/issues>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='cdecl'
PACKAGE_TARNAME='cdecl'
-PACKAGE_VERSION='6.8'
-PACKAGE_STRING='cdecl 6.8'
+PACKAGE_VERSION='6.8.1'
+PACKAGE_STRING='cdecl 6.8.1'
PACKAGE_BUGREPORT='https://github.com/paul-j-lucas/cdecl/issues'
PACKAGE_URL='https://github.com/paul-j-lucas/cdecl'
@@ -1804,7 +1804,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures cdecl 6.8 to adapt to many kinds of systems.
+\`configure' configures cdecl 6.8.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1874,7 +1874,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of cdecl 6.8:";;
+ short | recursive ) echo "Configuration of cdecl 6.8.1:";;
esac
cat <<\_ACEOF
@@ -1983,7 +1983,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-cdecl configure 6.8
+cdecl configure 6.8.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2526,7 +2526,9 @@
ac_fn_c_check_decl ()
{
ac_save_ac_compile="$ac_compile"
- ac_compile="$ac_compile_for_check_decl"
+ if test -n "$ac_compile_for_check_decl"; then
+ ac_compile="$ac_compile_for_check_decl"
+ fi
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
as_decl_name=`echo $2|sed 's/ *(.*//'`
as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
@@ -2749,7 +2751,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by cdecl $as_me 6.8, which was
+It was created by cdecl $as_me 6.8.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3623,7 +3625,7 @@
# Define the identity of the package.
PACKAGE='cdecl'
- VERSION='6.8'
+ VERSION='6.8.1'
cat >>confdefs.h <<_ACEOF
@@ -4629,6 +4631,80 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler is
clang" >&5
+$as_echo_n "checking whether the compiler is clang... " >&6; }
+if ${gl_cv_compiler_clang+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #ifdef __clang__
+ barfbarf
+ #endif
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_compiler_clang=no
+else
+ gl_cv_compiler_clang=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5
+$as_echo "$gl_cv_compiler_clang" >&6; }
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler option needed
when checking for declarations" >&5
+$as_echo_n "checking for compiler option needed when checking for
declarations... " >&6; }
+if ${gl_cv_compiler_check_decl_option+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test $gl_cv_compiler_clang = yes; then
+ save_ac_compile="$ac_compile"
+ ac_compile="$ac_compile -Werror=implicit-function-declaration"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_compiler_check_decl_option='-Werror=implicit-function-declaration'
+else
+ gl_cv_compiler_check_decl_option=none
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_compile="$save_ac_compile"
+ else
+ gl_cv_compiler_check_decl_option=none
+ fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$gl_cv_compiler_check_decl_option" >&5
+$as_echo "$gl_cv_compiler_check_decl_option" >&6; }
+ if test "x$gl_cv_compiler_check_decl_option" != xnone; then
+ ac_compile_for_check_decl="$ac_compile $gl_cv_compiler_check_decl_option"
+ else
+ ac_compile_for_check_decl="$ac_compile"
+ fi
+
+
depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc"
>&5
@@ -6588,6 +6664,7 @@
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor
supports include_next" >&5
$as_echo_n "checking whether the preprocessor supports include_next... " >&6; }
if ${gl_cv_have_include_next+:} false; then :
@@ -7253,76 +7330,6 @@
REPLACE_VSNPRINTF=0;
REPLACE_VSPRINTF=0;
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler is
clang" >&5
-$as_echo_n "checking whether the compiler is clang... " >&6; }
-if ${gl_cv_compiler_clang+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#ifdef __clang__
-barfbarf
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "barfbarf" >/dev/null 2>&1; then :
- gl_cv_compiler_clang=yes
-else
- gl_cv_compiler_clang=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5
-$as_echo "$gl_cv_compiler_clang" >&6; }
-
-
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler option needed
when checking for declarations" >&5
-$as_echo_n "checking for compiler option needed when checking for
declarations... " >&6; }
-if ${gl_cv_compiler_check_decl_option+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test $gl_cv_compiler_clang = yes; then
- save_ac_compile="$ac_compile"
- ac_compile="$ac_compile -Werror=implicit-function-declaration"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- gl_cv_compiler_check_decl_option='-Werror=implicit-function-declaration'
-else
- gl_cv_compiler_check_decl_option=none
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_compile="$save_ac_compile"
- else
- gl_cv_compiler_check_decl_option=none
- fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$gl_cv_compiler_check_decl_option" >&5
-$as_echo "$gl_cv_compiler_check_decl_option" >&6; }
- if test "x$gl_cv_compiler_check_decl_option" != xnone; then
- ac_compile_for_check_decl="$ac_compile $gl_cv_compiler_check_decl_option"
- else
- ac_compile_for_check_decl="$ac_compile"
- fi
-
ac_fn_c_check_decl "$LINENO" "getdelim" "ac_cv_have_decl_getdelim"
"$ac_includes_default"
if test "x$ac_cv_have_decl_getdelim" = xyes; then :
ac_have_decl=1
@@ -9748,6 +9755,7 @@
+
gl_source_base='lib'
@@ -11273,6 +11281,7 @@
+
gl_source_base='tests'
gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr
abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e
's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS
@@ -13292,7 +13301,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by cdecl $as_me 6.8, which was
+This file was extended by cdecl $as_me 6.8.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13359,7 +13368,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-cdecl config.status 6.8
+cdecl config.status 6.8.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/configure.ac new/cdecl-6.8.1/configure.ac
--- old/cdecl-6.8/configure.ac 2020-01-13 17:34:29.000000000 +0100
+++ new/cdecl-6.8.1/configure.ac 2020-01-21 20:02:56.000000000 +0100
@@ -20,7 +20,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
##
-AC_INIT([cdecl], [6.8],
[https://github.com/paul-j-lucas/cdecl/issues],,[https://github.com/paul-j-lucas/cdecl])
+AC_INIT([cdecl], [6.8.1],
[https://github.com/paul-j-lucas/cdecl/issues],,[https://github.com/paul-j-lucas/cdecl])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/lib/Makefile.in
new/cdecl-6.8.1/lib/Makefile.in
--- old/cdecl-6.8/lib/Makefile.in 2020-01-13 17:40:49.000000000 +0100
+++ new/cdecl-6.8.1/lib/Makefile.in 2020-01-21 20:03:01.000000000 +0100
@@ -160,7 +160,7 @@
$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sysexits.m4 \
$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/warn-on-use.m4 \
$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/zzgnulib.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/m4/00gnulib.m4
new/cdecl-6.8.1/m4/00gnulib.m4
--- old/cdecl-6.8/m4/00gnulib.m4 2020-01-06 20:17:10.000000000 +0100
+++ new/cdecl-6.8.1/m4/00gnulib.m4 2020-01-21 19:54:07.000000000 +0100
@@ -1,4 +1,4 @@
-# 00gnulib.m4 serial 4
+# 00gnulib.m4 serial 7
dnl Copyright (C) 2009-2020 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -48,24 +48,34 @@
# mode. As of clang 9.0, these "known" functions are identified through
# LIBBUILTIN invocations in the LLVM source file
# llvm/tools/clang/include/clang/Basic/Builtins.def.
+# It's not possible to AC_REQUIRE the extra tests from AC_CHECK_DECL,
+# because AC_CHECK_DECL, like other Autoconf built-ins, is not supposed
+# to AC_REQUIRE anything: some configure.ac files have their first
+# AC_CHECK_DECL executed conditionally. Therefore append the extra tests
+# to AC_PROG_CC.
AC_DEFUN([gl_COMPILER_CLANG],
[
- AC_REQUIRE([AC_PROG_CC])
+dnl AC_REQUIRE([AC_PROG_CC])
AC_CACHE_CHECK([whether the compiler is clang],
[gl_cv_compiler_clang],
- [AC_EGREP_CPP([barfbarf],[
-#ifdef __clang__
-barfbarf
-#endif
- ],
- [gl_cv_compiler_clang=yes],
- [gl_cv_compiler_clang=no])
+ [dnl Use _AC_COMPILE_IFELSE instead of AC_EGREP_CPP, to avoid error
+ dnl "circular dependency of AC_LANG_COMPILER(C)" if AC_PROG_CC has
+ dnl not yet been invoked.
+ _AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[
+ #ifdef __clang__
+ barfbarf
+ #endif
+ ]],[[]])
+ ],
+ [gl_cv_compiler_clang=no],
+ [gl_cv_compiler_clang=yes])
])
])
AC_DEFUN([gl_COMPILER_PREPARE_CHECK_DECL],
[
- AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([gl_COMPILER_CLANG])
+dnl AC_REQUIRE([AC_PROG_CC])
+dnl AC_REQUIRE([gl_COMPILER_CLANG])
AC_CACHE_CHECK([for compiler option needed when checking for declarations],
[gl_cv_compiler_check_decl_option],
[if test $gl_cv_compiler_clang = yes; then
@@ -73,7 +83,9 @@
dnl '-Werror=implicit-function-declaration'.
save_ac_compile="$ac_compile"
ac_compile="$ac_compile -Werror=implicit-function-declaration"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[]])],
+ dnl Use _AC_COMPILE_IFELSE instead of AC_COMPILE_IFELSE, to avoid a
+ dnl warning "AC_COMPILE_IFELSE was called before
AC_USE_SYSTEM_EXTENSIONS".
+ _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[]])],
[gl_cv_compiler_check_decl_option='-Werror=implicit-function-declaration'],
[gl_cv_compiler_check_decl_option=none])
ac_compile="$save_ac_compile"
@@ -88,17 +100,15 @@
fi
])
dnl Redefine _AC_CHECK_DECL_BODY so that it references
ac_compile_for_check_decl
-dnl instead of ac_compile.
+dnl instead of ac_compile. If, for whatever reason, the override of AC_PROG_CC
+dnl in zzgnulib.m4 is inactive, use the original ac_compile.
m4_define([_AC_CHECK_DECL_BODY],
[ ac_save_ac_compile="$ac_compile"
- ac_compile="$ac_compile_for_check_decl"]
+ if test -n "$ac_compile_for_check_decl"; then
+ ac_compile="$ac_compile_for_check_decl"
+ fi]
m4_defn([_AC_CHECK_DECL_BODY])[ ac_compile="$ac_save_ac_compile"
])
- ])
-dnl Redefine AC_CHECK_DECL so that it starts with
-dnl AC_REQUIRE([gl_COMPILER_PREPARE_CHECK_DECL]).
-m4_define([AC_CHECK_DECL],
- [AC_REQUIRE([gl_COMPILER_PREPARE_CHECK_DECL])]m4_defn([AC_CHECK_DECL]))
# gl_00GNULIB
# -----------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/m4/gnulib-common.m4
new/cdecl-6.8.1/m4/gnulib-common.m4
--- old/cdecl-6.8/m4/gnulib-common.m4 2020-01-06 20:17:10.000000000 +0100
+++ new/cdecl-6.8.1/m4/gnulib-common.m4 2020-01-21 19:54:07.000000000 +0100
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 46
+# gnulib-common.m4 serial 47
dnl Copyright (C) 2007-2020 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -12,6 +12,7 @@
dnl Use AC_REQUIRE here, so that the code is expanded once only.
AC_REQUIRE([gl_00GNULIB])
AC_REQUIRE([gl_COMMON_BODY])
+ AC_REQUIRE([gl_ZZGNULIB])
])
AC_DEFUN([gl_COMMON_BODY], [
AH_VERBATIM([_Noreturn],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/m4/gnulib-comp.m4
new/cdecl-6.8.1/m4/gnulib-comp.m4
--- old/cdecl-6.8/m4/gnulib-comp.m4 2020-01-06 20:17:10.000000000 +0100
+++ new/cdecl-6.8.1/m4/gnulib-comp.m4 2020-01-21 19:54:09.000000000 +0100
@@ -357,4 +357,5 @@
m4/warn-on-use.m4
m4/wchar_t.m4
m4/wint_t.m4
+ m4/zzgnulib.m4
])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/m4/zzgnulib.m4
new/cdecl-6.8.1/m4/zzgnulib.m4
--- old/cdecl-6.8/m4/zzgnulib.m4 1970-01-01 01:00:00.000000000 +0100
+++ new/cdecl-6.8.1/m4/zzgnulib.m4 2020-01-21 19:54:06.000000000 +0100
@@ -0,0 +1,23 @@
+# zzgnulib.m4 serial 1
+dnl Copyright (C) 2020 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This file must be named something that sorts after all other
+dnl package- or gnulib-provided .m4 files - at least for those packages
+dnl that redefine AC_PROG_CC.
+
+dnl Redefine AC_PROG_CC so that it ends with invocations of gl_COMPILER_CLANG
+dnl and gl_COMPILER_PREPARE_CHECK_DECL.
+m4_define([AC_PROG_CC],
+ m4_defn([AC_PROG_CC])[
+gl_COMPILER_CLANG
+gl_COMPILER_PREPARE_CHECK_DECL
+])
+
+# gl_ZZGNULIB
+# -----------
+# Witness macro that this file has been included. Needed to force
+# Automake to include this file after all other gnulib .m4 files.
+AC_DEFUN([gl_ZZGNULIB])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/man/Makefile.in
new/cdecl-6.8.1/man/Makefile.in
--- old/cdecl-6.8/man/Makefile.in 2020-01-13 17:40:49.000000000 +0100
+++ new/cdecl-6.8.1/man/Makefile.in 2020-01-21 20:03:01.000000000 +0100
@@ -131,7 +131,7 @@
$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sysexits.m4 \
$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/warn-on-use.m4 \
$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/zzgnulib.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/man/man1/Makefile.in
new/cdecl-6.8.1/man/man1/Makefile.in
--- old/cdecl-6.8/man/man1/Makefile.in 2020-01-13 17:40:49.000000000 +0100
+++ new/cdecl-6.8.1/man/man1/Makefile.in 2020-01-21 20:03:01.000000000
+0100
@@ -131,7 +131,7 @@
$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sysexits.m4 \
$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/warn-on-use.m4 \
$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/zzgnulib.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/src/Makefile.in
new/cdecl-6.8.1/src/Makefile.in
--- old/cdecl-6.8/src/Makefile.in 2020-01-13 17:40:49.000000000 +0100
+++ new/cdecl-6.8.1/src/Makefile.in 2020-01-21 20:03:01.000000000 +0100
@@ -135,7 +135,7 @@
$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sysexits.m4 \
$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/warn-on-use.m4 \
$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/zzgnulib.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/src/c_sname.h new/cdecl-6.8.1/src/c_sname.h
--- old/cdecl-6.8/src/c_sname.h 2020-01-07 05:46:42.000000000 +0100
+++ new/cdecl-6.8.1/src/c_sname.h 2020-01-17 16:56:08.000000000 +0100
@@ -60,7 +60,7 @@
* Appends \a name onto the end of \a sname.
*
* @param sname The scoped name to append to.
- * @param name The name to append.
+ * @param name The name to append. Ownership is taken.
*
* @sa c_sname_append_sname()
* @sa c_sname_prepend_name()
@@ -228,7 +228,7 @@
* Prepends \a name onto the beginning of \a sname.
*
* @param sname The scoped name to prepend to.
- * @param name The name to prepend.
+ * @param name The name to prepend. Ownership is taken.
*
* @sa c_sname_append_name()
* @sa c_sname_append_sname()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/src/lexer.c new/cdecl-6.8.1/src/lexer.c
--- old/cdecl-6.8/src/lexer.c 2020-01-13 17:41:19.000000000 +0100
+++ new/cdecl-6.8.1/src/lexer.c 2020-01-16 21:04:43.000000000 +0100
@@ -791,7 +791,7 @@
* @param BYTES_MAX The maximum number of bytes to read.
*/
#define YY_INPUT(BUF,BYTES_READ,BYTES_MAX) \
- (BYTES_READ) = (int)lexer_get_input( (BUF), (size_t)(BYTES_MAX) )
+ (BYTES_READ) = lexer_get_input( (BUF), (yy_size_t)(BYTES_MAX) )
/**
* This code is inserted by flex at the beginning of each rule to set the
@@ -1053,9 +1053,9 @@
* @param buf_capacity The capacity of \a buf.
* @return Returns the number of bytes read.
*/
-static size_t lexer_get_input( char *buf, size_t buf_capacity ) {
+static yy_size_t lexer_get_input( char *buf, yy_size_t buf_capacity ) {
assert( buf != NULL );
- size_t input_avail = input_len - input_sent;
+ yy_size_t input_avail = input_len - input_sent;
if ( input_avail == 0 ) {
static size_t input_capacity;
ssize_t bytes_read = getline( &input_buf, &input_capacity, yyin );
@@ -1063,7 +1063,7 @@
FERROR( yyin );
bytes_read = 0;
}
- input_avail = input_len = (size_t)bytes_read;
+ input_avail = input_len = (yy_size_t)bytes_read;
input_sent = 0;
}
//
@@ -1222,50 +1222,17 @@
return 1 /* done */;
}
-////////// extern functions ///////////////////////////////////////////////////
-
-char const* lexer_input_line( size_t *plen ) {
- if ( plen != NULL )
- *plen = input_len;
- return input_buf;
-}
-
-void lexer_loc( int *pline, int *pcolumn ) {
- assert( pline != NULL );
- assert( pcolumn != NULL );
-
- *pline = yylineno;
-
- if ( column == 0 )
- *pcolumn = column_newline;
- else if ( lexer_token[0] == '\n' )
- *pcolumn = column;
- else
- *pcolumn = column - (int)strlen( lexer_token );
-}
-
-void lexer_reset( bool hard_reset ) {
- if ( hard_reset ) {
- is_eof = false;
- yylineno = 0;
- }
- c_mode = C_ENGLISH_TO_GIBBERISH;
- input_len = input_sent = 0;
- lexer_find_typedef = true;
- newline();
-}
-
///////////////////////////////////////////////////////////////////////////////
/// @cond DOXYGEN_IGNORE
-#line 1262 "lexer.c"
+#line 1229 "lexer.c"
/*
* For the "set" command, we want to allow (almost) any character sequence for
* the command's options, so we use an exclusive start state.
*/
-#line 1268 "lexer.c"
+#line 1235 "lexer.c"
#define INITIAL 0
#define SET_COMMAND 1
@@ -1487,15 +1454,15 @@
}
{
-#line 631 "lexer.l"
+#line 598 "lexer.l"
-#line 633 "lexer.l"
+#line 600 "lexer.l"
/*
* Special case: if the _Atomic keyword is immediately followed
* by a '(', it is interpreted as a type specifier, not as a type
* qualifier.
*/
-#line 1498 "lexer.c"
+#line 1465 "lexer.c"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is
reached */
{
@@ -1572,7 +1539,7 @@
(yy_c_buf_p) = yy_cp = yy_bp + 7;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 638 "lexer.l"
+#line 605 "lexer.l"
{ SET_TOKEN; return Y_ATOMIC_SPEC; }
YY_BREAK
/*
@@ -1587,7 +1554,7 @@
*/
case 2:
YY_RULE_SETUP
-#line 650 "lexer.l"
+#line 617 "lexer.l"
{
SET_TOKEN;
@@ -1626,7 +1593,7 @@
*/
case 3:
YY_RULE_SETUP
-#line 686 "lexer.l"
+#line 653 "lexer.l"
{
SET_TOKEN;
c_sname_t sname;
@@ -1662,7 +1629,7 @@
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 719 "lexer.l"
+#line 686 "lexer.l"
{
SET_TOKEN;
@@ -1765,7 +1732,7 @@
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 819 "lexer.l"
+#line 786 "lexer.l"
{
SET_TOKEN;
char const *const c_literal = c_hyphenated_find( lexer_token );
@@ -1782,92 +1749,92 @@
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 833 "lexer.l"
+#line 800 "lexer.l"
{ SET_TOKEN; yylval.number = parse_int( 2 ); return Y_NUMBER; }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 834 "lexer.l"
+#line 801 "lexer.l"
{ SET_TOKEN; yylval.number = parse_int( 8 ); return Y_NUMBER; }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 835 "lexer.l"
+#line 802 "lexer.l"
{ SET_TOKEN; yylval.number = parse_int( 10 ); return Y_NUMBER; }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 836 "lexer.l"
+#line 803 "lexer.l"
{ SET_TOKEN; yylval.number = parse_int( 16 ); return Y_NUMBER; }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 838 "lexer.l"
+#line 805 "lexer.l"
{ SET_TOKEN_TO_AND_RETURN ( "[[", Y_LBRACKET2 ); }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 839 "lexer.l"
+#line 806 "lexer.l"
{ SET_TOKEN_TO_AND_RETURN ( "]]", Y_RBRACKET2 ); }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 841 "lexer.l"
+#line 808 "lexer.l"
{ SET_TOKEN_TO_AND_RETURN_IT( "[" ); }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 842 "lexer.l"
+#line 809 "lexer.l"
{ SET_TOKEN_TO_AND_RETURN_IT( "]" ); }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 844 "lexer.l"
+#line 811 "lexer.l"
{ SET_TOKEN_TO_AND_RETURN ( "[[", Y_LBRACKET2 ); }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 845 "lexer.l"
+#line 812 "lexer.l"
{ SET_TOKEN_TO_AND_RETURN ( "]]", Y_RBRACKET2 ); }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 846 "lexer.l"
+#line 813 "lexer.l"
{ SET_TOKEN_TO_AND_RETURN ( "^=", Y_CIRC_EQ ); }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 847 "lexer.l"
+#line 814 "lexer.l"
{ SET_TOKEN_TO_AND_RETURN ( "|=", Y_PIPE_EQ ); }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 848 "lexer.l"
+#line 815 "lexer.l"
{ SET_TOKEN_TO_AND_RETURN ( "||", Y_PIPE2 ); }
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 850 "lexer.l"
+#line 817 "lexer.l"
{ SET_TOKEN_TO_AND_RETURN ( "|", Y_PIPE ); }
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 851 "lexer.l"
+#line 818 "lexer.l"
{ SET_TOKEN_TO_AND_RETURN ( "^", Y_CIRC ); }
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 852 "lexer.l"
+#line 819 "lexer.l"
{ SET_TOKEN_TO_AND_RETURN_IT( "[" ); }
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 853 "lexer.l"
+#line 820 "lexer.l"
{ SET_TOKEN_TO_AND_RETURN_IT( "]" ); }
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 854 "lexer.l"
+#line 821 "lexer.l"
{ SET_TOKEN_TO_AND_RETURN ( "~", Y_TILDE ); }
YY_BREAK
/*
@@ -1881,232 +1848,232 @@
*/
case 24:
YY_RULE_SETUP
-#line 865 "lexer.l"
+#line 832 "lexer.l"
{ SET_TOKEN; return Y_COLON2_STAR ; }
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 866 "lexer.l"
+#line 833 "lexer.l"
{ SET_TOKEN; return Y_COLON2 ; }
YY_BREAK
/* Multi-character operators. */
case 26:
YY_RULE_SETUP
-#line 869 "lexer.l"
+#line 836 "lexer.l"
{ SET_TOKEN; return Y_EXCLAM_EQ ; }
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 870 "lexer.l"
+#line 837 "lexer.l"
{ SET_TOKEN; return Y_QUOTE2 ; }
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 871 "lexer.l"
+#line 838 "lexer.l"
{ SET_TOKEN; return Y_PERCENT_EQ ; }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 872 "lexer.l"
+#line 839 "lexer.l"
{ SET_TOKEN; return Y_AMPER2 ; }
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 873 "lexer.l"
+#line 840 "lexer.l"
{ SET_TOKEN; return Y_AMPER_EQ ; }
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 874 "lexer.l"
+#line 841 "lexer.l"
{ SET_TOKEN; return Y_STAR_EQ ; }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 875 "lexer.l"
+#line 842 "lexer.l"
{ SET_TOKEN; return Y_PLUS2 ; }
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 876 "lexer.l"
+#line 843 "lexer.l"
{ SET_TOKEN; return Y_PLUS_EQ ; }
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 877 "lexer.l"
+#line 844 "lexer.l"
{ SET_TOKEN; return Y_MINUS2 ; }
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 878 "lexer.l"
+#line 845 "lexer.l"
{ SET_TOKEN; return Y_MINUS_EQ ; }
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 879 "lexer.l"
+#line 846 "lexer.l"
{ SET_TOKEN; return Y_ARROW ; }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 880 "lexer.l"
+#line 847 "lexer.l"
{ SET_TOKEN; return Y_ARROW_STAR ; }
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 881 "lexer.l"
+#line 848 "lexer.l"
{ SET_TOKEN; return Y_DOT_STAR ; }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 882 "lexer.l"
+#line 849 "lexer.l"
{ SET_TOKEN; return Y_ELLIPSIS ; }
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 883 "lexer.l"
+#line 850 "lexer.l"
{ SET_TOKEN; return Y_SLASH_EQ ; }
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 884 "lexer.l"
+#line 851 "lexer.l"
{ SET_TOKEN; return Y_LESS2 ; }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 885 "lexer.l"
+#line 852 "lexer.l"
{ SET_TOKEN; return Y_LESS2_EQ ; }
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 886 "lexer.l"
+#line 853 "lexer.l"
{ SET_TOKEN; return Y_LESS_EQ ; }
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 887 "lexer.l"
+#line 854 "lexer.l"
{ SET_TOKEN; return Y_LESS_EQ_GREATER ; }
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 888 "lexer.l"
+#line 855 "lexer.l"
{ SET_TOKEN; return Y_EQ2 ; }
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 889 "lexer.l"
+#line 856 "lexer.l"
{ SET_TOKEN; return Y_GREATER_EQ ; }
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 890 "lexer.l"
+#line 857 "lexer.l"
{ SET_TOKEN; return Y_GREATER2 ; }
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 891 "lexer.l"
+#line 858 "lexer.l"
{ SET_TOKEN; return Y_GREATER2_EQ ; }
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 892 "lexer.l"
+#line 859 "lexer.l"
{ SET_TOKEN; return Y_HELP ; }
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 893 "lexer.l"
+#line 860 "lexer.l"
{ SET_TOKEN; return Y_QMARK_COLON ; }
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 894 "lexer.l"
+#line 861 "lexer.l"
{ SET_TOKEN; return Y_LBRACKET2 ; }
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 895 "lexer.l"
+#line 862 "lexer.l"
{ SET_TOKEN; return Y_RBRACKET2 ; }
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 896 "lexer.l"
+#line 863 "lexer.l"
{ SET_TOKEN; return Y_CIRC_EQ ; }
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 897 "lexer.l"
+#line 864 "lexer.l"
{ SET_TOKEN; return Y_PIPE_EQ ; }
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 898 "lexer.l"
+#line 865 "lexer.l"
{ SET_TOKEN; return Y_PIPE2 ; }
YY_BREAK
/* Single-character operators having alternative tokens. */
case 56:
YY_RULE_SETUP
-#line 901 "lexer.l"
+#line 868 "lexer.l"
{ SET_TOKEN; return Y_EXCLAM ; }
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 902 "lexer.l"
+#line 869 "lexer.l"
{ SET_TOKEN; return Y_AMPER ; }
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 903 "lexer.l"
+#line 870 "lexer.l"
{ SET_TOKEN; return Y_CIRC ; }
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 904 "lexer.l"
+#line 871 "lexer.l"
{ SET_TOKEN; return Y_PIPE ; }
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 905 "lexer.l"
+#line 872 "lexer.l"
{ SET_TOKEN; return Y_TILDE ; }
YY_BREAK
/* Single-character operators. */
case 61:
-#line 909 "lexer.l"
+#line 876 "lexer.l"
case 62:
-#line 910 "lexer.l"
+#line 877 "lexer.l"
case 63:
-#line 911 "lexer.l"
+#line 878 "lexer.l"
case 64:
-#line 912 "lexer.l"
+#line 879 "lexer.l"
case 65:
-#line 913 "lexer.l"
+#line 880 "lexer.l"
case 66:
-#line 914 "lexer.l"
+#line 881 "lexer.l"
case 67:
-#line 915 "lexer.l"
+#line 882 "lexer.l"
case 68:
-#line 916 "lexer.l"
+#line 883 "lexer.l"
case 69:
-#line 917 "lexer.l"
+#line 884 "lexer.l"
case 70:
-#line 918 "lexer.l"
+#line 885 "lexer.l"
case 71:
-#line 919 "lexer.l"
+#line 886 "lexer.l"
case 72:
-#line 920 "lexer.l"
+#line 887 "lexer.l"
case 73:
-#line 921 "lexer.l"
+#line 888 "lexer.l"
case 74:
-#line 922 "lexer.l"
+#line 889 "lexer.l"
case 75:
-#line 923 "lexer.l"
+#line 890 "lexer.l"
case 76:
-#line 924 "lexer.l"
+#line 891 "lexer.l"
case 77:
YY_RULE_SETUP
-#line 924 "lexer.l"
+#line 891 "lexer.l"
{ SET_TOKEN; return lexer_token[0] ; }
YY_BREAK
case 78:
YY_RULE_SETUP
-#line 926 "lexer.l"
+#line 893 "lexer.l"
{ /* ignore C-style comments */
for ( int c = input(), prev_c = '\0'; ;
prev_c = c, c = input() ) {
@@ -2122,29 +2089,29 @@
YY_BREAK
case 79:
YY_RULE_SETUP
-#line 939 "lexer.l"
+#line 906 "lexer.l"
; /* ignore C++-style comments */
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 940 "lexer.l"
+#line 907 "lexer.l"
; /* ignore preprocessor directives */
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 941 "lexer.l"
+#line 908 "lexer.l"
; /* ignore all other whitespace */
YY_BREAK
case 82:
/* rule 82 can match eol */
YY_RULE_SETUP
-#line 942 "lexer.l"
+#line 909 "lexer.l"
; /* eat escaped newlines */
YY_BREAK
case 83:
/* rule 83 can match eol */
YY_RULE_SETUP
-#line 944 "lexer.l"
+#line 911 "lexer.l"
{
SET_TOKEN;
newline();
@@ -2155,7 +2122,7 @@
case 84:
YY_RULE_SETUP
-#line 952 "lexer.l"
+#line 919 "lexer.l"
{
SET_TOKEN;
BEGIN( INITIAL );
@@ -2164,7 +2131,7 @@
YY_BREAK
case 85:
YY_RULE_SETUP
-#line 958 "lexer.l"
+#line 925 "lexer.l"
{
SET_TOKEN;
yylval.name = check_strdup( lexer_token );
@@ -2174,7 +2141,7 @@
case 86:
YY_RULE_SETUP
-#line 965 "lexer.l"
+#line 932 "lexer.l"
{
SET_TOKEN;
return Y_ERROR;
@@ -2182,7 +2149,7 @@
YY_BREAK
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(SET_COMMAND):
-#line 970 "lexer.l"
+#line 937 "lexer.l"
{
SET_TOKEN;
newline();
@@ -2201,10 +2168,10 @@
YY_BREAK
case 87:
YY_RULE_SETUP
-#line 986 "lexer.l"
+#line 953 "lexer.l"
ECHO;
YY_BREAK
-#line 2207 "lexer.c"
+#line 2174 "lexer.c"
case YY_END_OF_BUFFER:
{
@@ -3151,12 +3118,12 @@
#define YYTABLES_NAME "yytables"
-#line 986 "lexer.l"
+#line 953 "lexer.l"
/// @endcond
-///////////////////////////////////////////////////////////////////////////////
+////////// local functions ////////////////////////////////////////////////////
/**
* Called by flex only when there's a fatal error.
@@ -3186,6 +3153,40 @@
column += (int)yyleng;
}
+////////// extern functions ///////////////////////////////////////////////////
+
+char const* lexer_input_line( size_t *plen ) {
+ if ( plen != NULL )
+ *plen = input_len;
+ return input_buf;
+}
+
+void lexer_loc( int *pline, int *pcolumn ) {
+ assert( pline != NULL );
+ assert( pcolumn != NULL );
+
+ *pline = yylineno;
+
+ if ( column == 0 )
+ *pcolumn = column_newline;
+ else if ( lexer_token[0] == '\n' )
+ *pcolumn = column;
+ else
+ *pcolumn = column - (int)strlen( lexer_token );
+}
+
+void lexer_reset( bool hard_reset ) {
+ if ( hard_reset ) {
+ is_eof = false;
+ yylineno = 0;
+ }
+ BEGIN( INITIAL );
+ c_mode = C_ENGLISH_TO_GIBBERISH;
+ input_len = input_sent = 0;
+ lexer_find_typedef = true;
+ newline();
+}
+
///////////////////////////////////////////////////////////////////////////////
/* vim:set et sw=2 ts=2: */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/src/lexer.l new/cdecl-6.8.1/src/lexer.l
--- old/cdecl-6.8/src/lexer.l 2020-01-13 17:34:29.000000000 +0100
+++ new/cdecl-6.8.1/src/lexer.l 2020-01-16 21:04:42.000000000 +0100
@@ -132,7 +132,7 @@
* @param BYTES_MAX The maximum number of bytes to read.
*/
#define YY_INPUT(BUF,BYTES_READ,BYTES_MAX) \
- (BYTES_READ) = (int)lexer_get_input( (BUF), (size_t)(BYTES_MAX) )
+ (BYTES_READ) = lexer_get_input( (BUF), (yy_size_t)(BYTES_MAX) )
/**
* This code is inserted by flex at the beginning of each rule to set the
@@ -394,9 +394,9 @@
* @param buf_capacity The capacity of \a buf.
* @return Returns the number of bytes read.
*/
-static size_t lexer_get_input( char *buf, size_t buf_capacity ) {
+static yy_size_t lexer_get_input( char *buf, yy_size_t buf_capacity ) {
assert( buf != NULL );
- size_t input_avail = input_len - input_sent;
+ yy_size_t input_avail = input_len - input_sent;
if ( input_avail == 0 ) {
static size_t input_capacity;
ssize_t bytes_read = getline( &input_buf, &input_capacity, yyin );
@@ -404,7 +404,7 @@
FERROR( yyin );
bytes_read = 0;
}
- input_avail = input_len = (size_t)bytes_read;
+ input_avail = input_len = (yy_size_t)bytes_read;
input_sent = 0;
}
//
@@ -563,39 +563,6 @@
return 1 /* done */;
}
-////////// extern functions ///////////////////////////////////////////////////
-
-char const* lexer_input_line( size_t *plen ) {
- if ( plen != NULL )
- *plen = input_len;
- return input_buf;
-}
-
-void lexer_loc( int *pline, int *pcolumn ) {
- assert( pline != NULL );
- assert( pcolumn != NULL );
-
- *pline = yylineno;
-
- if ( column == 0 )
- *pcolumn = column_newline;
- else if ( lexer_token[0] == '\n' )
- *pcolumn = column;
- else
- *pcolumn = column - (int)strlen( lexer_token );
-}
-
-void lexer_reset( bool hard_reset ) {
- if ( hard_reset ) {
- is_eof = false;
- yylineno = 0;
- }
- c_mode = C_ENGLISH_TO_GIBBERISH;
- input_len = input_sent = 0;
- lexer_find_typedef = true;
- newline();
-}
-
///////////////////////////////////////////////////////////////////////////////
/// @cond DOXYGEN_IGNORE
@@ -986,7 +953,7 @@
/// @endcond
-///////////////////////////////////////////////////////////////////////////////
+////////// local functions ////////////////////////////////////////////////////
/**
* Called by flex only when there's a fatal error.
@@ -1016,5 +983,39 @@
column += (int)yyleng;
}
+////////// extern functions ///////////////////////////////////////////////////
+
+char const* lexer_input_line( size_t *plen ) {
+ if ( plen != NULL )
+ *plen = input_len;
+ return input_buf;
+}
+
+void lexer_loc( int *pline, int *pcolumn ) {
+ assert( pline != NULL );
+ assert( pcolumn != NULL );
+
+ *pline = yylineno;
+
+ if ( column == 0 )
+ *pcolumn = column_newline;
+ else if ( lexer_token[0] == '\n' )
+ *pcolumn = column;
+ else
+ *pcolumn = column - (int)strlen( lexer_token );
+}
+
+void lexer_reset( bool hard_reset ) {
+ if ( hard_reset ) {
+ is_eof = false;
+ yylineno = 0;
+ }
+ BEGIN( INITIAL );
+ c_mode = C_ENGLISH_TO_GIBBERISH;
+ input_len = input_sent = 0;
+ lexer_find_typedef = true;
+ newline();
+}
+
///////////////////////////////////////////////////////////////////////////////
/* vim:set et sw=2 ts=2: */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/src/print.h new/cdecl-6.8.1/src/print.h
--- old/cdecl-6.8/src/print.h 2020-01-07 00:10:49.000000000 +0100
+++ new/cdecl-6.8.1/src/print.h 2020-01-13 18:20:56.000000000 +0100
@@ -43,7 +43,7 @@
*
* @param loc The location of the error; may be null.
* @param format The `printf()` style format string.
- * @param ... `printf()` arguments.
+ * @param ... The `printf()` arguments.
*/
void print_error( c_loc_t const *loc, char const *format, ... );
@@ -55,7 +55,7 @@
* where `_____` is the hint.
*
* @param format The `printf()` style format string.
- * @param ... `printf()` arguments.
+ * @param ... The `printf()` arguments.
*/
void print_hint( char const *format, ... );
@@ -77,7 +77,7 @@
*
* @param loc The location of the warning; may be null.
* @param format The `printf()` style format string.
- * @param ... `printf()` arguments.
+ * @param ... The `printf()` arguments.
*/
void print_warning( c_loc_t const *loc, char const *format, ... );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/src/util.h new/cdecl-6.8.1/src/util.h
--- old/cdecl-6.8/src/util.h 2020-01-07 05:48:34.000000000 +0100
+++ new/cdecl-6.8.1/src/util.h 2020-01-13 18:21:30.000000000 +0100
@@ -101,6 +101,7 @@
* was one.
*
* @param STREAM The `FILE` stream to print to.
+ * @param ... The `fprintf()` arguments.
*/
#define FPRINTF(STREAM,...) \
IF_EXIT( fprintf( (STREAM), __VA_ARGS__ ) < 0, EX_IOERR )
@@ -181,7 +182,7 @@
* internal error.
*
* @param FORMAT The `printf()` format to use.
- * @param ... Ordinary `printf()` arguments.
+ * @param ... The `printf()` arguments.
*
* @sa PMESSAGE_EXIT
* @sa UNEXPECTED_INT_VALUE
@@ -220,6 +221,7 @@
*
* @param STATUS The status code to **exit**(3) with.
* @param FORMAT The `printf()` format to use.
+ * @param ... The `printf()` arguments.
*
* @sa INTERNAL_ERR
* @sa UNEXPECTED_INT_VALUE
@@ -231,7 +233,7 @@
/**
* Shorthand for printing to standard error.
*
- * @param ... Ordinary `printf()` arguments.
+ * @param ... The `printf()` arguments.
*
* @sa PUTC_ERR
* @sa PUTS_ERR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cdecl-6.8/test/Makefile.in
new/cdecl-6.8.1/test/Makefile.in
--- old/cdecl-6.8/test/Makefile.in 2020-01-13 17:40:49.000000000 +0100
+++ new/cdecl-6.8.1/test/Makefile.in 2020-01-21 20:03:01.000000000 +0100
@@ -140,7 +140,7 @@
$(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sysexits.m4 \
$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/warn-on-use.m4 \
$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/zzgnulib.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
