CVS commit: src/external/bsd/byacc

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

Module Name:    src
Committed By:   christos
Date:           Mon Jun  5 18:54:31 UTC 2017

Modified Files:
        src/external/bsd/byacc: byacc2netbsd
        src/external/bsd/byacc/bin: Makefile
        src/external/bsd/byacc/dist: btyaccpar.c btyaccpar.skel config.guess
            config.sub defs.h main.c output.c yaccpar.c
        src/external/bsd/byacc/dist/test/btyacc: btyacc_calc1.tab.c
            btyacc_demo.tab.c btyacc_destroy1.tab.c btyacc_destroy2.tab.c
            btyacc_destroy3.tab.c calc.tab.c calc1.tab.c calc2.tab.c
            calc3.tab.c code_calc.code.c code_error.code.c empty.tab.c
            err_inherit3.tab.c err_inherit4.tab.c err_syntax10.tab.c
            err_syntax11.tab.c err_syntax12.tab.c err_syntax18.tab.c
            err_syntax20.tab.c error.tab.c expr.oxout.tab.c grammar.tab.c
            inherit0.tab.c inherit1.tab.c inherit2.tab.c ok_syntax1.tab.c
            pure_calc.tab.c pure_error.tab.c quote_calc-s.tab.c
            quote_calc.tab.c quote_calc2-s.tab.c quote_calc2.tab.c
            quote_calc3-s.tab.c quote_calc3.tab.c quote_calc4-s.tab.c
            quote_calc4.tab.c rename_debug.c varsyntax_calc1.tab.c
        src/external/bsd/byacc/dist/test/yacc: calc3.tab.c ok_syntax1.tab.c
            pure_calc.tab.c pure_error.tab.c

Log Message:
merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/byacc/byacc2netbsd
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/byacc/bin/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/dist/btyaccpar.c \
    src/external/bsd/byacc/dist/btyaccpar.skel
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/byacc/dist/config.guess \
    src/external/bsd/byacc/dist/config.sub
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/byacc/dist/defs.h
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/byacc/dist/main.c
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/byacc/dist/output.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/byacc/dist/yaccpar.c
cvs rdiff -u -r1.2 -r1.3 \
    src/external/bsd/byacc/dist/test/btyacc/btyacc_calc1.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/btyacc_demo.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/btyacc_destroy1.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/btyacc_destroy2.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/btyacc_destroy3.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/calc.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/calc1.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/calc2.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/calc3.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/code_calc.code.c \
    src/external/bsd/byacc/dist/test/btyacc/code_error.code.c \
    src/external/bsd/byacc/dist/test/btyacc/empty.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_inherit3.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_inherit4.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax10.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax11.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax12.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax18.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax20.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/error.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/expr.oxout.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/grammar.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/inherit0.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/inherit1.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/inherit2.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/ok_syntax1.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/pure_calc.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/pure_error.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/quote_calc-s.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/quote_calc.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/quote_calc2-s.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/quote_calc2.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/quote_calc3-s.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/quote_calc3.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/quote_calc4-s.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/quote_calc4.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/rename_debug.c \
    src/external/bsd/byacc/dist/test/btyacc/varsyntax_calc1.tab.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/byacc/dist/test/yacc/calc3.tab.c \
    src/external/bsd/byacc/dist/test/yacc/ok_syntax1.tab.c \
    src/external/bsd/byacc/dist/test/yacc/pure_calc.tab.c \
    src/external/bsd/byacc/dist/test/yacc/pure_error.tab.c

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