mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-08-08 02:05:14 +00:00
Compare commits
9
Commits
8d101c19d4
...
a47fb7838a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a47fb7838a | ||
|
|
089c39aab2 | ||
|
|
3841fe9de4 | ||
|
|
7024830c72 | ||
|
|
720943cff0 | ||
|
|
706ebd0fa5 | ||
|
|
ff9eee58c3 | ||
|
|
4f6785aee9 | ||
|
|
c3f856a430 |
+11
-4
@@ -1,10 +1,19 @@
|
||||
*.a
|
||||
*.bak
|
||||
*.diff
|
||||
*.exe
|
||||
*.log
|
||||
*.o
|
||||
*.orig
|
||||
*.out
|
||||
*.output
|
||||
*.pdf
|
||||
*.rej
|
||||
*.stamp
|
||||
*.tmp
|
||||
*.trs
|
||||
*~
|
||||
.deps
|
||||
.deps/
|
||||
.dirstamp
|
||||
/*.cache
|
||||
/*.flc
|
||||
@@ -20,11 +29,9 @@
|
||||
/Makefile.in
|
||||
/README-release
|
||||
/_*
|
||||
/a.exe
|
||||
/a.out
|
||||
/aclocal.m4
|
||||
/b.out
|
||||
/bison-*
|
||||
/build-aux/move-if-change
|
||||
/conf[0-9]*
|
||||
/confdefs*
|
||||
/config.log
|
||||
|
||||
@@ -8,6 +8,9 @@ GNU Bison NEWS
|
||||
|
||||
The C++ skeletons now expose copy and move operators for symbols.
|
||||
|
||||
The default (C) skeleton now supports user-defined semantic and location
|
||||
types that are trivially copyable in C++.
|
||||
|
||||
Fixed portability issues of the test suite on Solaris.
|
||||
|
||||
Fixed spurious warnings about input containing `m4_` or `b4_`.
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
scriptversion=2025-06-10.02; # UTC
|
||||
|
||||
# Copyright (C) 2003-2025 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2003-2026 Free Software Foundation, Inc.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
|
||||
|
||||
scriptlibversion=2025-06-10.02; # UTC
|
||||
scriptlibversion=2025-12-04.19; # UTC
|
||||
|
||||
# Copyright (C) 2003-2026 Free Software Foundation, Inc.
|
||||
#
|
||||
@@ -35,7 +35,7 @@ export LC_ALL
|
||||
# Honor $PERL, but work even if there is none.
|
||||
PERL="${PERL-perl}"
|
||||
|
||||
default_gnulib_url=https://git.savannah.gnu.org/git/gnulib.git
|
||||
default_gnulib_url=https://https.git.savannah.gnu.org/git/gnulib.git
|
||||
|
||||
# Copyright year, for the --version output.
|
||||
copyright_year=`echo "$scriptlibversion" | sed -e 's/[^0-9].*//'`
|
||||
@@ -824,7 +824,8 @@ autopull()
|
||||
elif check_exists git-merge-changelog; then
|
||||
echo "$0: initializing git-merge-changelog driver"
|
||||
git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
|
||||
git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
|
||||
git config merge.merge-changelog.driver \
|
||||
'git-merge-changelog %O %A %B "%Y"'
|
||||
else
|
||||
echo "$0: consider installing git-merge-changelog from gnulib"
|
||||
fi
|
||||
|
||||
+11
-1
@@ -34,6 +34,7 @@ gnulib_modules='
|
||||
libtextstyle-optional
|
||||
linked-list
|
||||
malloc-gnu
|
||||
mcel-prefer
|
||||
mbfile mbswidth
|
||||
obstack
|
||||
obstack-printf
|
||||
@@ -80,7 +81,16 @@ XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\
|
||||
--keyword=YY_ \\\
|
||||
'
|
||||
|
||||
gnulib_tool_option_extras='--symlink --conditional-dependencies --makefile-name=gnulib.mk --automake-subdir --automake-subdir-tests --po-base=gnulib-po --po-domain=bison'
|
||||
gnulib_tool_option_extras="\
|
||||
--automake-subdir\
|
||||
--automake-subdir-tests\
|
||||
--avoid=mbiterf\
|
||||
--conditional-dependencies\
|
||||
--makefile-name=gnulib.mk\
|
||||
--po-base=gnulib-po\
|
||||
--po-domain=bison\
|
||||
--symlink\
|
||||
"
|
||||
|
||||
gnulib_extra_files="$gnulib_extra_files build-aux/move-if-change"
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
/config.guess
|
||||
/config.libpath
|
||||
/config.rpath
|
||||
/config.rpath~
|
||||
/config.sub
|
||||
/depcomp
|
||||
/do-release-commit-and-tag
|
||||
|
||||
@@ -307,6 +307,10 @@ static YYLTYPE yyloc_default][]b4_yyloc_default;])[
|
||||
# include <setjmp.h>
|
||||
# define YYJMP_BUF jmp_buf
|
||||
# define YYSETJMP(Env) setjmp (Env)
|
||||
/* Pacify GCC <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=21161>. */
|
||||
#if defined __GNUC__ && 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
|
||||
# pragma GCC diagnostic ignored "-Wclobbered"
|
||||
#endif
|
||||
/* Pacify Clang and ICC. */
|
||||
# define YYLONGJMP(Env, Val) \
|
||||
do { \
|
||||
|
||||
@@ -483,6 +483,10 @@ namespace
|
||||
# include <setjmp.h>
|
||||
# define YYJMP_BUF jmp_buf
|
||||
# define YYSETJMP(Env) setjmp (Env)
|
||||
/* Pacify GCC <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=21161>. */
|
||||
#if defined __GNUC__ && 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
|
||||
# pragma GCC diagnostic ignored "-Wclobbered"
|
||||
#endif
|
||||
/* Pacify Clang and ICC. */
|
||||
# define YYLONGJMP(Env, Val) \
|
||||
do { \
|
||||
|
||||
@@ -843,6 +843,7 @@ m4_if(b4_prefix, [yy], [],
|
||||
int
|
||||
]b4_parser_class[::parse ()
|
||||
{
|
||||
YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
|
||||
int yyn;
|
||||
/// Length of the RHS of the rule being reduced.
|
||||
int yylen = 0;
|
||||
@@ -987,7 +988,6 @@ b4_dollar_popdef])[]dnl
|
||||
yyreduce:
|
||||
yylen = yyr2_[yyn];
|
||||
{
|
||||
YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
|
||||
stack_symbol_type yylhs;
|
||||
yylhs.state = yy_lr_goto_state_ (yystack_[yylen].state, yyr1_[yyn]);]b4_variant_if([[
|
||||
/* Variants are always initialized to an empty instance of the
|
||||
@@ -1040,7 +1040,6 @@ b4_dollar_popdef])[]dnl
|
||||
|
||||
// Shift the result of the reduction.
|
||||
yypush_ (YY_NULLPTR, YY_MOVE (yylhs));
|
||||
YY_IGNORE_MAYBE_UNINITIALIZED_END
|
||||
}
|
||||
goto yynewstate;
|
||||
|
||||
@@ -1181,6 +1180,7 @@ b4_dollar_popdef])[]dnl
|
||||
}
|
||||
|
||||
return yyresult;
|
||||
YY_IGNORE_MAYBE_UNINITIALIZED_END
|
||||
}
|
||||
#if YY_EXCEPTIONS
|
||||
catch (...)
|
||||
|
||||
+21
-4
@@ -581,10 +581,27 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
|
||||
# define YYCOPY_NEEDED 1]])[
|
||||
#endif /* ]b4_lac_if([[1]], [b4_parse_error_case([simple], [[!defined yyoverflow]], [[1]])])[ */
|
||||
|
||||
#if (! defined yyoverflow \
|
||||
&& (! defined __cplusplus \
|
||||
|| (]b4_locations_if([[defined ]b4_api_PREFIX[LTYPE_IS_TRIVIAL && ]b4_api_PREFIX[LTYPE_IS_TRIVIAL \
|
||||
&& ]])[defined ]b4_api_PREFIX[STYPE_IS_TRIVIAL && ]b4_api_PREFIX[STYPE_IS_TRIVIAL)))
|
||||
#ifndef yyoverflow
|
||||
/* In C++, ]b4_api_PREFIX[STYPE must be trivially copyable.
|
||||
If ]b4_api_PREFIX[STYPE_IS_TRIVIAL, this is already known.
|
||||
Otherwise check this if easy, as in newer C++ compilers.]b4_locations_if([[
|
||||
Likewise for ]b4_api_PREFIX[LTYPE.]])[ */
|
||||
# if (! (]b4_locations_if([[defined ]b4_api_PREFIX[LTYPE_IS_TRIVIAL && ]b4_api_PREFIX[LTYPE_IS_TRIVIAL \
|
||||
&& ]])[defined ]b4_api_PREFIX[STYPE_IS_TRIVIAL && ]b4_api_PREFIX[STYPE_IS_TRIVIAL) \
|
||||
&& defined __cplusplus && 201103 <= __cplusplus \
|
||||
&& !(defined _GLIBCXX_RELEASE \
|
||||
? _GLIBCXX_RELEASE < 5 \
|
||||
: defined __GLIBCXX__) \
|
||||
&& defined __has_include)
|
||||
# if __has_include (<type_traits>)
|
||||
# include <type_traits>
|
||||
]b4_locations_if(
|
||||
[[static_assert (std::is_trivially_copyable<]b4_api_PREFIX[LTYPE>::value,
|
||||
"Bison error: api.location.type is not trivially copyable");
|
||||
]])[static_assert (std::is_trivially_copyable<]b4_api_PREFIX[STYPE>::value,
|
||||
"Bison error: api.value.type is not trivially copyable");
|
||||
# endif
|
||||
# endif
|
||||
|
||||
/* A type that is properly aligned for any stack member. */
|
||||
union yyalloc
|
||||
|
||||
+2
-11
@@ -8,27 +8,18 @@
|
||||
#/bison.cp
|
||||
#/bison.cps
|
||||
#/bison.toc
|
||||
|
||||
/*~
|
||||
/.dirstamp
|
||||
*.dvi
|
||||
*.ps
|
||||
/bison.1
|
||||
/bison.dvi
|
||||
/bison.help
|
||||
/bison.html
|
||||
/bison.info
|
||||
/bison.info.bak
|
||||
/bison.log
|
||||
/bison.pdf
|
||||
/bison.ps
|
||||
/cross-options.texi
|
||||
/figs/*.eps
|
||||
/figs/*.svg
|
||||
/gendocs_template
|
||||
/gendocs_template_min
|
||||
/gpl-3.0.texi
|
||||
/refcard.dvi
|
||||
/refcard.log
|
||||
/refcard.ps
|
||||
/relocatable.texi
|
||||
/stamp-vti
|
||||
/version.texi
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
*.c
|
||||
*.cc
|
||||
*.class
|
||||
*.h
|
||||
*.hh
|
||||
!/c++/glr/ast.hh
|
||||
*.java
|
||||
*.ll
|
||||
/c/bistromathic/bistromathic
|
||||
/c/calc/calc
|
||||
/c/glr/c++-types
|
||||
/c/lexcalc/lexcalc
|
||||
/c/pushcalc/calc
|
||||
@@ -1 +1,5 @@
|
||||
/glr/c++-types
|
||||
/simple
|
||||
/simple.yy
|
||||
/variant
|
||||
/variant-11
|
||||
|
||||
@@ -1,19 +1,2 @@
|
||||
/*.o
|
||||
/*.tmp
|
||||
/.deps
|
||||
/calc++
|
||||
/calc++.cc
|
||||
/calc++.exe
|
||||
/calc.stamp
|
||||
/driver.cc
|
||||
/driver.hh
|
||||
/location.hh
|
||||
/parser.cc
|
||||
/parser.hh
|
||||
/parser.output
|
||||
/parser.stamp
|
||||
/parser.yy
|
||||
/position.hh
|
||||
/scanner.cc
|
||||
/scanner.ll
|
||||
/stack.hh
|
||||
|
||||
@@ -1,11 +1,2 @@
|
||||
/*.o
|
||||
/*.tmp
|
||||
/.deps
|
||||
/calc.h
|
||||
/mfcalc
|
||||
/mfcalc.c
|
||||
/mfcalc.exe
|
||||
/mfcalc.h
|
||||
/mfcalc.output
|
||||
/mfcalc.stamp
|
||||
/mfcalc.y
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
/scan.c
|
||||
/scan.h
|
||||
/reccalc
|
||||
|
||||
@@ -1,7 +1,2 @@
|
||||
/calc.h
|
||||
/rpcalc
|
||||
/rpcalc.c
|
||||
/rpcalc.h
|
||||
/rpcalc.output
|
||||
/rpcalc.stamp
|
||||
/rpcalc.y
|
||||
|
||||
+1
-1
Submodule gnulib updated: 2410984b5b...ca6357994b
@@ -17,5 +17,4 @@
|
||||
/quot.sed
|
||||
/remove-potcdate.sed
|
||||
/remove-potcdate.sin
|
||||
/remove-potcdate.sin~
|
||||
/stamp-po
|
||||
|
||||
+25
-16
@@ -1,9 +1,3 @@
|
||||
/*.a
|
||||
/*.bak
|
||||
/*.o
|
||||
/*~
|
||||
/.deps
|
||||
/.dirstamp
|
||||
/_Noreturn.h
|
||||
/access.c
|
||||
/alloca.h
|
||||
@@ -27,8 +21,6 @@
|
||||
/basename.c
|
||||
/binary-io.c
|
||||
/binary-io.h
|
||||
/bitrotate.c
|
||||
/bitrotate.h
|
||||
/bitset.c
|
||||
/bitset.h
|
||||
/bitset/
|
||||
@@ -39,7 +31,6 @@
|
||||
/c-ctype.h
|
||||
/c-strcase.h
|
||||
/c-strcasecmp.c
|
||||
/c-strcaseeq.h
|
||||
/c-strncasecmp.c
|
||||
/c-strtod.c
|
||||
/c-strtod.h
|
||||
@@ -226,10 +217,6 @@
|
||||
/iconv_open-aix.h
|
||||
/iconv_open-hpux.gperf
|
||||
/iconv_open-hpux.h
|
||||
/iconv_open-irix.gperf
|
||||
/iconv_open-irix.h
|
||||
/iconv_open-osf.gperf
|
||||
/iconv_open-osf.h
|
||||
/iconv_open-solaris.gperf
|
||||
/iconv_open-solaris.h
|
||||
/iconv_open-zos.gperf
|
||||
@@ -243,6 +230,7 @@
|
||||
/intprops.h
|
||||
/inttypes.h
|
||||
/inttypes.in.h
|
||||
/isinf.c
|
||||
/isnan.c
|
||||
/isnand-nolibm.h
|
||||
/isnand.c
|
||||
@@ -250,6 +238,8 @@
|
||||
/isnanf.c
|
||||
/isnanl-nolibm.h
|
||||
/isnanl.c
|
||||
/issymlink.c
|
||||
/issymlink.h
|
||||
/iswblank.c
|
||||
/iswdigit.c
|
||||
/iswpunct.c
|
||||
@@ -279,8 +269,6 @@
|
||||
/mbchar.h
|
||||
/mbfile.c
|
||||
/mbfile.h
|
||||
/mbiterf.c
|
||||
/mbiterf.h
|
||||
/mbrtoc32.c
|
||||
/mbrtowc-impl-utf8.h
|
||||
/mbrtowc-impl.h
|
||||
@@ -292,8 +280,11 @@
|
||||
/mbszero.c
|
||||
/mbtowc-lock.c
|
||||
/mbtowc-lock.h
|
||||
/mcel.c
|
||||
/mcel.h
|
||||
/memchr.c
|
||||
/memchr.valgrind
|
||||
/memeq.c
|
||||
/mempcpy.c
|
||||
/memrchr.c
|
||||
/minmax.h
|
||||
@@ -337,6 +328,7 @@
|
||||
/pthread-once.c
|
||||
/pthread.h
|
||||
/pthread.in.h
|
||||
/pthread_sigmask.c
|
||||
/quote.h
|
||||
/quotearg.c
|
||||
/quotearg.h
|
||||
@@ -370,6 +362,8 @@
|
||||
/sig-handler.c
|
||||
/sig-handler.h
|
||||
/sigaction.c
|
||||
/sigdelay.c
|
||||
/sigdelay.h
|
||||
/signal.h
|
||||
/signal.in.h
|
||||
/signbitd.c
|
||||
@@ -404,14 +398,21 @@
|
||||
/stat-w32.c
|
||||
/stat-w32.h
|
||||
/stat.c
|
||||
/stdbit.h
|
||||
/stdbit.in.h
|
||||
/stdbool.h
|
||||
/stdc_rotate_left.c
|
||||
/stdc_rotate_right.c
|
||||
/stdckdint.h
|
||||
/stdckdint.in.h
|
||||
/stdcountof.h
|
||||
/stdcountof.in.h
|
||||
/stddef.h
|
||||
/stddef.in.h
|
||||
/stdint.h
|
||||
/stdint.in.h
|
||||
/stdio--.h
|
||||
/stdio-consolesafe.c
|
||||
/stdio-impl.h
|
||||
/stdio-read.c
|
||||
/stdio-safer.h
|
||||
@@ -426,7 +427,8 @@
|
||||
/strchrnul.c
|
||||
/strchrnul.valgrind
|
||||
/strdup.c
|
||||
/streq.h
|
||||
/streq-opt.h
|
||||
/streq.c
|
||||
/strerror-override.c
|
||||
/strerror-override.h
|
||||
/strerror.c
|
||||
@@ -438,6 +440,7 @@
|
||||
/stripslash.c
|
||||
/strndup.c
|
||||
/strnlen.c
|
||||
/strnul.c
|
||||
/strtod.c
|
||||
/strverscmp.c
|
||||
/sys/
|
||||
@@ -452,6 +455,10 @@
|
||||
/termios.in.h
|
||||
/textstyle.h
|
||||
/textstyle.in.h
|
||||
/thread-creators.gperf
|
||||
/thread-creators.h
|
||||
/thread-optim-proto.c
|
||||
/thread-optim.c
|
||||
/thread-optim.h
|
||||
/time.h
|
||||
/time.in.h
|
||||
@@ -520,6 +527,8 @@
|
||||
/windows-rwlock.h
|
||||
/windows-spawn.c
|
||||
/windows-spawn.h
|
||||
/windows-spin.c
|
||||
/windows-spin.h
|
||||
/windows-tls.c
|
||||
/windows-tls.h
|
||||
/xalloc-die.c
|
||||
|
||||
+9
-3
@@ -1,4 +1,3 @@
|
||||
/*~
|
||||
/00gnulib.m4
|
||||
/__inline.m4
|
||||
/absolute-header.m4
|
||||
@@ -15,6 +14,7 @@
|
||||
/calloc.m4
|
||||
/canonicalize.m4
|
||||
/chdir-long.m4
|
||||
/check-math-lib.m4
|
||||
/clock_time.m4
|
||||
/close.m4
|
||||
/closedir.m4
|
||||
@@ -39,7 +39,6 @@
|
||||
/extensions-aix.m4
|
||||
/extensions.m4
|
||||
/extern-inline.m4
|
||||
/extern-inline.m4~
|
||||
/fatal-signal.m4
|
||||
/fchdir.m4
|
||||
/fclose.m4
|
||||
@@ -76,6 +75,7 @@
|
||||
/getprogname.m4
|
||||
/getrusage.m4
|
||||
/gettext.m4
|
||||
/gettext_h.m4
|
||||
/gettime.m4
|
||||
/gettimeofday.m4
|
||||
/glibc2.m4
|
||||
@@ -102,6 +102,7 @@
|
||||
/inttypes-pri.m4
|
||||
/inttypes.m4
|
||||
/inttypes_h.m4
|
||||
/isinf.m4
|
||||
/isnan.m4
|
||||
/isnand.m4
|
||||
/isnanf.m4
|
||||
@@ -121,6 +122,7 @@
|
||||
/lib-ld.m4
|
||||
/lib-link.m4
|
||||
/lib-prefix.m4
|
||||
/libdl.m4
|
||||
/libtextstyle-optional.m4
|
||||
/libtextstyle.m4
|
||||
/libunistring-base.m4
|
||||
@@ -140,13 +142,13 @@
|
||||
/math_h.m4
|
||||
/mbchar.m4
|
||||
/mbfile.m4
|
||||
/mbiter.m4
|
||||
/mbrtoc32.m4
|
||||
/mbrtowc.m4
|
||||
/mbsinit.m4
|
||||
/mbstate_t.m4
|
||||
/mbswidth.m4
|
||||
/memchr.m4
|
||||
/memeq.m4
|
||||
/mempcpy.m4
|
||||
/memrchr.m4
|
||||
/minmax.m4
|
||||
@@ -185,6 +187,7 @@
|
||||
/pthread-spin.m4
|
||||
/pthread_h.m4
|
||||
/pthread_rwlock_rdlock.m4
|
||||
/pthread_sigmask.m4
|
||||
/quote.m4
|
||||
/quotearg.m4
|
||||
/raise.m4
|
||||
@@ -220,7 +223,9 @@
|
||||
/stat.m4
|
||||
/std-gnu11.m4
|
||||
/stdalign.m4
|
||||
/stdbit_h.m4
|
||||
/stdckdint_h.m4
|
||||
/stdcountof_h.m4
|
||||
/stddef_h.m4
|
||||
/stdint.m4
|
||||
/stdint_h.m4
|
||||
@@ -230,6 +235,7 @@
|
||||
/stpncpy.m4
|
||||
/strchrnul.m4
|
||||
/strdup.m4
|
||||
/streq.m4
|
||||
/strerror.m4
|
||||
/strerror_r.m4
|
||||
/string_h.m4
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
/*.gmo
|
||||
/*.po
|
||||
/*~
|
||||
/.reference
|
||||
/LINGUAS
|
||||
/Makefile
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
/*.gmo
|
||||
/*.po
|
||||
/*~
|
||||
/.reference
|
||||
/LINGUAS
|
||||
/Makefile
|
||||
|
||||
@@ -1,9 +1,4 @@
|
||||
/*.flc
|
||||
/*.log
|
||||
/*.o
|
||||
/*.output
|
||||
/.deps
|
||||
/.dirstamp
|
||||
/bison
|
||||
/bison.exe
|
||||
/scan-code.c
|
||||
|
||||
+7
-8
@@ -193,7 +193,7 @@ muscle_grow (const char *key, const char *val,
|
||||
obstack_sgrow (&muscle_obstack, terminator);
|
||||
|
||||
{
|
||||
char const *new_val = obstack_finish0 (&muscle_obstack);
|
||||
char *new_val = obstack_finish0 (&muscle_obstack);
|
||||
entry->value = entry->storage = xstrdup (new_val);
|
||||
obstack_free (&muscle_obstack, new_val);
|
||||
}
|
||||
@@ -211,7 +211,7 @@ muscle_syncline_grow (char const *key, location loc)
|
||||
obstack_quote (&muscle_obstack,
|
||||
quotearg_style (c_quoting_style, map_file_name (loc.start.file)));
|
||||
obstack_sgrow (&muscle_obstack, ")dnl\n[");
|
||||
char const *extension = obstack_finish0 (&muscle_obstack);
|
||||
char *extension = obstack_finish0 (&muscle_obstack);
|
||||
muscle_grow (key, extension, "", "");
|
||||
obstack_free (&muscle_obstack, extension);
|
||||
}
|
||||
@@ -239,7 +239,7 @@ muscle_pair_list_grow (const char *muscle,
|
||||
obstack_sgrow (&muscle_obstack, ", ");
|
||||
obstack_quote (&muscle_obstack, a2);
|
||||
obstack_sgrow (&muscle_obstack, "]");
|
||||
char const *pair = obstack_finish0 (&muscle_obstack);
|
||||
char *pair = obstack_finish0 (&muscle_obstack);
|
||||
muscle_grow (muscle, pair, ",\n", "");
|
||||
obstack_free (&muscle_obstack, pair);
|
||||
}
|
||||
@@ -275,7 +275,7 @@ muscle_boundary_grow (char const *key, boundary bound)
|
||||
obstack_sgrow (&muscle_obstack, "[[");
|
||||
obstack_escape (&muscle_obstack, bound.file);
|
||||
obstack_printf (&muscle_obstack, ":%d.%d@@%d]]", bound.line, bound.column, bound.byte);
|
||||
char const *extension = obstack_finish0 (&muscle_obstack);
|
||||
char *extension = obstack_finish0 (&muscle_obstack);
|
||||
muscle_grow (key, extension, "", "");
|
||||
obstack_free (&muscle_obstack, extension);
|
||||
}
|
||||
@@ -326,7 +326,7 @@ string_decode (char const *key)
|
||||
break;
|
||||
}
|
||||
} while (*value++);
|
||||
char const *value_decoded = obstack_finish (&muscle_obstack);
|
||||
char *value_decoded = obstack_finish (&muscle_obstack);
|
||||
char *res = xstrdup (value_decoded);
|
||||
obstack_free (&muscle_obstack, value_decoded);
|
||||
return res;
|
||||
@@ -407,16 +407,15 @@ define_directive (char const *assignment,
|
||||
muscle_kind kind,
|
||||
char const *value)
|
||||
{
|
||||
char *eq = strchr (assignment, '=');
|
||||
char const *fmt
|
||||
= eq || !value || !*value ? "%%define %s"
|
||||
= strchr (assignment, '=') || !value || !*value ? "%%define %s"
|
||||
: kind == muscle_code ? "%%define %s {%s}"
|
||||
: kind == muscle_string ? "%%define %s \"%s\""
|
||||
: "%%define %s %s";
|
||||
char *res = xmalloc (strlen (fmt) + strlen (assignment)
|
||||
+ (value ? strlen (value) : 0));
|
||||
sprintf (res, fmt, assignment, value);
|
||||
eq = strchr (res, '=');
|
||||
char *eq = strchr (res, '=');
|
||||
if (eq)
|
||||
*eq = eq[1] ? ' ' : '\0';
|
||||
return res;
|
||||
|
||||
+1
-1
Submodule submodules/autoconf updated: 13698e2554...528ce663bc
@@ -1,4 +1,3 @@
|
||||
/*.output
|
||||
/atconfig
|
||||
/atlocal
|
||||
/bison
|
||||
|
||||
Reference in New Issue
Block a user