Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/byacc/dist merge conflicts
details: https://anonhg.NetBSD.org/src/rev/b66e71271014
branches: trunk
changeset: 446868:b66e71271014
user: christos <christos%NetBSD.org@localhost>
date: Sun Dec 23 15:38:53 2018 +0000
description:
merge conflicts
diffstat:
external/bsd/byacc/dist/btyaccpar.c | 13 +-
external/bsd/byacc/dist/btyaccpar.skel | 11 +-
external/bsd/byacc/dist/closure.c | 8 +-
external/bsd/byacc/dist/config.guess | 576 +++---
external/bsd/byacc/dist/config.sub | 249 +-
external/bsd/byacc/dist/defs.h | 52 +-
external/bsd/byacc/dist/error.c | 8 +-
external/bsd/byacc/dist/graph.c | 7 +-
external/bsd/byacc/dist/lalr.c | 10 +-
external/bsd/byacc/dist/lr0.c | 8 +-
external/bsd/byacc/dist/main.c | 13 +-
external/bsd/byacc/dist/mkpar.c | 8 +-
external/bsd/byacc/dist/output.c | 55 +-
external/bsd/byacc/dist/reader.c | 125 +-
external/bsd/byacc/dist/symtab.c | 8 +-
external/bsd/byacc/dist/test/btyacc/btyacc_calc1.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/btyacc_demo.tab.c | 165 +-
external/bsd/byacc/dist/test/btyacc/btyacc_demo2.error | 1 -
external/bsd/byacc/dist/test/btyacc/btyacc_demo2.tab.c | 17 -
external/bsd/byacc/dist/test/btyacc/btyacc_demo2.tab.h | 2 -
external/bsd/byacc/dist/test/btyacc/btyacc_destroy1.tab.c | 55 +-
external/bsd/byacc/dist/test/btyacc/btyacc_destroy2.tab.c | 55 +-
external/bsd/byacc/dist/test/btyacc/btyacc_destroy3.tab.c | 55 +-
external/bsd/byacc/dist/test/btyacc/calc.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/calc1.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/calc2.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/calc3.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/code_calc.code.c | 53 +-
external/bsd/byacc/dist/test/btyacc/code_debug.c | 1127 -------------
external/bsd/byacc/dist/test/btyacc/code_debug.h | 8 -
external/bsd/byacc/dist/test/btyacc/code_debug.i | 60 -
external/bsd/byacc/dist/test/btyacc/code_debug.output | 34 -
external/bsd/byacc/dist/test/btyacc/code_error.code.c | 51 +-
external/bsd/byacc/dist/test/btyacc/empty.tab.c | 51 +-
external/bsd/byacc/dist/test/btyacc/err_inherit3.tab.c | 59 +-
external/bsd/byacc/dist/test/btyacc/err_inherit4.tab.c | 59 +-
external/bsd/byacc/dist/test/btyacc/err_syntax10.tab.c | 51 +-
external/bsd/byacc/dist/test/btyacc/err_syntax11.tab.c | 51 +-
external/bsd/byacc/dist/test/btyacc/err_syntax12.tab.c | 51 +-
external/bsd/byacc/dist/test/btyacc/err_syntax18.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/err_syntax20.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/error.tab.c | 51 +-
external/bsd/byacc/dist/test/btyacc/expr.oxout.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/grammar.tab.c | 254 +-
external/bsd/byacc/dist/test/btyacc/inherit0.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/inherit1.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/inherit2.tab.c | 59 +-
external/bsd/byacc/dist/test/btyacc/ok_syntax1.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/pure_calc.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/pure_error.tab.c | 51 +-
external/bsd/byacc/dist/test/btyacc/quote_calc-s.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/quote_calc.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/quote_calc2-s.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/quote_calc2.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/quote_calc3-s.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/quote_calc3.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/quote_calc4-s.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/quote_calc4.tab.c | 53 +-
external/bsd/byacc/dist/test/btyacc/rename_debug.c | 51 +-
external/bsd/byacc/dist/test/btyacc/varsyntax_calc1.tab.c | 53 +-
external/bsd/byacc/dist/test/yacc/calc.tab.c | 10 +-
external/bsd/byacc/dist/test/yacc/calc1.tab.c | 10 +-
external/bsd/byacc/dist/test/yacc/calc2.tab.c | 10 +-
external/bsd/byacc/dist/test/yacc/calc3.tab.c | 10 +-
external/bsd/byacc/dist/test/yacc/code_calc.code.c | 10 +-
external/bsd/byacc/dist/test/yacc/code_error.code.c | 8 +-
external/bsd/byacc/dist/test/yacc/empty.tab.c | 8 +-
external/bsd/byacc/dist/test/yacc/err_syntax10.tab.c | 8 +-
external/bsd/byacc/dist/test/yacc/err_syntax11.tab.c | 8 +-
external/bsd/byacc/dist/test/yacc/err_syntax12.tab.c | 8 +-
external/bsd/byacc/dist/test/yacc/err_syntax18.tab.c | 10 +-
external/bsd/byacc/dist/test/yacc/err_syntax20.tab.c | 10 +-
external/bsd/byacc/dist/test/yacc/error.tab.c | 8 +-
external/bsd/byacc/dist/test/yacc/expr.oxout.tab.c | 10 +-
external/bsd/byacc/dist/test/yacc/grammar.tab.c | 211 +-
external/bsd/byacc/dist/test/yacc/ok_syntax1.tab.c | 10 +-
external/bsd/byacc/dist/test/yacc/pure_calc.tab.c | 10 +-
external/bsd/byacc/dist/test/yacc/pure_error.tab.c | 8 +-
external/bsd/byacc/dist/test/yacc/quote_calc-s.tab.c | 10 +-
external/bsd/byacc/dist/test/yacc/quote_calc.tab.c | 10 +-
external/bsd/byacc/dist/test/yacc/quote_calc2-s.tab.c | 10 +-
external/bsd/byacc/dist/test/yacc/quote_calc2.tab.c | 10 +-
external/bsd/byacc/dist/test/yacc/quote_calc3-s.tab.c | 10 +-
external/bsd/byacc/dist/test/yacc/quote_calc3.tab.c | 10 +-
external/bsd/byacc/dist/test/yacc/quote_calc4-s.tab.c | 10 +-
external/bsd/byacc/dist/test/yacc/quote_calc4.tab.c | 10 +-
external/bsd/byacc/dist/test/yacc/rename_debug.c | 8 +-
external/bsd/byacc/dist/test/yacc/varsyntax_calc1.tab.c | 10 +-
external/bsd/byacc/dist/verbose.c | 8 +-
external/bsd/byacc/dist/warshall.c | 8 +-
external/bsd/byacc/dist/yacc.1 | 40 +-
external/bsd/byacc/dist/yaccpar.c | 11 +-
92 files changed, 2141 insertions(+), 3126 deletions(-)
diffs (truncated from 13676 to 300 lines):
diff -r b6c5f11ccbb9 -r b66e71271014 external/bsd/byacc/dist/btyaccpar.c
--- a/external/bsd/byacc/dist/btyaccpar.c Sun Dec 23 15:26:12 2018 +0000
+++ b/external/bsd/byacc/dist/btyaccpar.c Sun Dec 23 15:38:53 2018 +0000
@@ -1,8 +1,10 @@
+/* $NetBSD: btyaccpar.c,v 1.7 2018/12/23 15:38:53 christos Exp $ */
+
/* This file generated automatically using
* Id: skel2c,v 1.4 2016/06/07 00:26:09 tom Exp
*/
-/* Id: btyaccpar.skel,v 1.7 2017/05/01 00:13:19 tom Exp */
+/* @Id: btyaccpar.skel,v 1.10 2018/05/25 01:03:46 tom Exp @ */
#include "defs.h"
@@ -78,8 +80,9 @@
const char *const global_vars[] =
{
"",
+ "#if YYDEBUG",
"int yydebug;",
- "int yynerrs;",
+ "#endif",
0
};
@@ -90,6 +93,8 @@
"int yychar;",
"YYSTYPE yyval;",
"YYSTYPE yylval;",
+ "int yynerrs;",
+ "",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
"YYLTYPE yyloc; /* position returned by actions */",
"YYLTYPE yylloc; /* position from the lexer */",
@@ -232,6 +237,8 @@
" int yychar;",
" YYSTYPE yyval;",
" YYSTYPE yylval;",
+ " int yynerrs;",
+ "",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" YYLTYPE yyloc; /* position returned by actions */",
" YYLTYPE yylloc; /* position from the lexer */",
@@ -436,7 +443,7 @@
"#endif /* YYBTYACC */",
#endif /* defined(YYBTYACC) */
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
- " YYLTYPE yyerror_loc_range[3]; /* position of error start&end (0 unused) */",
+ " YYLTYPE yyerror_loc_range[3]; /* position of error start/end (0 unused) */",
"#endif",
"#if YYDEBUG",
" const char *yys;",
diff -r b6c5f11ccbb9 -r b66e71271014 external/bsd/byacc/dist/btyaccpar.skel
--- a/external/bsd/byacc/dist/btyaccpar.skel Sun Dec 23 15:26:12 2018 +0000
+++ b/external/bsd/byacc/dist/btyaccpar.skel Sun Dec 23 15:38:53 2018 +0000
@@ -1,4 +1,4 @@
-/* Id: btyaccpar.skel,v 1.7 2017/05/01 00:13:19 tom Exp */
+/* Id: btyaccpar.skel,v 1.11 2018/06/10 00:41:06 Tom.Shields Exp */
#include "defs.h"
@@ -53,14 +53,17 @@
#endif
%% global_vars
+#if YYDEBUG
int yydebug;
-int yynerrs;
+#endif
%% impure_vars
int yyerrflag;
int yychar;
YYSTYPE yyval;
YYSTYPE yylval;
+int yynerrs;
+
#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)
YYLTYPE yyloc; /* position returned by actions */
YYLTYPE yylloc; /* position from the lexer */
@@ -185,6 +188,8 @@
int yychar;
YYSTYPE yyval;
YYSTYPE yylval;
+ int yynerrs;
+
#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)
YYLTYPE yyloc; /* position returned by actions */
YYLTYPE yylloc; /* position from the lexer */
@@ -371,7 +376,7 @@
YYParseState *yyerrctx = NULL;
%%endif
#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)
- YYLTYPE yyerror_loc_range[3]; /* position of error start&end (0 unused) */
+ YYLTYPE yyerror_loc_range[3]; /* position of error start/end (0 unused) */
#endif
#if YYDEBUG
const char *yys;
diff -r b6c5f11ccbb9 -r b66e71271014 external/bsd/byacc/dist/closure.c
--- a/external/bsd/byacc/dist/closure.c Sun Dec 23 15:26:12 2018 +0000
+++ b/external/bsd/byacc/dist/closure.c Sun Dec 23 15:38:53 2018 +0000
@@ -1,12 +1,12 @@
-/* $NetBSD: closure.c,v 1.9 2016/01/09 22:05:33 christos Exp $ */
+/* $NetBSD: closure.c,v 1.10 2018/12/23 15:38:53 christos Exp $ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: closure.c,v 1.10 2018/12/23 15:38:53 christos Exp $");
/* Id: closure.c,v 1.11 2014/09/18 00:40:07 tom Exp */
#include "defs.h"
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: closure.c,v 1.9 2016/01/09 22:05:33 christos Exp $");
-
Value_t *itemset;
Value_t *itemsetend;
unsigned *ruleset;
diff -r b6c5f11ccbb9 -r b66e71271014 external/bsd/byacc/dist/config.guess
--- a/external/bsd/byacc/dist/config.guess Sun Dec 23 15:26:12 2018 +0000
+++ b/external/bsd/byacc/dist/config.guess Sun Dec 23 15:38:53 2018 +0000
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2017 Free Software Foundation, Inc.
+# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2017-03-05'
+timestamp='2018-01-26'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -27,7 +27,7 @@
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
#
# Please send patches to <config-patches%gnu.org@localhost>.
@@ -39,7 +39,7 @@
Output the configuration name of the system \`$me' is run on.
-Operation modes:
+Options:
-h, --help print this help, then exit
-t, --time-stamp print date of last modification, then exit
-v, --version print version number, then exit
@@ -50,7 +50,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2017 Free Software Foundation, Inc.
+Copyright 1992-2018 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -107,9 +107,9 @@
dummy=$tmp/dummy ;
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
+ ,,) echo "int x;" > "$dummy.c" ;
for c in cc gcc c89 c99 ; do
- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+ if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
CC_FOR_BUILD="$c"; break ;
fi ;
done ;
@@ -132,14 +132,14 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-case "${UNAME_SYSTEM}" in
+case "$UNAME_SYSTEM" in
Linux|GNU|GNU/*)
# If the system lacks a compiler, then just pick glibc.
# We could probably try harder.
LIBC=gnu
- eval $set_cc_for_build
- cat <<-EOF > $dummy.c
+ eval "$set_cc_for_build"
+ cat <<-EOF > "$dummy.c"
#include <features.h>
#if defined(__UCLIBC__)
LIBC=uclibc
@@ -149,13 +149,20 @@
LIBC=gnu
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+ eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`"
+
+ # If ldd exists, use it to detect musl libc.
+ if command -v ldd >/dev/null && \
+ ldd --version 2>&1 | grep -q ^musl
+ then
+ LIBC=musl
+ fi
;;
esac
# Note: order is significant - the case branches are not exclusive.
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
*:NetBSD:*:*)
# NetBSD (nbsd) targets should (where applicable) match one or
# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -169,30 +176,30 @@
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
- /sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || \
+ "/sbin/$sysctl" 2>/dev/null || \
+ "/usr/sbin/$sysctl" 2>/dev/null || \
echo unknown)`
- case "${UNAME_MACHINE_ARCH}" in
+ case "$UNAME_MACHINE_ARCH" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
earmv*)
- arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
- endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
- machine=${arch}${endian}-unknown
+ arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+ endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
+ machine="${arch}${endian}"-unknown
;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently (or will in the future) and ABI.
- case "${UNAME_MACHINE_ARCH}" in
+ case "$UNAME_MACHINE_ARCH" in
earm*)
os=netbsdelf
;;
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
+ eval "$set_cc_for_build"
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ELF__
then
@@ -208,10 +215,10 @@
;;
esac
# Determine ABI tags.
- case "${UNAME_MACHINE_ARCH}" in
+ case "$UNAME_MACHINE_ARCH" in
earm*)
expr='s/^earmv[0-9]/-eabi/;s/eb$//'
- abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+ abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
;;
esac
# The OS release
@@ -219,46 +226,55 @@
# thus, need a distinct triplet. However, they do not need
# kernel version information, so it can be replaced with a
# suitable tag, in the style of linux-gnu.
- case "${UNAME_VERSION}" in
+ case "$UNAME_VERSION" in
Debian*)
release='-gnu'
;;
*)
- release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
+ release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
;;
esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}${abi}"
+ echo "$machine-${os}${release}${abi}"
exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
exit ;;
Home |
Main Index |
Thread Index |
Old Index