CVS commit: src/external/bsd/byacc

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

Module Name:    src
Committed By:   christos
Date:           Sat Sep 14 21:29:05 UTC 2024

Modified Files:
        src/external/bsd/byacc/dist: btyaccpar.c btyaccpar.skel closure.c
            config.guess config.sub config_h.in defs.h error.c lalr.c lr0.c
            main.c mkpar.c mstring.c output.c reader.c verbose.c yacc.1
            yaccpar.c
        src/external/bsd/byacc/dist/test: expr.oxout.h expr.oxout.y
            ok_syntax1.y
        src/external/bsd/byacc/dist/test/btyacc: btyacc_calc1.tab.c
            btyacc_calc1.tab.h btyacc_demo.tab.c btyacc_demo.tab.h
            btyacc_destroy1.tab.c btyacc_destroy1.tab.h btyacc_destroy2.tab.c
            btyacc_destroy2.tab.h btyacc_destroy3.tab.c btyacc_destroy3.tab.h
            calc.tab.c calc1.tab.c calc1.tab.h calc2.tab.c calc3.tab.c
            calc_code_all.tab.c calc_code_default.tab.c calc_code_imports.tab.c
            calc_code_provides.tab.c calc_code_requires.tab.c
            calc_code_top.tab.c code_calc.code.c code_calc.tab.c
            code_error.code.c code_error.tab.c defines1.calc.c defines2.calc.c
            defines3.calc.c empty.tab.c err_inherit3.tab.c err_inherit3.tab.h
            err_inherit4.tab.c err_inherit4.tab.h 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 expr.oxout.tab.h
            grammar.tab.c inherit0.tab.c inherit1.tab.c inherit1.tab.h
            inherit2.tab.c inherit2.tab.h ok_syntax1.tab.c ok_syntax1.tab.h
            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 stdin1.calc.c stdin2.calc.c
            varsyntax_calc1.tab.c varsyntax_calc1.tab.h
        src/external/bsd/byacc/dist/test/yacc: calc.tab.c calc1.tab.c
            calc1.tab.h calc2.tab.c calc3.tab.c calc_code_all.tab.c
            calc_code_default.tab.c calc_code_imports.tab.c
            calc_code_provides.tab.c calc_code_requires.tab.c
            calc_code_top.tab.c code_calc.code.c code_calc.tab.c
            code_error.code.c code_error.tab.c defines1.calc.c defines2.calc.c
            defines3.calc.c empty.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 expr.oxout.tab.h grammar.tab.c
            ok_syntax1.tab.c ok_syntax1.tab.h 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 stdin1.calc.c
            stdin2.calc.c varsyntax_calc1.tab.c varsyntax_calc1.tab.h
        src/external/bsd/byacc/include: config.h
Removed Files:
        src/external/bsd/byacc/dist/package/debian: compat docs postinst prerm

Log Message:
merge conflicts between 20210109 and 20240109


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/byacc/dist/btyaccpar.c \
    src/external/bsd/byacc/dist/btyaccpar.skel \
    src/external/bsd/byacc/dist/config.guess \
    src/external/bsd/byacc/dist/config_h.in \
    src/external/bsd/byacc/dist/yaccpar.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/byacc/dist/closure.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/byacc/dist/config.sub \
    src/external/bsd/byacc/dist/mstring.c
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/byacc/dist/defs.h
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/byacc/dist/error.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/byacc/dist/lalr.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/byacc/dist/lr0.c \
    src/external/bsd/byacc/dist/mkpar.c src/external/bsd/byacc/dist/verbose.c
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/byacc/dist/main.c \
    src/external/bsd/byacc/dist/reader.c
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/byacc/dist/output.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/byacc/dist/yacc.1
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/byacc/dist/package/debian/compat
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/byacc/dist/package/debian/docs \
    src/external/bsd/byacc/dist/package/debian/postinst \
    src/external/bsd/byacc/dist/package/debian/prerm
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/byacc/dist/test/expr.oxout.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/byacc/dist/test/expr.oxout.y
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/byacc/dist/test/ok_syntax1.y
cvs rdiff -u -r1.5 -r1.6 \
    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.1.1.5 -r1.2 \
    src/external/bsd/byacc/dist/test/btyacc/btyacc_calc1.tab.h \
    src/external/bsd/byacc/dist/test/btyacc/ok_syntax1.tab.h
cvs rdiff -u -r1.3 -r1.4 \
    src/external/bsd/byacc/dist/test/btyacc/btyacc_demo.tab.h \
    src/external/bsd/byacc/dist/test/btyacc/err_inherit4.tab.h
cvs rdiff -u -r1.1.1.4 -r1.2 \
    src/external/bsd/byacc/dist/test/btyacc/btyacc_destroy1.tab.h \
    src/external/bsd/byacc/dist/test/btyacc/btyacc_destroy2.tab.h \
    src/external/bsd/byacc/dist/test/btyacc/btyacc_destroy3.tab.h \
    src/external/bsd/byacc/dist/test/btyacc/calc1.tab.h \
    src/external/bsd/byacc/dist/test/btyacc/err_inherit3.tab.h \
    src/external/bsd/byacc/dist/test/btyacc/inherit1.tab.h \
    src/external/bsd/byacc/dist/test/btyacc/inherit2.tab.h \
    src/external/bsd/byacc/dist/test/btyacc/varsyntax_calc1.tab.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
    src/external/bsd/byacc/dist/test/btyacc/calc_code_all.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/calc_code_default.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/calc_code_imports.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/calc_code_provides.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/calc_code_requires.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/calc_code_top.tab.c
cvs rdiff -u -r1.2 -r1.3 \
    src/external/bsd/byacc/dist/test/btyacc/code_calc.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/code_error.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/expr.oxout.tab.h
cvs rdiff -u -r1.1.1.3 -r1.2 \
    src/external/bsd/byacc/dist/test/btyacc/defines1.calc.c \
    src/external/bsd/byacc/dist/test/btyacc/defines2.calc.c \
    src/external/bsd/byacc/dist/test/btyacc/defines3.calc.c \
    src/external/bsd/byacc/dist/test/btyacc/stdin1.calc.c \
    src/external/bsd/byacc/dist/test/btyacc/stdin2.calc.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/byacc/dist/test/yacc/calc.tab.c \
    src/external/bsd/byacc/dist/test/yacc/calc1.tab.c \
    src/external/bsd/byacc/dist/test/yacc/calc2.tab.c \
    src/external/bsd/byacc/dist/test/yacc/code_calc.code.c \
    src/external/bsd/byacc/dist/test/yacc/code_error.code.c \
    src/external/bsd/byacc/dist/test/yacc/empty.tab.c \
    src/external/bsd/byacc/dist/test/yacc/err_syntax10.tab.c \
    src/external/bsd/byacc/dist/test/yacc/err_syntax11.tab.c \
    src/external/bsd/byacc/dist/test/yacc/err_syntax12.tab.c \
    src/external/bsd/byacc/dist/test/yacc/err_syntax18.tab.c \
    src/external/bsd/byacc/dist/test/yacc/err_syntax20.tab.c \
    src/external/bsd/byacc/dist/test/yacc/error.tab.c \
    src/external/bsd/byacc/dist/test/yacc/expr.oxout.tab.c \
    src/external/bsd/byacc/dist/test/yacc/grammar.tab.c \
    src/external/bsd/byacc/dist/test/yacc/quote_calc-s.tab.c \
    src/external/bsd/byacc/dist/test/yacc/quote_calc.tab.c \
    src/external/bsd/byacc/dist/test/yacc/quote_calc2-s.tab.c \
    src/external/bsd/byacc/dist/test/yacc/quote_calc2.tab.c \
    src/external/bsd/byacc/dist/test/yacc/quote_calc3-s.tab.c \
    src/external/bsd/byacc/dist/test/yacc/quote_calc3.tab.c \
    src/external/bsd/byacc/dist/test/yacc/quote_calc4-s.tab.c \
    src/external/bsd/byacc/dist/test/yacc/quote_calc4.tab.c \
    src/external/bsd/byacc/dist/test/yacc/rename_debug.c \
    src/external/bsd/byacc/dist/test/yacc/varsyntax_calc1.tab.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
    src/external/bsd/byacc/dist/test/yacc/calc1.tab.h \
    src/external/bsd/byacc/dist/test/yacc/code_error.tab.c \
    src/external/bsd/byacc/dist/test/yacc/varsyntax_calc1.tab.h
cvs rdiff -u -r1.5 -r1.6 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
cvs rdiff -u -r1.1.1.2 -r1.2 \
    src/external/bsd/byacc/dist/test/yacc/calc_code_all.tab.c \
    src/external/bsd/byacc/dist/test/yacc/calc_code_default.tab.c \
    src/external/bsd/byacc/dist/test/yacc/calc_code_imports.tab.c \
    src/external/bsd/byacc/dist/test/yacc/calc_code_provides.tab.c \
    src/external/bsd/byacc/dist/test/yacc/calc_code_requires.tab.c \
    src/external/bsd/byacc/dist/test/yacc/calc_code_top.tab.c
cvs rdiff -u -r1.2 -r1.3 \
    src/external/bsd/byacc/dist/test/yacc/code_calc.tab.c \
    src/external/bsd/byacc/dist/test/yacc/expr.oxout.tab.h
cvs rdiff -u -r1.1.1.3 -r1.2 \
    src/external/bsd/byacc/dist/test/yacc/defines1.calc.c \
    src/external/bsd/byacc/dist/test/yacc/defines2.calc.c \
    src/external/bsd/byacc/dist/test/yacc/defines3.calc.c \
    src/external/bsd/byacc/dist/test/yacc/stdin1.calc.c \
    src/external/bsd/byacc/dist/test/yacc/stdin2.calc.c
cvs rdiff -u -r1.1.1.5 -r1.2 \
    src/external/bsd/byacc/dist/test/yacc/ok_syntax1.tab.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/byacc/include/config.h

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