Menu
▾
▴
[Rccparser-commits] CVS: rccparser/src Makefile.am,1.39,1.40 rccparse.ypp,1.12,1.13 rccparser.h,1.33,1.34
|
From: Tom H. <tom...@us...> - 2003-04-23 04:08:46
|
Update of /cvsroot/rccparser/rccparser/src
In directory sc8-pr-cvs1:/tmp/cvs-serv6133/src
Modified Files:
Makefile.am rccparse.ypp rccparser.h
Log Message:
2003-04-23 Tom Howard <tom...@us...>
* ./configure.in
* ./src/Makefile.am
Fixed documentation building
* ./src/rccparse.ypp
* ./src/rccparser.h
Fixed newly introduced init parsing errors.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/rccparser/rccparser/src/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Makefile.am 24 Mar 2003 19:27:34 -0000 1.39
--- Makefile.am 23 Apr 2003 04:08:43 -0000 1.40
***************
*** 10,29 ****
doxygen.conf \
doc/html/* \
! doc/htmlgz/* \
! doc/xml/* \
! doc/ps/* \
! doc/pdf/* \
doc/latex/* \
- doc/* \
- doc \
header.tex
BUILT_SOURCES = \
rccparse.h \
rcclexer.cpp
librccparser_la_SOURCES = \
rcclexer.cpp \
! rccparse.ypp \
rccparser.cpp
--- 10,29 ----
doxygen.conf \
doc/html/* \
! doc/htmlgz/@PACKAGE@-@VERSION@.html.tar.gz \
! doc/xml/@PACKAGE@-@VERSION@.xml \
! doc/ps/@PACKAGE@-@VERSION@.ps \
! doc/pdf/@PACKAGE@-@VERSION@.pdf \
doc/latex/* \
header.tex
BUILT_SOURCES = \
rccparse.h \
+ rccparse.cpp \
rcclexer.cpp
librccparser_la_SOURCES = \
rcclexer.cpp \
! rccparse.cpp \
! rccparse.h \
rccparser.cpp
***************
*** 63,66 ****
--- 63,83 ----
AM_YFLAGS=-d -v
+ YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+
+ .ypp.cpp:
+ $(YACCCOMPILE) `test -f '$<' || echo '$(srcdir)/'`$<
+ sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@
+ rm -f y.tab.c
+ if test -f y.tab.h; then \
+ to=`echo "$*_H" | sed \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
+ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \
+ sed "/^#/ s/Y_TAB_H/$$to/g" y.tab.h >$*.h; \
+ fi
+ if test -f y.output; then \
+ mv y.output $*.output; \
+ fi
+
+
.ypp.h: $*.ypp
if test -e "$*.cpp"; then \
***************
*** 69,73 ****
elif test "$*.h" -ot "$*.ypp"; then \
$(MAKE) $(AM_MAKEFLAGS) -W "$*.ypp" $*.cpp; \
- touch "$*.h"; \
fi \
else \
--- 86,89 ----
***************
*** 185,190 ****
@cp -f $(srcdir)/addcomment.pl doc/html/addcomment.pl
! doxygen: doxygen.conf
if BUILD_DOC
--- 201,211 ----
@cp -f $(srcdir)/addcomment.pl doc/html/addcomment.pl
+ htmlgz: doc/htmlgz/@PACKAGE@-@VERSION@.html.tar.gz
! doc/htmlgz/@PACKAGE@-@VERSION@.html.tar.gz: $(HTMLFILES) doc/html/style.css doc/html/comment.pl doc/html/getcomments.pl doc/html/addcomment.pl
! @if ! test -d doc/htmlgz; then rm -f doc/htmlgz; mkdir doc/htmlgz; fi
! @ln -s doc/html @PACKAGE@-@VERSION@.html
! @$(AMTAR) chof - "@PACKAGE@-@VERSION@.html" | GZIP=$(GZIP_ENV) gzip -c >"doc/htmlgz/@PACKAGE@-@VERSION@.html.tar.gz"
! @rm -rf @PACKAGE@-@VERSION@.html
if BUILD_DOC
***************
*** 199,236 ****
'/@HAVE_DOT@/ { sub( /@HAVE_DOT@/, have_dot ); } /@INPUT@/ { sub( /@INPUT@/, "$(srcdir)" ); } { print }' \
$(srcdir)/doxygen.conf.tmpl > doxygen.conf
! doxygen doxygen.conf
! @rm -f doc/latex/doxygen.sty
! $(HTMLFILES): doxygen doc/html/header.html doc/html/footer.html doc/html/style.css
@chmod +x $@
@touch $@
! doc/ps/@PACKAGE@-@VERSION@.ps: doxygen doc/latex/doxygen.sty RC.eps
! if ! test -d doc; then rm -f doc; mkdir doc; fi
! if ! test -d doc/latex; then rm -f doc/latex; mkdir doc/latex; fi
! cp -f $(srcdir)/RC.eps doc/latex/RC.eps
! cd doc/latex && $(MAKE) $(AM_MAKEFLAGS) ps
! if ! test -d doc/ps; then mkdir doc/ps; fi
! cp doc/latex/refman.ps doc/ps/@PACKAGE@-@VERSION@.ps
! doc/pdf/@PACKAGE@-@VERSION@.pdf: doc/ps/@PACKAGE@-@VERSION@.ps doxygen doc/latex/doxygen.sty RC.epdf
! if ! test -d doc; then rm -f doc; mkdir doc; fi
! if ! test -d doc/latex; then rm -f doc/latex; mkdir doc/latex; fi
! cp -f $(srcdir)/RC.epdf doc/latex/RC.pdf
! cd doc/latex && $(MAKE) $(AM_MAKEFLAGS) pdf
! if ! test -d doc/pdf; then mkdir doc/pdf; fi
! cp doc/latex/refman.pdf doc/pdf/@PACKAGE@-@VERSION@.pdf
! doc/xml/doxygen.xml: doxygen
! doc/xml/@PACKAGE@-@VERSION@.xml: doc/xml/doxygen.xml
! @cp doc/xml/doxygen.xml doc/xml/@PACKAGE@-@VERSION@.xml
! doc/htmlgz/@PACKAGE@-@VERSION@.html.tar.gz: $(HTMLFILES) doc/html/style.css doc/html/comment.pl doc/html/getcomments.pl doc/html/addcomment.pl
! @if ! test -d doc/htmlgz; then rm -f doc/htmlgz; mkdir doc/htmlgz; fi
! @ln -s doc/html @PACKAGE@-@VERSION@.html
! @$(AMTAR) chof - "@PACKAGE@-@VERSION@.html" | GZIP=$(GZIP_ENV) gzip -c >"doc/htmlgz/@PACKAGE@-@VERSION@.html.tar.gz"
! @rm -rf @PACKAGE@-@VERSION@.html
else
--- 220,296 ----
'/@HAVE_DOT@/ { sub( /@HAVE_DOT@/, have_dot ); } /@INPUT@/ { sub( /@INPUT@/, "$(srcdir)" ); } { print }' \
$(srcdir)/doxygen.conf.tmpl > doxygen.conf
! @echo "Running doxygen..."
! @doxygen doxygen.conf
! @rm doc/latex/doxygen.sty
! $(HTMLFILES): doxygen.conf doc/html/header.html doc/html/footer.html doc/html/style.css
@chmod +x $@
@touch $@
! doc/latex/refman.tex: doxygen.conf
! doc/latex/refman.idx: doxygen.conf
! doc/latex/@PACKAGE@-@VERSION@.tex: doc/latex/refman.tex
! @cp doc/latex/refman.tex doc/latex/@PACKAGE@-@VERSION@.tex
! doc/latex/@PACKAGE@-@VERSION@.idx: doc/latex/@PACKAGE@-@VERSION@.tex doc/latex/RC.eps
! @echo "Running latex..."
! @cd doc/latex && latex @PACKAGE@-@VERSION@.tex
+ doc/latex/@PACKAGE@-@VERSION@-ni.ind: doc/latex/@PACKAGE@-@VERSION@.idx
+ @echo "Running makeindex..."
+ @cd doc/latex && makeindex @PACKAGE@-@VERSION@.idx
+ @cp doc/latex/@PACKAGE@-@VERSION@.ind doc/latex/@PACKAGE@-@VERSION@-ni.ind
! doc/latex/@PACKAGE@-@VERSION@-ni.tex: doc/latex/@PACKAGE@-@VERSION@.tex
! @cd doc/latex && sed 's/\\makeindex//' @PACKAGE@-@VERSION@.tex > @PACKAGE@-@VERSION@-ni.tex
!
! doc/latex/@PACKAGE@-@VERSION@.dvi: doc/latex/@PACKAGE@-@VERSION@-ni.tex doc/latex/@PACKAGE@-@VERSION@-ni.ind doc/latex/doxygen.sty
! @echo "Rerunning latex...."
! @cd doc/latex && latex @PACKAGE@-@VERSION@-ni.tex
! @cp doc/latex/@PACKAGE@-@VERSION@-ni.dvi doc/latex/@PACKAGE@-@VERSION@.dvi
!
! doc/latex/RC.eps: RC.eps
! @if ! test -d doc; then rm -f doc; mkdir doc; fi
! @if ! test -d doc/latex; then rm -f doc/ps; mkdir doc/latex; fi
! @cp -f $(srcdir)/RC.eps doc/latex/RC.eps
!
! doc/ps/@PACKAGE@-@VERSION@.ps: doc/latex/@PACKAGE@-@VERSION@.dvi doc/latex/RC.eps
! @if ! test -d doc/ps; then mkdir doc/ps; fi
! @echo "Creating ps documentation..."
! @cd doc/latex/ && dvips -o ../ps/@PACKAGE@-@VERSION@.ps @PACKAGE@-@VERSION@.dvi
!
! doc/latex/RC.pdf: RC.epdf
! @if ! test -d doc; then rm -f doc; mkdir doc; fi
! @if ! test -d doc/latex; then rm -f doc/latex; mkdir doc/latex; fi
! @cp -f $(srcdir)/RC.epdf doc/latex/RC.pdf
!
! doc/latex/@PACKAGE@-@VERSION@-pdf.tex: doc/latex/@PACKAGE@-@VERSION@.tex
! @cp doc/latex/@PACKAGE@-@VERSION@.tex doc/latex/@PACKAGE@-@VERSION@-pdf.tex
!
! doc/latex/@PACKAGE@-@VERSION@-pdf.idx: doc/latex/@PACKAGE@-@VERSION@.tex doc/latex/RC.pdf doc/latex/doxygen.sty
! @echo "Running pdflatex..."
! @cd doc/latex && pdflatex @PACKAGE@-@VERSION@-pdf.tex
!
! doc/latex/@PACKAGE@-@VERSION@-pdf-ni.ind: doc/latex/@PACKAGE@-@VERSION@-pdf.idx
! @echo "Running makeindex..."
! @cd doc/latex && makeindex @PACKAGE@-@VERSION@-pdf.idx
! @cp doc/latex/@PACKAGE@-@VERSION@-pdf.ind doc/latex/@PACKAGE@-@VERSION@-pdf-ni.ind
!
! doc/latex/@PACKAGE@-@VERSION@-pdf-ni.tex: doc/latex/@PACKAGE@-@VERSION@-pdf.tex
! @cd doc/latex && sed 's/\\makeindex//' @PACKAGE@-@VERSION@-pdf.tex > @PACKAGE@-@VERSION@-pdf-ni.tex
!
! doc/pdf/@PACKAGE@-@VERSION@.pdf: doc/latex/@PACKAGE@-@VERSION@-pdf-ni.tex doc/latex/@PACKAGE@-@VERSION@-pdf-ni.ind doc/latex/doxygen.sty doc/latex/RC.pdf
! @echo "Rerunning pdflatex...."
! @cd doc/latex && pdflatex @PACKAGE@-@VERSION@-pdf-ni.tex
! @cp doc/latex/@PACKAGE@-@VERSION@-pdf-ni.pdf doc/latex/@PACKAGE@-@VERSION@.pdf
! @if ! test -d doc/pdf; then mkdir doc/pdf; fi
! @cp doc/latex/@PACKAGE@-@VERSION@-pdf-ni.pdf doc/pdf/@PACKAGE@-@VERSION@.pdf
!
! doc/xml/doxygen.xml: doxygen.conf
!
! doc/xml/@PACKAGE@-@VERSION@.xml: doc/xml/doxygen.xml
! @cp doc/xml/doxygen.xml doc/xml/@PACKAGE@-@VERSION@.xml
else
***************
*** 246,278 ****
$(srcdir)/doxygen.conf.tmpl > doxygen.conf
! $(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 "$@"
! doc/ps/@PACKAGE@-@VERSION@.ps: doxygen
! if ! test -d doc; then rm -f doc; mkdir doc; fi
! 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
! doc/pdf/@PACKAGE@-@VERSION@.pdf: doxygen
! 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 "$@"; \
--- 306,337 ----
$(srcdir)/doxygen.conf.tmpl > doxygen.conf
! $(HTMLFILES): doxygen.conf
! @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
! @chmod +x "$@"
! doc/ps/@PACKAGE@-@VERSION@.ps: doxygen.conf
! @if ! test -d doc; then rm -f doc; mkdir doc; fi
! @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
! doc/pdf/@PACKAGE@-@VERSION@.pdf: doxygen.conf
! @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 "$@"; \
***************
*** 280,301 ****
doc/xml/@PACKAGE@-@VERSION@.xml: $(pkginclude_HEADERS) $(librccparser_la_SOURCES) $(rccptest_SOURCES) doxygen.conf header.html footer.html
! 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
! doc/htmlgz/@PACKAGE@-@VERSION@.html.tar.gz: $(HTMLFILES) 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/htmlgz; then rm -f doc/htmlgz; mkdir doc/htmlgz; fi
! if test -e "$(srcdir)$@" \
! && ! test "$(srcdir)$@" -ef "$@"; then \
! cp -f "$(srcdir)$@" "$@"; \
! else \
! touch "$@"; \
! fi
endif
--- 339,352 ----
doc/xml/@PACKAGE@-@VERSION@.xml: $(pkginclude_HEADERS) $(librccparser_la_SOURCES) $(rccptest_SOURCES) doxygen.conf header.html footer.html
! @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
!
endif
***************
*** 304,308 ****
doc: $(HTMLFILES) doc/ps/@PACKAGE@-@VERSION@.ps doc/pdf/@PACKAGE@-@VERSION@.pdf doc/xml/@PACKAGE@-@VERSION@.xml doc/htmlgz/@PACKAGE@-@VERSION@.html.tar.gz
! EXTRA_DIST = clang.data out.data rcclexer.lpp ac_lib_rccparser.m4 \
doc/ps/@PACKAGE@-@VERSION@.ps \
doc/pdf/@PACKAGE@-@VERSION@.pdf \
--- 355,360 ----
doc: $(HTMLFILES) doc/ps/@PACKAGE@-@VERSION@.ps doc/pdf/@PACKAGE@-@VERSION@.pdf doc/xml/@PACKAGE@-@VERSION@.xml doc/htmlgz/@PACKAGE@-@VERSION@.html.tar.gz
! EXTRA_DIST = clang.data out.data rcclexer.lpp rccparse.ypp \
! ac_lib_rccparser.m4 \
doc/ps/@PACKAGE@-@VERSION@.ps \
doc/pdf/@PACKAGE@-@VERSION@.pdf \
***************
*** 326,329 ****
--- 378,383 ----
htmldir = $(docdir)/html
+ htmlgzdir = $(docdir)/htmlgz
+
psdir = $(docdir)/ps
***************
*** 333,336 ****
--- 387,391 ----
html_DATA = $(HTMLFILES) doc/html/style.css doc/html/header.jpg doc/html/comment.pl doc/html/getcomments.pl doc/html/addcomment.pl
+ htmlgz_DATA = doc/htmlgz/@PACKAGE@-@VERSION@.html.tar.gz
ps_DATA = doc/ps/@PACKAGE@-@VERSION@.ps
pdf_DATA = doc/pdf/@PACKAGE@-@VERSION@.pdf
Index: rccparse.ypp
===================================================================
RCS file: /cvsroot/rccparser/rccparser/src/rccparse.ypp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** rccparse.ypp 22 Apr 2003 00:46:39 -0000 1.12
--- rccparse.ypp 23 Apr 2003 04:08:43 -0000 1.13
***************
*** 1277,1281 ****
init: LP INIT_KW side INT play_mode RP
{ PARAM.buildInit( getInt( $4 ) ); }
! | LP INIT_KW side RP
{ PARAM.buildInit(); };
| LP INIT_KW OK_KW RP
--- 1277,1283 ----
init: LP INIT_KW side INT play_mode RP
{ PARAM.buildInit( getInt( $4 ) ); }
! | LP INIT_KW side play_mode RP
! { PARAM.buildInit(); };
! | LP INIT_KW side OK_KW RP
{ PARAM.buildInit(); };
| LP INIT_KW OK_KW RP
Index: rccparser.h
===================================================================
RCS file: /cvsroot/rccparser/rccparser/src/rccparser.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** rccparser.h 22 Apr 2003 00:46:40 -0000 1.33
--- rccparser.h 23 Apr 2003 04:08:43 -0000 1.34
***************
*** 7630,7641 ****
doBuildInit( int unum ) {}
! /** This function is called after parsing an online coach init message
*
! * Override this function in your subclass to handle player
! * online coach init messages
*
! * \pre The client is an online coach
*
! * \pre An entire online coach init message has been parsed.
*
*/
--- 7630,7640 ----
doBuildInit( int unum ) {}
! /** This function is called after parsing an online coach init message or a player reconnect message
*
! * Override this function in your subclass to handle player reconnect messages or online coach init messages
*
! * \pre The client is an online coach or player
*
! * \pre An entire online coach init message or player reconnect has been parsed.
*
*/
|
