Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/byacc merge conflicts.
details: https://anonhg.NetBSD.org/src/rev/b263a5a79545
branches: trunk
changeset: 354144:b263a5a79545
user: christos <christos%NetBSD.org@localhost>
date: Mon Jun 05 18:54:30 2017 +0000
description:
merge conflicts.
diffstat:
external/bsd/byacc/bin/Makefile | 4 +-
external/bsd/byacc/byacc2netbsd | 4 +-
external/bsd/byacc/dist/btyaccpar.c | 21 ++++++++++-
external/bsd/byacc/dist/btyaccpar.skel | 15 ++++++++-
external/bsd/byacc/dist/config.guess | 12 ++++--
external/bsd/byacc/dist/config.sub | 5 ++-
external/bsd/byacc/dist/defs.h | 5 +-
external/bsd/byacc/dist/main.c | 8 ++--
external/bsd/byacc/dist/output.c | 26 +++++++++++++-
external/bsd/byacc/dist/test/btyacc/btyacc_calc1.tab.c | 16 ++++++++-
external/bsd/byacc/dist/test/btyacc/btyacc_demo.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/btyacc_destroy1.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/btyacc_destroy2.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/btyacc_destroy3.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/calc.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/calc1.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/calc2.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/calc3.tab.c | 16 ++++++++-
external/bsd/byacc/dist/test/btyacc/code_calc.code.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/code_error.code.c | 5 ++-
external/bsd/byacc/dist/test/btyacc/empty.tab.c | 5 ++-
external/bsd/byacc/dist/test/btyacc/err_inherit3.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/err_inherit4.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/err_syntax10.tab.c | 5 ++-
external/bsd/byacc/dist/test/btyacc/err_syntax11.tab.c | 5 ++-
external/bsd/byacc/dist/test/btyacc/err_syntax12.tab.c | 5 ++-
external/bsd/byacc/dist/test/btyacc/err_syntax18.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/err_syntax20.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/error.tab.c | 5 ++-
external/bsd/byacc/dist/test/btyacc/expr.oxout.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/grammar.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/inherit0.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/inherit1.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/inherit2.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/ok_syntax1.tab.c | 16 ++++++++-
external/bsd/byacc/dist/test/btyacc/pure_calc.tab.c | 16 ++++++++-
external/bsd/byacc/dist/test/btyacc/pure_error.tab.c | 14 +++++++-
external/bsd/byacc/dist/test/btyacc/quote_calc-s.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/quote_calc.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/quote_calc2-s.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/quote_calc2.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/quote_calc3-s.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/quote_calc3.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/quote_calc4-s.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/quote_calc4.tab.c | 7 ++-
external/bsd/byacc/dist/test/btyacc/rename_debug.c | 5 ++-
external/bsd/byacc/dist/test/btyacc/varsyntax_calc1.tab.c | 7 ++-
external/bsd/byacc/dist/test/yacc/calc3.tab.c | 7 ++-
external/bsd/byacc/dist/test/yacc/ok_syntax1.tab.c | 7 ++-
external/bsd/byacc/dist/test/yacc/pure_calc.tab.c | 7 ++-
external/bsd/byacc/dist/test/yacc/pure_error.tab.c | 5 ++-
external/bsd/byacc/dist/yaccpar.c | 12 +++++-
52 files changed, 335 insertions(+), 98 deletions(-)
diffs (truncated from 1443 to 300 lines):
diff -r 2ad2831baccf -r b263a5a79545 external/bsd/byacc/bin/Makefile
--- a/external/bsd/byacc/bin/Makefile Mon Jun 05 18:49:47 2017 +0000
+++ b/external/bsd/byacc/bin/Makefile Mon Jun 05 18:54:30 2017 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2015/04/14 14:08:36 christos Exp $
+# $NetBSD: Makefile,v 1.7 2017/06/05 18:54:30 christos Exp $
.include "bsd.own.mk"
PROG= yacc
SRCS= closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \
- symtab.c verbose.c warshall.c graph.c mstring.c yaccpar.c
+ symtab.c verbose.c warshall.c graph.c mstring.c btyaccpar.c
CPPFLAGS+= -DMAXTABLE=INT_MAX
CPPFLAGS+= -DGCC_NORETURN=__dead
diff -r 2ad2831baccf -r b263a5a79545 external/bsd/byacc/byacc2netbsd
--- a/external/bsd/byacc/byacc2netbsd Mon Jun 05 18:49:47 2017 +0000
+++ b/external/bsd/byacc/byacc2netbsd Mon Jun 05 18:54:30 2017 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: byacc2netbsd,v 1.4 2011/10/08 19:28:39 christos Exp $
+# $NetBSD: byacc2netbsd,v 1.5 2017/06/05 18:54:30 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -34,7 +34,7 @@
#
# $ cd /some/where/temporary
# $ tar xpfz /new/byacc/release/tar/file
-# $ sh /usr/src/external/bsd/byacc/dist/byacc2netbsd byacc-YYYYMMDD `pwd`
+# $ sh /usr/src/external/bsd/byacc/byacc2netbsd byacc-YYYYMMDD `pwd`
# $ cd src/external/bsd/byacc/dist
# $ cvs import -m "Import byacc YYYYMMDD" src/external/bsd/byacc/dist DICKEY byacc-YYYYMMDD
# $ cd ../../../../../byacc-YYYYMMDD
diff -r 2ad2831baccf -r b263a5a79545 external/bsd/byacc/dist/btyaccpar.c
--- a/external/bsd/byacc/dist/btyaccpar.c Mon Jun 05 18:49:47 2017 +0000
+++ b/external/bsd/byacc/dist/btyaccpar.c Mon Jun 05 18:54:30 2017 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: btyaccpar.c,v 1.3 2017/02/11 19:33:12 christos Exp $ */
+/* $NetBSD: btyaccpar.c,v 1.4 2017/06/05 18:54:30 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.5 2016/12/02 22:02:28 tom Exp @ */
+/* @Id: btyaccpar.skel,v 1.6 2017/04/30 23:40:34 tom Exp @ */
#include "defs.h"
@@ -452,6 +452,23 @@
" if (yydebug)",
" fprintf(stderr, \"%sdebug[<# of symbols on state stack>]\\n\", YYPREFIX);",
"#endif",
+ "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
+ " memset(yyerror_loc_range, 0, sizeof(yyerror_loc_range));",
+ "#endif",
+ "",
+ 0
+};
+
+const char *const init_vars[] =
+{
+ " yyerrflag = 0;",
+ " yychar = 0;",
+ " memset(&yyval, 0, sizeof(yyval));",
+ " memset(&yylval, 0, sizeof(yylval));",
+ "#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
+ " memset(&yyloc, 0, sizeof(yyloc));",
+ " memset(&yylloc, 0, sizeof(yylloc));",
+ "#endif",
"",
0
};
diff -r 2ad2831baccf -r b263a5a79545 external/bsd/byacc/dist/btyaccpar.skel
--- a/external/bsd/byacc/dist/btyaccpar.skel Mon Jun 05 18:49:47 2017 +0000
+++ b/external/bsd/byacc/dist/btyaccpar.skel Mon Jun 05 18:54:30 2017 +0000
@@ -1,4 +1,4 @@
-/* Id: btyaccpar.skel,v 1.5 2016/12/02 22:02:28 tom Exp */
+/* Id: btyaccpar.skel,v 1.7 2017/05/01 00:13:19 tom Exp */
#include "defs.h"
@@ -385,6 +385,19 @@
if (yydebug)
fprintf(stderr, "%sdebug[<# of symbols on state stack>]\n", YYPREFIX);
#endif
+#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)
+ memset(yyerror_loc_range, 0, sizeof(yyerror_loc_range));
+#endif
+
+%% init_vars
+ yyerrflag = 0;
+ yychar = 0;
+ memset(&yyval, 0, sizeof(yyval));
+ memset(&yylval, 0, sizeof(yylval));
+#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)
+ memset(&yyloc, 0, sizeof(yyloc));
+ memset(&yylloc, 0, sizeof(yylloc));
+#endif
%% body_3
%%ifdef YYBTYACC
diff -r 2ad2831baccf -r b263a5a79545 external/bsd/byacc/dist/config.guess
--- a/external/bsd/byacc/dist/config.guess Mon Jun 05 18:49:47 2017 +0000
+++ b/external/bsd/byacc/dist/config.guess Mon Jun 05 18:54:30 2017 +0000
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2017 Free Software Foundation, Inc.
-timestamp='2017-01-01'
+timestamp='2017-03-05'
# 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
@@ -837,10 +837,11 @@
UNAME_PROCESSOR=`/usr/bin/uname -p`
case ${UNAME_PROCESSOR} in
amd64)
- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- *)
- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ UNAME_PROCESSOR=x86_64 ;;
+ i386)
+ UNAME_PROCESSOR=i586 ;;
esac
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
@@ -1343,6 +1344,9 @@
NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit ;;
+ NSX-?:NONSTOP_KERNEL:*:*)
+ echo nsx-tandem-nsk${UNAME_RELEASE}
+ exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
exit ;;
diff -r 2ad2831baccf -r b263a5a79545 external/bsd/byacc/dist/config.sub
--- a/external/bsd/byacc/dist/config.sub Mon Jun 05 18:49:47 2017 +0000
+++ b/external/bsd/byacc/dist/config.sub Mon Jun 05 18:54:30 2017 +0000
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2017 Free Software Foundation, Inc.
-timestamp='2017-01-01'
+timestamp='2017-02-07'
# 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
@@ -948,6 +948,9 @@
nsr-tandem)
basic_machine=nsr-tandem
;;
+ nsx-tandem)
+ basic_machine=nsx-tandem
+ ;;
op50n-* | op60c-*)
basic_machine=hppa1.1-oki
os=-proelf
diff -r 2ad2831baccf -r b263a5a79545 external/bsd/byacc/dist/defs.h
--- a/external/bsd/byacc/dist/defs.h Mon Jun 05 18:49:47 2017 +0000
+++ b/external/bsd/byacc/dist/defs.h Mon Jun 05 18:54:30 2017 +0000
@@ -1,9 +1,9 @@
-/* $NetBSD: defs.h,v 1.11 2017/02/11 19:33:12 christos Exp $ */
+/* $NetBSD: defs.h,v 1.12 2017/06/05 18:54:30 christos Exp $ */
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
-/* Id: defs.h,v 1.56 2017/02/02 00:44:38 tom Exp */
+/* Id: defs.h,v 1.57 2017/04/30 23:29:11 tom Exp */
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -312,6 +312,7 @@
extern const char *const hdr_vars[];
extern const char *const body_1[];
extern const char *const body_vars[];
+extern const char *const init_vars[];
extern const char *const body_2[];
extern const char *const body_3[];
extern const char *const trailer[];
diff -r 2ad2831baccf -r b263a5a79545 external/bsd/byacc/dist/main.c
--- a/external/bsd/byacc/dist/main.c Mon Jun 05 18:49:47 2017 +0000
+++ b/external/bsd/byacc/dist/main.c Mon Jun 05 18:54:30 2017 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: main.c,v 1.13 2017/02/11 19:33:12 christos Exp $ */
+/* $NetBSD: main.c,v 1.14 2017/06/05 18:54:30 christos Exp $ */
#include "defs.h"
#include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.13 2017/02/11 19:33:12 christos Exp $");
-/* Id: main.c,v 1.59 2017/02/02 00:44:38 tom Exp */
+__RCSID("$NetBSD: main.c,v 1.14 2017/06/05 18:54:30 christos Exp $");
+/* Id: main.c,v 1.60 2017/04/30 20:57:56 Julien.Ramseier Exp */
#include <signal.h>
#ifndef _WIN32
@@ -272,7 +272,7 @@
#if defined(YYBTYACC)
locations = 1;
#else
- unsupported_flag_warning("-B", "reconfigure with --enable-btyacc");
+ unsupported_flag_warning("-L", "reconfigure with --enable-btyacc");
#endif
break;
diff -r 2ad2831baccf -r b263a5a79545 external/bsd/byacc/dist/output.c
--- a/external/bsd/byacc/dist/output.c Mon Jun 05 18:49:47 2017 +0000
+++ b/external/bsd/byacc/dist/output.c Mon Jun 05 18:54:30 2017 +0000
@@ -1,11 +1,11 @@
-/* $NetBSD: output.c,v 1.17 2017/02/11 19:33:12 christos Exp $ */
+/* $NetBSD: output.c,v 1.18 2017/06/05 18:54:30 christos Exp $ */
-/* Id: output.c,v 1.79 2016/12/02 20:42:38 tom Exp */
+/* Id: output.c,v 1.81 2017/04/30 23:23:32 tom Exp */
#include "defs.h"
#include <sys/cdefs.h>
-__RCSID("$NetBSD: output.c,v 1.17 2017/02/11 19:33:12 christos Exp $");
+__RCSID("$NetBSD: output.c,v 1.18 2017/06/05 18:54:30 christos Exp $");
#define StaticOrR (rflag ? "" : "static ")
#define CountLine(fp) (!rflag || ((fp) == code_file))
@@ -1590,6 +1590,19 @@
putc_code(fp, '\n');
}
+#if defined(YY_NO_LEAKS)
+static void
+output_no_leaks(FILE * fp)
+{
+ putc_code(fp, '\n');
+
+ if (fp == code_file)
+ ++outline;
+ fputs("#define YY_NO_LEAKS 1\n", fp);
+ putc_code(fp, '\n');
+}
+#endif
+
static void
output_trailing_text(void)
{
@@ -1991,6 +2004,9 @@
output_prefix(fp);
output_pure_parser(fp);
+#if defined(YY_NO_LEAKS)
+ output_no_leaks(fp);
+#endif
output_stored_text(fp);
output_stype(fp);
#if defined(YYBTYACC)
@@ -2074,6 +2090,10 @@
write_section(code_file, body_vars);
}
write_section(code_file, body_2);
+ if (pure_parser)
+ {
+ write_section(code_file, init_vars);
+ }
#if defined(YYBTYACC)
if (initial_action)
output_initial_action();
diff -r 2ad2831baccf -r b263a5a79545 external/bsd/byacc/dist/test/btyacc/btyacc_calc1.tab.c
--- a/external/bsd/byacc/dist/test/btyacc/btyacc_calc1.tab.c Mon Jun 05 18:49:47 2017 +0000
+++ b/external/bsd/byacc/dist/test/btyacc/btyacc_calc1.tab.c Mon Jun 05 18:54:30 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: btyacc_calc1.tab.c,v 1.2 2017/02/11 19:33:12 christos Exp $ */
+/* $NetBSD: btyacc_calc1.tab.c,v 1.3 2017/06/05 18:54:30 christos Exp $ */
/* original parser id follows */
/* yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93" */
@@ -820,6 +820,18 @@
if (yydebug)
fprintf(stderr, "%sdebug[<# of symbols on state stack>]\n", YYPREFIX);
#endif
+#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)
+ memset(yyerror_loc_range, 0, sizeof(yyerror_loc_range));
+#endif
+
+ yyerrflag = 0;
+ yychar = 0;
+ memset(&yyval, 0, sizeof(yyval));
+ memset(&yylval, 0, sizeof(yylval));
+#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)
+ memset(&yyloc, 0, sizeof(yyloc));
+ memset(&yylloc, 0, sizeof(yylloc));
+#endif
#if YYBTYACC
yyps = yyNewState(0); if (yyps == 0) goto yyenomem;
Home |
Main Index |
Thread Index |
Old Index