CVS commit: src/external/bsd/byacc

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sat Jan  3 23:22:53 UTC 2015

Modified Files:
        src/external/bsd/byacc/bin: Makefile
        src/external/bsd/byacc/dist: closure.c config_h.in defs.h error.c
            graph.c lalr.c lr0.c main.c mkpar.c mstring.c output.c reader.c
            symtab.c verbose.c yacc.1
Removed Files:
        src/external/bsd/byacc/dist: skeleton.c
        src/external/bsd/byacc/dist/test: calc.output calc.tab.c calc.tab.h
            calc1.output calc1.tab.c calc1.tab.h calc2.output calc2.tab.c
            calc2.tab.h calc3.output calc3.tab.c calc3.tab.h code_calc.code.c
            code_calc.output code_calc.tab.c code_calc.tab.h code_error.code.c
            code_error.output code_error.tab.c code_error.tab.h error.output
            error.tab.c error.tab.h ftp.output ftp.tab.c ftp.tab.h ftp.y
            grammar.output grammar.tab.c grammar.tab.h pure_calc.output
            pure_calc.tab.c pure_calc.tab.h pure_error.output pure_error.tab.c
            pure_error.tab.h quote_calc-s.output quote_calc-s.tab.c
            quote_calc-s.tab.h quote_calc.output quote_calc.tab.c
            quote_calc.tab.h quote_calc2-s.output quote_calc2-s.tab.c
            quote_calc2-s.tab.h quote_calc2.output quote_calc2.tab.c
            quote_calc2.tab.h quote_calc3-s.output quote_calc3-s.tab.c
            quote_calc3-s.tab.h quote_calc3.output quote_calc3.tab.c
            quote_calc3.tab.h quote_calc4-s.output quote_calc4-s.tab.c
            quote_calc4-s.tab.h quote_calc4.output quote_calc4.tab.c
            quote_calc4.tab.h

Log Message:
merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/bin/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/byacc/dist/closure.c \
    src/external/bsd/byacc/dist/defs.h 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.4 -r1.5 src/external/bsd/byacc/dist/config_h.in \
    src/external/bsd/byacc/dist/graph.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/byacc/dist/error.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/byacc/dist/lalr.c \
    src/external/bsd/byacc/dist/yacc.1
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/byacc/dist/main.c \
    src/external/bsd/byacc/dist/reader.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/byacc/dist/mstring.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/byacc/dist/output.c
cvs rdiff -u -r1.14 -r0 src/external/bsd/byacc/dist/skeleton.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/byacc/dist/test/calc.output \
    src/external/bsd/byacc/dist/test/calc1.output \
    src/external/bsd/byacc/dist/test/calc2.output \
    src/external/bsd/byacc/dist/test/calc3.output \
    src/external/bsd/byacc/dist/test/code_calc.output \
    src/external/bsd/byacc/dist/test/code_error.output \
    src/external/bsd/byacc/dist/test/error.output \
    src/external/bsd/byacc/dist/test/grammar.output \
    src/external/bsd/byacc/dist/test/pure_calc.output \
    src/external/bsd/byacc/dist/test/pure_error.output \
    src/external/bsd/byacc/dist/test/quote_calc-s.output \
    src/external/bsd/byacc/dist/test/quote_calc-s.tab.c \
    src/external/bsd/byacc/dist/test/quote_calc-s.tab.h \
    src/external/bsd/byacc/dist/test/quote_calc.output \
    src/external/bsd/byacc/dist/test/quote_calc.tab.c \
    src/external/bsd/byacc/dist/test/quote_calc.tab.h \
    src/external/bsd/byacc/dist/test/quote_calc2-s.output \
    src/external/bsd/byacc/dist/test/quote_calc2-s.tab.c \
    src/external/bsd/byacc/dist/test/quote_calc2-s.tab.h \
    src/external/bsd/byacc/dist/test/quote_calc2.output \
    src/external/bsd/byacc/dist/test/quote_calc2.tab.c \
    src/external/bsd/byacc/dist/test/quote_calc2.tab.h \
    src/external/bsd/byacc/dist/test/quote_calc3-s.output \
    src/external/bsd/byacc/dist/test/quote_calc3-s.tab.c \
    src/external/bsd/byacc/dist/test/quote_calc3-s.tab.h \
    src/external/bsd/byacc/dist/test/quote_calc3.output \
    src/external/bsd/byacc/dist/test/quote_calc3.tab.c \
    src/external/bsd/byacc/dist/test/quote_calc3.tab.h \
    src/external/bsd/byacc/dist/test/quote_calc4-s.output \
    src/external/bsd/byacc/dist/test/quote_calc4-s.tab.c \
    src/external/bsd/byacc/dist/test/quote_calc4-s.tab.h \
    src/external/bsd/byacc/dist/test/quote_calc4.output \
    src/external/bsd/byacc/dist/test/quote_calc4.tab.c \
    src/external/bsd/byacc/dist/test/quote_calc4.tab.h
cvs rdiff -u -r1.1.1.5 -r0 src/external/bsd/byacc/dist/test/calc.tab.c \
    src/external/bsd/byacc/dist/test/grammar.tab.c
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/byacc/dist/test/calc.tab.h \
    src/external/bsd/byacc/dist/test/calc1.tab.h \
    src/external/bsd/byacc/dist/test/calc2.tab.h \
    src/external/bsd/byacc/dist/test/calc3.tab.h \
    src/external/bsd/byacc/dist/test/code_calc.tab.c \
    src/external/bsd/byacc/dist/test/code_calc.tab.h \
    src/external/bsd/byacc/dist/test/code_error.tab.c \
    src/external/bsd/byacc/dist/test/code_error.tab.h \
    src/external/bsd/byacc/dist/test/grammar.tab.h \
    src/external/bsd/byacc/dist/test/pure_calc.tab.h \
    src/external/bsd/byacc/dist/test/pure_error.tab.h
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/byacc/dist/test/calc1.tab.c \
    src/external/bsd/byacc/dist/test/calc2.tab.c \
    src/external/bsd/byacc/dist/test/calc3.tab.c \
    src/external/bsd/byacc/dist/test/code_calc.code.c \
    src/external/bsd/byacc/dist/test/code_error.code.c \
    src/external/bsd/byacc/dist/test/pure_calc.tab.c \
    src/external/bsd/byacc/dist/test/pure_error.tab.c
cvs rdiff -u -r1.5 -r0 src/external/bsd/byacc/dist/test/error.tab.c \
    src/external/bsd/byacc/dist/test/ftp.tab.c \
    src/external/bsd/byacc/dist/test/ftp.y
cvs rdiff -u -r1.3 -r0 src/external/bsd/byacc/dist/test/error.tab.h
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/byacc/dist/test/ftp.output
cvs rdiff -u -r1.4 -r0 src/external/bsd/byacc/dist/test/ftp.tab.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.