Module Name: src
Committed By: christos
Date: Sun Dec 23 15:38:54 UTC 2018
Modified Files:
src/external/bsd/byacc/dist: btyaccpar.c btyaccpar.skel closure.c
config.guess config.sub defs.h error.c graph.c lalr.c lr0.c main.c
mkpar.c output.c reader.c symtab.c verbose.c warshall.c yacc.1
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: calc.tab.c calc1.tab.c
calc2.tab.c calc3.tab.c code_calc.code.c 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 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
Removed Files:
src/external/bsd/byacc/dist/test/btyacc: btyacc_demo2.error
btyacc_demo2.output btyacc_demo2.tab.c btyacc_demo2.tab.h
code_debug.c code_debug.error code_debug.h code_debug.i
code_debug.output
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/byacc/dist/btyaccpar.c \
src/external/bsd/byacc/dist/btyaccpar.skel \
src/external/bsd/byacc/dist/graph.c src/external/bsd/byacc/dist/yaccpar.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/byacc/dist/closure.c \
src/external/bsd/byacc/dist/symtab.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/byacc/dist/config.guess \
src/external/bsd/byacc/dist/config.sub
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/byacc/dist/defs.h \
src/external/bsd/byacc/dist/error.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/byacc/dist/lalr.c \
src/external/bsd/byacc/dist/warshall.c
cvs rdiff -u -r1.10 -r1.11 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.14 -r1.15 src/external/bsd/byacc/dist/main.c \
src/external/bsd/byacc/dist/reader.c
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/byacc/dist/output.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/byacc/dist/yacc.1
cvs rdiff -u -r1.3 -r1.4 \
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.1 -r0 \
src/external/bsd/byacc/dist/test/btyacc/btyacc_demo2.error \
src/external/bsd/byacc/dist/test/btyacc/btyacc_demo2.output \
src/external/bsd/byacc/dist/test/btyacc/code_debug.error \
src/external/bsd/byacc/dist/test/btyacc/code_debug.i \
src/external/bsd/byacc/dist/test/btyacc/code_debug.output
cvs rdiff -u -r1.1.1.3 -r0 \
src/external/bsd/byacc/dist/test/btyacc/btyacc_demo2.tab.c \
src/external/bsd/byacc/dist/test/btyacc/btyacc_demo2.tab.h \
src/external/bsd/byacc/dist/test/btyacc/code_debug.c \
src/external/bsd/byacc/dist/test/btyacc/code_debug.h
cvs rdiff -u -r1.2 -r1.3 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.3 -r1.4 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.
