CVS commit: src/external/bsd/byacc/dist

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

Module Name:    src
Committed By:   christos
Date:           Sat Feb 11 19:33:13 UTC 2017

Modified Files:
        src/external/bsd/byacc/dist: btyaccpar.c btyaccpar.skel defs.h error.c
            lalr.c lr0.c main.c mkpar.c mstring.c output.c reader.c verbose.c
            yaccpar.c
        src/external/bsd/byacc/dist/test: code_calc.y err_inherit4.y
            expr.oxout.y
        src/external/bsd/byacc/dist/test/btyacc: btyacc_calc1.tab.c
            btyacc_demo.tab.c btyacc_demo.tab.h 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_calc.tab.c
            code_calc.tab.h code_error.code.c code_error.tab.c empty.tab.c
            err_inherit1.tab.c err_inherit2.tab.c err_inherit3.tab.c
            err_inherit4.tab.c err_inherit4.tab.h err_inherit5.tab.c
            err_syntax1.tab.c err_syntax10.tab.c err_syntax11.tab.c
            err_syntax12.tab.c err_syntax13.tab.c err_syntax14.tab.c
            err_syntax15.tab.c err_syntax16.tab.c err_syntax17.tab.c
            err_syntax18.tab.c err_syntax19.tab.c err_syntax2.tab.c
            err_syntax20.tab.c err_syntax21.tab.c err_syntax22.tab.c
            err_syntax23.tab.c err_syntax24.tab.c err_syntax25.tab.c
            err_syntax26.tab.c err_syntax27.tab.c err_syntax3.tab.c
            err_syntax4.tab.c err_syntax5.tab.c err_syntax6.tab.c
            err_syntax7.tab.c err_syntax7a.tab.c err_syntax7b.tab.c
            err_syntax8.tab.c err_syntax8a.tab.c err_syntax9.tab.c error.tab.c
            expr.oxout.tab.c expr.oxout.tab.h 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: calc.tab.c calc1.tab.c
            calc2.tab.c calc3.tab.c code_calc.code.c code_calc.tab.c
            code_calc.tab.h code_error.code.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 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

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/byacc/dist/btyaccpar.c \
    src/external/bsd/byacc/dist/btyaccpar.skel
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/byacc/dist/defs.h
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/byacc/dist/error.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/byacc/dist/lalr.c
cvs rdiff -u -r1.9 -r1.10 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.12 -r1.13 src/external/bsd/byacc/dist/main.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/byacc/dist/mstring.c
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/byacc/dist/output.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/byacc/dist/reader.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/dist/yaccpar.c
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/byacc/dist/test/code_calc.y
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/byacc/dist/test/err_inherit4.y
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/byacc/dist/test/expr.oxout.y
cvs rdiff -u -r1.1.1.4 -r1.2 \
    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_demo.tab.h \
    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_calc.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/code_calc.tab.h \
    src/external/bsd/byacc/dist/test/btyacc/code_error.code.c \
    src/external/bsd/byacc/dist/test/btyacc/code_error.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/empty.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_inherit1.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_inherit2.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_inherit4.tab.h \
    src/external/bsd/byacc/dist/test/btyacc/err_inherit5.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax1.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_syntax13.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax14.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax15.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax16.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax17.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax18.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax19.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax2.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax20.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax21.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax22.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax23.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax24.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax25.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax26.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax27.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax3.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax4.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax5.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax6.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax7.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax7a.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax7b.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax8.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax8a.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/err_syntax9.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/error.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.1 -r1.2 \
    src/external/bsd/byacc/dist/test/btyacc/expr.oxout.tab.c \
    src/external/bsd/byacc/dist/test/btyacc/expr.oxout.tab.h
cvs rdiff -u -r1.1.1.4 -r1.2 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/calc3.tab.c \
    src/external/bsd/byacc/dist/test/yacc/code_calc.code.c \
    src/external/bsd/byacc/dist/test/yacc/code_calc.tab.c \
    src/external/bsd/byacc/dist/test/yacc/code_calc.tab.h \
    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/grammar.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 \
    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.1 -r1.2 \
    src/external/bsd/byacc/dist/test/yacc/expr.oxout.tab.c \
    src/external/bsd/byacc/dist/test/yacc/expr.oxout.tab.h

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