From: Tom H. <tom...@us...> - 2003-02-14 11:50:18
|
Update of /cvsroot/rccparser/rccparser/src In directory sc8-pr-cvs1:/tmp/cvs-serv17106/src Modified Files: Makefile.am footer.html header.html rcclexer.lpp rccparse.ypp rccparser.h Log Message: 2003-02-14 Tom Howard <tom...@us...> * ./src/rcclexer.lpp * ./src/rccparse.ypp * ./src/rccparser.h Added new penalty playmodes Index: Makefile.am =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/Makefile.am,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Makefile.am 11 Feb 2003 09:26:49 -0000 1.34 --- Makefile.am 14 Feb 2003 11:50:10 -0000 1.35 *************** *** 5,19 **** *~ \ y.tab.h \ test_script_v7 \ test_script_v8 \ doxygen.conf \ ! $(HTMLFILES) \ ! doc/html/style.css \ ! doc/html/header.jpg \ ! doc/ps/@PACKAGE@-@VERSION@.ps \ ! doc/pdf/@PACKAGE@-@VERSION@.pdf \ ! doc/xml/@PACKAGE@-@VERSION@.xml \ ! doc/htmlgz/@PACKAGE@-@VERSION@.html.tar.gz ! BUILT_SOURCES = \ --- 5,20 ---- *~ \ y.tab.h \ + y.output \ test_script_v7 \ test_script_v8 \ doxygen.conf \ ! doc/html/* \ ! doc/htmlgz/* \ ! doc/xml/* \ ! doc/ps/* \ ! doc/pdf/* \ ! doc/latex/* \ ! doc/* \ ! doc BUILT_SOURCES = \ *************** *** 114,118 **** doc/html/classrcc_1_1Parser__coll__graph.gif \ doc/html/classrcc_1_1Parser__inherit__graph.gif \ - doc/html/doxygen.css \ doc/html/doxygen.gif \ doc/html/files.html \ --- 115,118 ---- *************** *** 135,142 **** - doxygen.conf: doxygen.conf.tmpl $(AWK) -v have_dot=@HAVE_DOT@ \ ! '/@DOT@/ { sub( /@DOT@/, have_dot ); } { print }' \ $(srcdir)/doxygen.conf.tmpl > doxygen.conf --- 135,141 ---- doxygen.conf: doxygen.conf.tmpl $(AWK) -v have_dot=@HAVE_DOT@ \ ! '/@DOT@/ { sub( /@DOT@/, have_dot ); } /@INPUT@/ { sub( /@INPUT@/, "$(srcdir)" ); } { print }' \ $(srcdir)/doxygen.conf.tmpl > doxygen.conf *************** *** 146,175 **** if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/html; then rm -f doc/html; mkdir doc/html; fi ! ln -f style.css doc/html/style.css doc/html/header.jpg: header.jpg if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/html; then rm -f doc/html; mkdir doc/html; fi ! ln -f header.jpg doc/html/header.jpg doc/html/getcomments.pl: getcomments.pl if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/html; then rm -f doc/html; mkdir doc/html; fi ! ln -f getcomments.pl doc/html/getcomments.pl doc/html/comment.pl: comment.pl if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/html; then rm -f doc/html; mkdir doc/html; fi ! ln -f comment.pl doc/html/comment.pl doc/html/addcomment.pl: addcomment.pl if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/html; then rm -f doc/html; mkdir doc/html; fi ! ln -f addcomment.pl doc/html/addcomment.pl if BUILD_DOC ! $(HTMLFILES): doxygen doc/html/header.jpg doc/html/style.css doc/html/comment.pl doc/html/getcomments.pl doc/html/addcomment.pl chmod +x $@ --- 145,174 ---- if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/html; then rm -f doc/html; mkdir doc/html; fi ! cp -f $(srcdir)/style.css doc/html/style.css doc/html/header.jpg: header.jpg if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/html; then rm -f doc/html; mkdir doc/html; fi ! cp -f $(srcdir)/header.jpg doc/html/header.jpg doc/html/getcomments.pl: getcomments.pl if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/html; then rm -f doc/html; mkdir doc/html; fi ! cp -f $(srcdir)/getcomments.pl doc/html/getcomments.pl doc/html/comment.pl: comment.pl if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/html; then rm -f doc/html; mkdir doc/html; fi ! cp -f $(srcdir)/comment.pl doc/html/comment.pl doc/html/addcomment.pl: addcomment.pl if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/html; then rm -f doc/html; mkdir doc/html; fi ! cp -f $(srcdir)/addcomment.pl doc/html/addcomment.pl if BUILD_DOC ! $(HTMLFILES): doxygen chmod +x $@ *************** *** 197,213 **** else ! $(HTMLFILES): doxygen doc/html/header.jpg doc/html/style.css doc/html/comment.pl doc/html/getcomments.pl doc/html/addcomment.pl if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/html; then rm -f doc/html; mkdir doc/html; fi ! list='$(HTMLFILES)'; \ ! for file in $$list; do \ ! if test -e "$(srcdir)/$$file" \ ! && ! test "$(srcdir)/$$file" -ef "$$file"; then \ ! cp -f "$(srcdir)/$$file" "$$file"; \ ! else \ ! touch "$$file"; \ ! fi \ done ! chmod +x doc/html/index.html --- 196,210 ---- else ! $(HTMLFILES): doxygen if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/html; then rm -f doc/html; mkdir doc/html; fi ! if test -e "$(srcdir)$@" \ ! && ! test "$(srcdir)$@" -ef "$@"; then \ ! cp -f "$(srcdir)$@" "$@"; \ ! else \ ! touch "$@"; \ ! fi \ done ! chmod +x "$@" *************** *** 216,223 **** if ! test -d doc/ps; then rm -f doc/ps; mkdir doc/ps; fi if test -e "$(srcdir)$@" \ ! && ! test "$(srcdir)/$@" -ef "$@"; then \ ! cp -f $(srcdir)/$@ $@; \ else \ ! touch $@; \ fi --- 213,220 ---- if ! test -d doc/ps; then rm -f doc/ps; mkdir doc/ps; fi if test -e "$(srcdir)$@" \ ! && ! test "$(srcdir)$@" -ef "$@"; then \ ! cp -f "$(srcdir)$@" "$@"; \ else \ ! touch "$@"; \ fi *************** *** 225,233 **** if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/pdf; then rm -f doc/pdf; mkdir doc/pdf; fi ! if test -e "$(srcdir)/$@" \ ! && ! test "$(srcdir)/$@" -ef "$@"; then \ ! cp -f $(srcdir)/$@ $@; \ else \ ! touch $@; \ fi --- 222,230 ---- if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/pdf; then rm -f doc/pdf; mkdir doc/pdf; fi ! if test -e "$(srcdir)$@" \ ! && ! test "$(srcdir)$@" -ef "$@"; then \ ! cp -f "$(srcdir)$@" "$@"; \ else \ ! touch "$@"; \ fi *************** *** 235,243 **** if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/xml; then rm -f doc/xml; mkdir doc/xml; fi ! if test -e "$(srcdir)/$@" \ ! && ! test "$(srcdir)/$@" -ef "$@"; then \ ! cp -f $(srcdir)/$@ $@; \ else \ ! touch $@; \ fi --- 232,240 ---- if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/xml; then rm -f doc/xml; mkdir doc/xml; fi ! if test -e "$(srcdir)$@" \ ! && ! test "$(srcdir)$@" -ef "$@"; then \ ! cp -f "$(srcdir)$@" "$@"; \ else \ ! touch "$@"; \ fi *************** *** 245,253 **** if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/htmlgz; then rm -f doc/htmlgz; mkdir doc/htmlgz; fi ! if test -e "$(srcdir)/$@" \ ! && ! test "$(srcdir)/$@" -ef "$@"; then \ ! cp -f $(srcdir)/$@ $@; \ else \ ! touch $@; \ fi --- 242,250 ---- if ! test -d doc; then rm -f doc; mkdir doc; fi if ! test -d doc/htmlgz; then rm -f doc/htmlgz; mkdir doc/htmlgz; fi ! if test -e "$(srcdir)$@" \ ! && ! test "$(srcdir)$@" -ef "$@"; then \ ! cp -f "$(srcdir)$@" "$@"; \ else \ ! touch "$@"; \ fi *************** *** 262,275 **** doc/xml/@PACKAGE@-@VERSION@.xml \ $(HTMLFILES) \ - doc/html/style.css \ - doc/html/header.jpg \ - doc/html/comment.pl \ - doc/html/getcomments.pl \ - doc/html/addcomment.pl \ doxygen.conf.tmpl \ header.jpg \ header.html \ footer.html \ ! style.css docdir = $(pkgdatadir)/doc --- 259,270 ---- doc/xml/@PACKAGE@-@VERSION@.xml \ $(HTMLFILES) \ doxygen.conf.tmpl \ header.jpg \ header.html \ footer.html \ ! style.css \ ! comment.pl \ ! getcomments.pl \ ! addcomment.pl docdir = $(pkgdatadir)/doc *************** *** 283,287 **** xmldir = $(docdir)/xml ! html_DATA = $(HTMLFILES) doc/html/style.css doc/html/header.jpg ps_DATA = doc/ps/@PACKAGE@-@VERSION@.ps pdf_DATA = doc/pdf/@PACKAGE@-@VERSION@.pdf --- 278,282 ---- xmldir = $(docdir)/xml ! html_DATA = $(HTMLFILES) doc/html/style.css doc/html/header.jpg doc/html/comment.pl doc/html/getcomments.pl doc/html/addcomment.pl ps_DATA = doc/ps/@PACKAGE@-@VERSION@.ps pdf_DATA = doc/pdf/@PACKAGE@-@VERSION@.pdf Index: footer.html =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/footer.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** footer.html 11 Feb 2003 09:26:49 -0000 1.4 --- footer.html 14 Feb 2003 11:50:10 -0000 1.5 *************** *** 8,19 **** alt="Make a PayPal donation - it's fast, easy and secure!"></a> <p>©2001-2003 ! Tom Howard ! . All Rights Reserved. </p> <p><a href="mailto:tom...@us...">Suggestions? Email the Webmaster!</a></p> <p> <a href="http://sourceforge.net"> <img src="http://sourceforge.net/sflogo.php?group_id=26880&type=5" width="210" height="62" border="0" alt="SourceForge.net Logo"> </a> </p> --- 8,35 ---- alt="Make a PayPal donation - it's fast, easy and secure!"></a> <p>©2001-2003 ! Tom Howard. All Rights Reserved. </p> <p><a href="mailto:tom...@us...">Suggestions? Email the Webmaster!</a></p> + <p>This document was created with<br> + <a href="http://www.doxygen.org"> + <img src="doxygen.gif" border="0" alt="Doxygen"> + </a> + </p> <p> <a href="http://sourceforge.net"> <img src="http://sourceforge.net/sflogo.php?group_id=26880&type=5" width="210" height="62" border="0" alt="SourceForge.net Logo"> + </a> + </p> + <p> + <a href="http://www.mysql.com"> + <img src="http://www.mysql.com/images/poweredbymysql-125.png" + border="0" alt="Powered by MySQL"> + </a> + </p> + <p> + <a href="http://www.perl.com"> + <img src="http://perl.oreilly.com/images/perl/rectangle_power_perl.gif" + border="0" alt="Powered by Perl"> </a> </p> Index: header.html =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/header.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** header.html 11 Feb 2003 09:26:49 -0000 1.4 --- header.html 14 Feb 2003 11:50:10 -0000 1.5 *************** *** 19,22 **** --- 19,23 ---- target="_blank">Library Repository</a></td> <td class="menu"><a href="http://www.robocup.org/" target="_blank">RoboCup</a></td> + <td class="menu"><a href="http://rccparser.sourceforge.net/admin/index.html" target="_self">Admin</a></td> </tr> </table> Index: rcclexer.lpp =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rcclexer.lpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** rcclexer.lpp 10 Jan 2003 17:35:57 -0000 1.5 --- rcclexer.lpp 14 Feb 2003 11:50:10 -0000 1.6 *************** *** 151,154 **** --- 151,171 ---- free_kick_fault_l { return FREE_KICK_FAULT_LEFT_KW; } free_kick_fault_r { return FREE_KICK_FAULT_RIGHT_KW; } + penalty_setup_l { return PENALTY_SETUP_LEFT_KW; } + penalty_setup_r { return PENALTY_SETUP_RIGHT_KW; } + penalty_ready_l { return PENALTY_READY_LEFT_KW; } + penalty_ready_r { return PENALTY_READY_RIGHT_KW; } + penalty_taken_l { return PENALTY_TAKEN_LEFT_KW; } + penalty_taken_r { return PENALTY_TAKEN_RIGHT_KW; } + penalty_miss_l { return PENALTY_MISS_LEFT_KW; } + penalty_miss_r { return PENALTY_MISS_RIGHT_KW; } + penalty_score_l { return PENALTY_SCORE_LEFT_KW; } + penalty_score_r { return PENALTY_SCORE_RIGHT_KW; } + penalty_onfield_l { return PENALTY_ONFIELD_LEFT_KW; } + penalty_onfield_r { return PENALTY_ONFIELD_RIGHT_KW; } + penalty_foul_l { return PENALTY_FOUL_LEFT_KW; } + penalty_foul_r { return PENALTY_FOUL_RIGHT_KW; } + penalty_winner_l { return PENALTY_WINNER_LEFT_KW; } + penalty_winner_r { return PENALTY_WINNER_RIGHT_KW; } + penalty_draw { return PENALTY_DRAW_KW; } goal_l_ { return L_KW; } Index: rccparse.ypp =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rccparse.ypp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** rccparse.ypp 11 Feb 2003 09:26:49 -0000 1.7 --- rccparse.ypp 14 Feb 2003 11:50:10 -0000 1.8 *************** *** 237,240 **** --- 237,258 ---- %token FREE_KICK_FAULT_LEFT_KW %token FREE_KICK_FAULT_RIGHT_KW + %token PENALTY_SETUP_LEFT_KW + %token PENALTY_SETUP_RIGHT_KW + %token PENALTY_READY_LEFT_KW + %token PENALTY_READY_RIGHT_KW + %token PENALTY_TAKEN_LEFT_KW + %token PENALTY_TAKEN_RIGHT_KW + %token PENALTY_MISS_LEFT_KW + %token PENALTY_MISS_RIGHT_KW + %token PENALTY_SCORE_LEFT_KW + %token PENALTY_SCORE_RIGHT_KW + %token PENALTY_ONFIELD_LEFT_KW + %token PENALTY_ONFIELD_RIGHT_KW + %token PENALTY_FOUL_LEFT_KW + %token PENALTY_FOUL_RIGHT_KW + %token PENALTY_WINNER_LEFT_KW + %token PENALTY_WINNER_RIGHT_KW + %token PENALTY_DRAW_KW + %token GOAL_KW *************** *** 415,418 **** --- 433,470 ---- | FREE_KICK_FAULT_RIGHT_KW { PARAM.buildFreeKickFaultRightPlayMode(); } + | PENALTY_SETUP_LEFT_KW + { PARAM.buildPenaltySetupLeftPlaymode(); } + | PENALTY_SETUP_RIGHT_KW + { PARAM.buildPenaltySetupRightPlaymode(); } + | PENALTY_READY_LEFT_KW + { PARAM.buildPenaltyReadyLeftPlaymode(); } + | PENALTY_READY_RIGHT_KW + { PARAM.buildPenaltyReadyRightPlaymode(); } + | PENALTY_TAKEN_LEFT_KW + { PARAM.buildPenaltyTakenLeftPlaymode(); } + | PENALTY_TAKEN_RIGHT_KW + { PARAM.buildPenaltyTakenRightPlaymode(); } + | PENALTY_MISS_LEFT_KW + { PARAM.buildPenaltyMissLeftPlaymode(); } + | PENALTY_MISS_RIGHT_KW + { PARAM.buildPenaltyMissRightPlaymode(); } + | PENALTY_SCORE_LEFT_KW + { PARAM.buildPenaltyScoreLeftPlaymode(); } + | PENALTY_SCORE_RIGHT_KW + { PARAM.buildPenaltyScoreRightPlaymode(); } + | PENALTY_ONFIELD_LEFT_KW + { PARAM.buildPenaltyOnFieldLeftPlaymode(); } + | PENALTY_ONFIELD_RIGHT_KW + { PARAM.buildPenaltyOnFieldRightPlaymode(); } + | PENALTY_FOUL_LEFT_KW + { PARAM.buildPenaltyFoulLeftPlaymode(); } + | PENALTY_FOUL_RIGHT_KW + { PARAM.buildPenaltyFoulRightPlaymode(); } + | PENALTY_WINNER_LEFT_KW + { PARAM.buildPenaltyWinnerLeftPlaymode(); } + | PENALTY_WINNER_RIGHT_KW + { PARAM.buildPenaltyWinnerRightPlaymode(); } + | PENALTY_DRAW_KW + { PARAM.buildPenaltyDrawPlaymode(); } ; Index: rccparser.h =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rccparser.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** rccparser.h 11 Feb 2003 09:26:49 -0000 1.26 --- rccparser.h 14 Feb 2003 11:50:10 -0000 1.27 *************** *** 550,553 **** --- 550,622 ---- void + buildPenaltySetupLeftPlaymode() + { M_parser.doBuildPenaltySetupLeftPlaymode(); } + + void + buildPenaltySetupRightPlaymode() + { M_parser.doBuildPenaltySetupRightPlaymode(); } + + void + buildPenaltyReadyLeftPlaymode() + { M_parser.doBuildPenaltyReadyLeftPlaymode(); } + + void + buildPenaltyReadyRightPlaymode() + { M_parser.doBuildPenaltyReadyRightPlaymode(); } + + void + buildPenaltyTakenLeftPlaymode() + { M_parser.doBuildPenaltyTakenLeftPlaymode(); } + + void + buildPenaltyTakenRightPlaymode() + { M_parser.doBuildPenaltyTakenRightPlaymode(); } + + void + buildPenaltyMissLeftPlaymode() + { M_parser.doBuildPenaltyMissLeftPlaymode(); } + + void + buildPenaltyMissRightPlaymode() + { M_parser.doBuildPenaltyMissRightPlaymode(); } + + void + buildPenaltyScoreLeftPlaymode() + { M_parser.doBuildPenaltyScoreLeftPlaymode(); } + + void + buildPenaltyScoreRightPlaymode() + { M_parser.doBuildPenaltyScoreRightPlaymode(); } + + void + buildPenaltyOnFieldLeftPlaymode() + { M_parser.doBuildPenaltyOnFieldLeftPlaymode(); } + + void + buildPenaltyOnFieldRightPlaymode() + { M_parser.doBuildPenaltyOnFieldRightPlaymode(); } + + void + buildPenaltyFoulLeftPlaymode() + { M_parser.doBuildPenaltyFoulLeftPlaymode(); } + + void + buildPenaltyFoulRightPlaymode() + { M_parser.doBuildPenaltyFoulRightPlaymode(); } + + void + buildPenaltyWinnerLeftPlaymode() + { M_parser.doBuildPenaltyWinnerLeftPlaymode(); } + + void + buildPenaltyWinnerRightPlaymode() + { M_parser.doBuildPenaltyWinnerRightPlaymode(); } + + void + buildPenaltyDrawPlaymode() + { M_parser.doBuildPenaltyDrawPlaymode(); } + + + void buildScore( int our, int opp ) { M_parser.doBuildScore( our, opp ); } *************** *** 2952,2955 **** --- 3021,3093 ---- void doBuildFreeKickFaultRightPlayMode() {} + + virtual + void + doBuildPenaltySetupLeftPlaymode() {} + + virtual + void + doBuildPenaltySetupRightPlaymode() {} + + virtual + void + doBuildPenaltyReadyLeftPlaymode() {} + + virtual + void + doBuildPenaltyReadyRightPlaymode() {} + + virtual + void + doBuildPenaltyTakenLeftPlaymode() {} + + virtual + void + doBuildPenaltyTakenRightPlaymode() {} + + virtual + void + doBuildPenaltyMissLeftPlaymode() {} + + virtual + void + doBuildPenaltyMissRightPlaymode() {} + + virtual + void + doBuildPenaltyScoreLeftPlaymode() {} + + virtual + void + doBuildPenaltyScoreRightPlaymode() {} + + virtual + void + doBuildPenaltyOnFieldLeftPlaymode() {} + + virtual + void + doBuildPenaltyOnFieldRightPlaymode() {} + + virtual + void + doBuildPenaltyFoulLeftPlaymode() {} + + virtual + void + doBuildPenaltyFoulRightPlaymode() {} + + virtual + void + doBuildPenaltyWinnerLeftPlaymode() {} + + virtual + void + doBuildPenaltyWinnerRightPlaymode() {} + + virtual + void + doBuildPenaltyDrawPlaymode() {} + //@} |