Module Name: src
Committed By: christos
Date: Sat Jan 9 22:05:33 UTC 2016
Modified Files:
src/external/bsd/byacc/dist: closure.c defs.h error.c graph.c lalr.c
lr0.c main.c mkpar.c mstring.c output.c reader.c symtab.c verbose.c
warshall.c yacc.1 yaccpar.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/byacc/dist/closure.c \
src/external/bsd/byacc/dist/lr0.c src/external/bsd/byacc/dist/mkpar.c \
src/external/bsd/byacc/dist/symtab.c \
src/external/bsd/byacc/dist/verbose.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/byacc/dist/defs.h
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/byacc/dist/error.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/byacc/dist/graph.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/byacc/dist/lalr.c \
src/external/bsd/byacc/dist/yacc.1
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/byacc/dist/main.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/dist/mstring.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/byacc/dist/output.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/byacc/dist/reader.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/byacc/dist/warshall.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/byacc/dist/yaccpar.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/byacc/dist/closure.c
diff -u src/external/bsd/byacc/dist/closure.c:1.8 src/external/bsd/byacc/dist/closure.c:1.9
--- src/external/bsd/byacc/dist/closure.c:1.8 Sat Jan 3 18:22:52 2015
+++ src/external/bsd/byacc/dist/closure.c Sat Jan 9 17:05:33 2016
@@ -1,11 +1,11 @@
-/* $NetBSD: closure.c,v 1.8 2015/01/03 23:22:52 christos Exp $ */
+/* $NetBSD: closure.c,v 1.9 2016/01/09 22:05:33 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.8 2015/01/03 23:22:52 christos Exp $");
+__RCSID("$NetBSD: closure.c,v 1.9 2016/01/09 22:05:33 christos Exp $");
Value_t *itemset;
Value_t *itemsetend;
Index: src/external/bsd/byacc/dist/lr0.c
diff -u src/external/bsd/byacc/dist/lr0.c:1.8 src/external/bsd/byacc/dist/lr0.c:1.9
--- src/external/bsd/byacc/dist/lr0.c:1.8 Sat Jan 3 18:22:52 2015
+++ src/external/bsd/byacc/dist/lr0.c Sat Jan 9 17:05:33 2016
@@ -1,11 +1,11 @@
-/* $NetBSD: lr0.c,v 1.8 2015/01/03 23:22:52 christos Exp $ */
+/* $NetBSD: lr0.c,v 1.9 2016/01/09 22:05:33 christos Exp $ */
-/* Id: lr0.c,v 1.17 2014/11/28 15:46:42 tom Exp */
+/* Id: lr0.c,v 1.18 2015/07/11 00:53:38 tom Exp */
#include "defs.h"
#include <sys/cdefs.h>
-__RCSID("$NetBSD: lr0.c,v 1.8 2015/01/03 23:22:52 christos Exp $");
+__RCSID("$NetBSD: lr0.c,v 1.9 2016/01/09 22:05:33 christos Exp $");
static core *new_state(int symbol);
static Value_t get_state(int symbol);
@@ -601,7 +601,10 @@ lr0_leaks(void)
{
if (derives)
{
- DO_FREE(derives[start_symbol]);
+ if (derives[start_symbol] != rules)
+ {
+ DO_FREE(derives[start_symbol]);
+ }
DO_FREE(derives);
DO_FREE(rules);
}
Index: src/external/bsd/byacc/dist/mkpar.c
diff -u src/external/bsd/byacc/dist/mkpar.c:1.8 src/external/bsd/byacc/dist/mkpar.c:1.9
--- src/external/bsd/byacc/dist/mkpar.c:1.8 Sat Jan 3 18:22:52 2015
+++ src/external/bsd/byacc/dist/mkpar.c Sat Jan 9 17:05:33 2016
@@ -1,11 +1,11 @@
-/* $NetBSD: mkpar.c,v 1.8 2015/01/03 23:22:52 christos Exp $ */
+/* $NetBSD: mkpar.c,v 1.9 2016/01/09 22:05:33 christos Exp $ */
/* Id: mkpar.c,v 1.14 2014/04/01 23:05:37 tom Exp */
#include "defs.h"
#include <sys/cdefs.h>
-__RCSID("$NetBSD: mkpar.c,v 1.8 2015/01/03 23:22:52 christos Exp $");
+__RCSID("$NetBSD: mkpar.c,v 1.9 2016/01/09 22:05:33 christos Exp $");
#define NotSuppressed(p) ((p)->suppressed == 0)
Index: src/external/bsd/byacc/dist/symtab.c
diff -u src/external/bsd/byacc/dist/symtab.c:1.8 src/external/bsd/byacc/dist/symtab.c:1.9
--- src/external/bsd/byacc/dist/symtab.c:1.8 Sat Jan 3 18:22:52 2015
+++ src/external/bsd/byacc/dist/symtab.c Sat Jan 9 17:05:33 2016
@@ -1,11 +1,11 @@
-/* $NetBSD: symtab.c,v 1.8 2015/01/03 23:22:52 christos Exp $ */
+/* $NetBSD: symtab.c,v 1.9 2016/01/09 22:05:33 christos Exp $ */
/* Id: symtab.c,v 1.11 2014/03/26 00:17:09 Tom.Shields Exp */
#include "defs.h"
#include <sys/cdefs.h>
-__RCSID("$NetBSD: symtab.c,v 1.8 2015/01/03 23:22:52 christos Exp $");
+__RCSID("$NetBSD: symtab.c,v 1.9 2016/01/09 22:05:33 christos Exp $");
/* TABLE_SIZE is the number of entries in the symbol table. */
/* TABLE_SIZE must be a power of two. */
Index: src/external/bsd/byacc/dist/verbose.c
diff -u src/external/bsd/byacc/dist/verbose.c:1.8 src/external/bsd/byacc/dist/verbose.c:1.9
--- src/external/bsd/byacc/dist/verbose.c:1.8 Sat Jan 3 18:22:52 2015
+++ src/external/bsd/byacc/dist/verbose.c Sat Jan 9 17:05:33 2016
@@ -1,11 +1,11 @@
-/* $NetBSD: verbose.c,v 1.8 2015/01/03 23:22:52 christos Exp $ */
+/* $NetBSD: verbose.c,v 1.9 2016/01/09 22:05:33 christos Exp $ */
/* Id: verbose.c,v 1.11 2014/04/01 23:15:59 Tom.Shields Exp */
#include "defs.h"
#include <sys/cdefs.h>
-__RCSID("$NetBSD: verbose.c,v 1.8 2015/01/03 23:22:52 christos Exp $");
+__RCSID("$NetBSD: verbose.c,v 1.9 2016/01/09 22:05:33 christos Exp $");
static void log_conflicts(void);
static void log_unused(void);
Index: src/external/bsd/byacc/dist/defs.h
diff -u src/external/bsd/byacc/dist/defs.h:1.9 src/external/bsd/byacc/dist/defs.h:1.10
--- src/external/bsd/byacc/dist/defs.h:1.9 Sat Jan 3 20:34:20 2015
+++ src/external/bsd/byacc/dist/defs.h Sat Jan 9 17:05:33 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.9 2015/01/04 01:34:20 christos Exp $ */
+/* $NetBSD: defs.h,v 1.10 2016/01/09 22:05:33 christos Exp $ */
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
Index: src/external/bsd/byacc/dist/error.c
diff -u src/external/bsd/byacc/dist/error.c:1.10 src/external/bsd/byacc/dist/error.c:1.11
--- src/external/bsd/byacc/dist/error.c:1.10 Sat Jan 3 20:34:20 2015
+++ src/external/bsd/byacc/dist/error.c Sat Jan 9 17:05:33 2016
@@ -1,9 +1,9 @@
-/* $NetBSD: error.c,v 1.10 2015/01/04 01:34:20 christos Exp $ */
+/* $NetBSD: error.c,v 1.11 2016/01/09 22:05:33 christos Exp $ */
#include "defs.h"
#include <sys/cdefs.h>
-__RCSID("$NetBSD: error.c,v 1.10 2015/01/04 01:34:20 christos Exp $");
+__RCSID("$NetBSD: error.c,v 1.11 2016/01/09 22:05:33 christos Exp $");
/* Id: error.c,v 1.11 2014/04/07 22:22:49 tom Exp */
/* routines for printing error messages */
Index: src/external/bsd/byacc/dist/graph.c
diff -u src/external/bsd/byacc/dist/graph.c:1.5 src/external/bsd/byacc/dist/graph.c:1.6
--- src/external/bsd/byacc/dist/graph.c:1.5 Sat Jan 3 18:22:52 2015
+++ src/external/bsd/byacc/dist/graph.c Sat Jan 9 17:05:33 2016
@@ -1,10 +1,10 @@
-/* $NetBSD: graph.c,v 1.5 2015/01/03 23:22:52 christos Exp $ */
+/* $NetBSD: graph.c,v 1.6 2016/01/09 22:05:33 christos Exp $ */
#include "defs.h"
/* Id: graph.c,v 1.8 2014/02/19 00:46:57 Tom.Shields Exp */
#include <sys/cdefs.h>
-__RCSID("$NetBSD: graph.c,v 1.5 2015/01/03 23:22:52 christos Exp $");
+__RCSID("$NetBSD: graph.c,v 1.6 2016/01/09 22:05:33 christos Exp $");
static void graph_state(int stateno);
static void graph_LA(int ruleno);
Index: src/external/bsd/byacc/dist/lalr.c
diff -u src/external/bsd/byacc/dist/lalr.c:1.6 src/external/bsd/byacc/dist/lalr.c:1.7
--- src/external/bsd/byacc/dist/lalr.c:1.6 Sat Jan 3 18:22:52 2015
+++ src/external/bsd/byacc/dist/lalr.c Sat Jan 9 17:05:33 2016
@@ -1,10 +1,10 @@
-/* $NetBSD: lalr.c,v 1.6 2015/01/03 23:22:52 christos Exp $ */
+/* $NetBSD: lalr.c,v 1.7 2016/01/09 22:05:33 christos Exp $ */
#include "defs.h"
/* Id: lalr.c,v 1.11 2014/09/18 00:26:39 tom Exp */
#include <sys/cdefs.h>
-__RCSID("$NetBSD: lalr.c,v 1.6 2015/01/03 23:22:52 christos Exp $");
+__RCSID("$NetBSD: lalr.c,v 1.7 2016/01/09 22:05:33 christos Exp $");
typedef struct shorts
{
Index: src/external/bsd/byacc/dist/yacc.1
diff -u src/external/bsd/byacc/dist/yacc.1:1.6 src/external/bsd/byacc/dist/yacc.1:1.7
--- src/external/bsd/byacc/dist/yacc.1:1.6 Sat Jan 3 18:22:52 2015
+++ src/external/bsd/byacc/dist/yacc.1 Sat Jan 9 17:05:33 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: yacc.1,v 1.6 2015/01/03 23:22:52 christos Exp $
+.\" $NetBSD: yacc.1,v 1.7 2016/01/09 22:05:33 christos Exp $
.\"
.\" Id: yacc.1,v 1.24 2014/10/06 00:03:48 tom Exp
.\"
Index: src/external/bsd/byacc/dist/main.c
diff -u src/external/bsd/byacc/dist/main.c:1.11 src/external/bsd/byacc/dist/main.c:1.12
--- src/external/bsd/byacc/dist/main.c:1.11 Sat Jan 3 20:34:20 2015
+++ src/external/bsd/byacc/dist/main.c Sat Jan 9 17:05:33 2016
@@ -1,10 +1,10 @@
-/* $NetBSD: main.c,v 1.11 2015/01/04 01:34:20 christos Exp $ */
+/* $NetBSD: main.c,v 1.12 2016/01/09 22:05:33 christos Exp $ */
#include "defs.h"
#include <sys/cdefs.h>
-__RCSID("$NetBSD: main.c,v 1.11 2015/01/04 01:34:20 christos Exp $");
-/* Id: main.c,v 1.54 2014/10/06 22:40:07 tom Exp */
+__RCSID("$NetBSD: main.c,v 1.12 2016/01/09 22:05:33 christos Exp $");
+/* Id: main.c,v 1.55 2015/07/11 00:34:19 tom Exp */
#include <signal.h>
#ifndef _WIN32
@@ -589,6 +589,7 @@ my_mkstemp(char *temp)
static FILE *
open_tmpfile(const char *label)
{
+#define MY_FMT "%s/%.*sXXXXXX"
FILE *result;
#if USE_MKSTEMP
int fd;
@@ -607,7 +608,11 @@ open_tmpfile(const char *label)
tmpdir = ".";
}
- name = malloc(strlen(tmpdir) + 10 + strlen(label));
+ /* The size of the format is guaranteed to be longer than the result from
+ * printing empty strings with it; this calculation accounts for the
+ * string-lengths as well.
+ */
+ name = malloc(strlen(tmpdir) + sizeof(MY_FMT) + strlen(label));
result = 0;
if (name != 0)
@@ -617,7 +622,7 @@ open_tmpfile(const char *label)
if ((mark = strrchr(label, '_')) == 0)
mark = label + strlen(label);
- sprintf(name, "%s/%.*sXXXXXX", tmpdir, (int)(mark - label), label);
+ sprintf(name, MY_FMT, tmpdir, (int)(mark - label), label);
fd = mkstemp(name);
if (fd >= 0)
{
@@ -650,6 +655,7 @@ open_tmpfile(const char *label)
if (result == 0)
open_error(label);
return result;
+#undef MY_FMT
}
static void
Index: src/external/bsd/byacc/dist/mstring.c
diff -u src/external/bsd/byacc/dist/mstring.c:1.3 src/external/bsd/byacc/dist/mstring.c:1.4
--- src/external/bsd/byacc/dist/mstring.c:1.3 Sat Jan 3 20:34:20 2015
+++ src/external/bsd/byacc/dist/mstring.c Sat Jan 9 17:05:33 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mstring.c,v 1.3 2015/01/04 01:34:20 christos Exp $ */
+/* $NetBSD: mstring.c,v 1.4 2016/01/09 22:05:33 christos Exp $ */
/* Id: mstring.c,v 1.6 2014/04/22 23:36:31 tom Exp */
#if HAVE_NBTOOL_CONFIG_H
@@ -6,7 +6,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: mstring.c,v 1.3 2015/01/04 01:34:20 christos Exp $");
+__RCSID("$NetBSD: mstring.c,v 1.4 2016/01/09 22:05:33 christos Exp $");
#include <stdlib.h>
#include <stdio.h>
Index: src/external/bsd/byacc/dist/output.c
diff -u src/external/bsd/byacc/dist/output.c:1.14 src/external/bsd/byacc/dist/output.c:1.15
--- src/external/bsd/byacc/dist/output.c:1.14 Sun Jan 4 15:32:03 2015
+++ src/external/bsd/byacc/dist/output.c Sat Jan 9 17:05:33 2016
@@ -1,11 +1,11 @@
-/* $NetBSD: output.c,v 1.14 2015/01/04 20:32:03 christos Exp $ */
+/* $NetBSD: output.c,v 1.15 2016/01/09 22:05:33 christos Exp $ */
/* Id: output.c,v 1.74 2014/10/05 23:21:09 tom Exp */
#include "defs.h"
#include <sys/cdefs.h>
-__RCSID("$NetBSD: output.c,v 1.14 2015/01/04 20:32:03 christos Exp $");
+__RCSID("$NetBSD: output.c,v 1.15 2016/01/09 22:05:33 christos Exp $");
#define StaticOrR (rflag ? "" : "static ")
#define CountLine(fp) (!rflag || ((fp) == code_file))
Index: src/external/bsd/byacc/dist/reader.c
diff -u src/external/bsd/byacc/dist/reader.c:1.12 src/external/bsd/byacc/dist/reader.c:1.13
--- src/external/bsd/byacc/dist/reader.c:1.12 Sun Jan 4 14:30:26 2015
+++ src/external/bsd/byacc/dist/reader.c Sat Jan 9 17:05:33 2016
@@ -1,11 +1,11 @@
-/* $NetBSD: reader.c,v 1.12 2015/01/04 19:30:26 joerg Exp $ */
+/* $NetBSD: reader.c,v 1.13 2016/01/09 22:05:33 christos Exp $ */
-/* Id: reader.c,v 1.58 2014/10/06 22:15:08 tom Exp */
+/* Id: reader.c,v 1.59 2015/07/11 00:39:03 tom Exp */
#include "defs.h"
#include <sys/cdefs.h>
-__RCSID("$NetBSD: reader.c,v 1.12 2015/01/04 19:30:26 joerg Exp $");
+__RCSID("$NetBSD: reader.c,v 1.13 2016/01/09 22:05:33 christos Exp $");
/* The line size must be a positive integer. One hundred was chosen */
/* because few lines in Yacc input grammars exceed 100 characters. */
@@ -32,6 +32,7 @@ static void copy_destructor(void);
static char *process_destructor_XX(char *code, char *tag);
#endif
+#define CACHE_SIZE 256
static char *cache;
static int cinc, cache_size;
@@ -101,7 +102,7 @@ cachec(int c)
assert(cinc >= 0);
if (cinc >= cache_size)
{
- cache_size += 256;
+ cache_size += CACHE_SIZE;
cache = TREALLOC(char, cache, cache_size);
NO_SPACE(cache);
}
@@ -1512,7 +1513,7 @@ read_declarations(void)
{
int c, k;
- cache_size = 256;
+ cache_size = CACHE_SIZE;
cache = TMALLOC(char, cache_size);
NO_SPACE(cache);
@@ -2111,6 +2112,7 @@ insert_empty_rule(void)
bucket *bp, **bpp;
assert(cache);
+ assert(cache_size >= CACHE_SIZE);
sprintf(cache, "$$%d", ++gensym);
bp = make_bucket(cache);
last_symbol->next = bp;
Index: src/external/bsd/byacc/dist/warshall.c
diff -u src/external/bsd/byacc/dist/warshall.c:1.7 src/external/bsd/byacc/dist/warshall.c:1.8
--- src/external/bsd/byacc/dist/warshall.c:1.7 Sat Apr 6 10:52:24 2013
+++ src/external/bsd/byacc/dist/warshall.c Sat Jan 9 17:05:33 2016
@@ -1,11 +1,11 @@
-/* $NetBSD: warshall.c,v 1.7 2013/04/06 14:52:24 christos Exp $ */
+/* $NetBSD: warshall.c,v 1.8 2016/01/09 22:05:33 christos Exp $ */
/* Id: warshall.c,v 1.7 2010/06/06 22:48:51 tom Exp */
#include "defs.h"
#include <sys/cdefs.h>
-__RCSID("$NetBSD: warshall.c,v 1.7 2013/04/06 14:52:24 christos Exp $");
+__RCSID("$NetBSD: warshall.c,v 1.8 2016/01/09 22:05:33 christos Exp $");
static void
transitive_closure(unsigned *R, int n)
Index: src/external/bsd/byacc/dist/yaccpar.c
diff -u src/external/bsd/byacc/dist/yaccpar.c:1.2 src/external/bsd/byacc/dist/yaccpar.c:1.3
--- src/external/bsd/byacc/dist/yaccpar.c:1.2 Sat Jan 3 20:34:20 2015
+++ src/external/bsd/byacc/dist/yaccpar.c Sat Jan 9 17:05:33 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: yaccpar.c,v 1.2 2015/01/04 01:34:20 christos Exp $ */
+/* $NetBSD: yaccpar.c,v 1.3 2016/01/09 22:05:33 christos Exp $ */
/* This file generated automatically using
* @Id: skel2c,v 1.3 2014/04/06 19:48:04 tom Exp @
