Menu
▾
▴
[Rccparser-commits] CVS: rccparser/src Makefile.am,1.41,1.42 doxygen.conf.tmpl,1.2,1.3 rcclexer.lpp,1.7,1.8 rccparse.ypp,1.15,1.16 rccparser.h,1.37,1.38
|
From: Tom H. <tom...@us...> - 2003-06-30 06:45:38
|
Update of /cvsroot/rccparser/rccparser/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1709/src
Modified Files:
Makefile.am doxygen.conf.tmpl rcclexer.lpp rccparse.ypp
rccparser.h
Log Message:
2003-06-30 Tom Howard <tom...@us...>
* ./Makefile.am
* ./acinclude.m4
* ./configure.in
* ./src/Makefile.am
* ./src/doxygen.conf.tmpl
Removed building of pdf and ps documentation due to errors
Index: Makefile.am
===================================================================
RCS file: /cvsroot/rccparser/rccparser/src/Makefile.am,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** Makefile.am 23 Apr 2003 04:45:48 -0000 1.41
--- Makefile.am 30 Jun 2003 06:45:35 -0000 1.42
***************
*** 218,223 ****
HAVE_DOT="NO"; \
fi; \
! $(AWK) -v have_dot=$$HAVE_DOT \
! '/@HAVE_DOT@/ { sub( /@HAVE_DOT@/, have_dot ); } /@INPUT@/ { sub( /@INPUT@/, "$(srcdir)" ); } { print }' \
$(srcdir)/doxygen.conf.tmpl > doxygen.conf
@echo "Running doxygen..."
--- 218,228 ----
HAVE_DOT="NO"; \
fi; \
! if test "@PDFLATEX@"; then \
! HAVE_PDFLATEX="YES"; \
! else \
! HAVE_PDFLATEX="NO"; \
! fi; \
! $(AWK) -v have_dot=$$HAVE_DOT -v have_pdflatex=$$HAVE_PDFLATEX\
! '/@HAVE_DOT@/ { sub( /@HAVE_DOT@/, have_dot ); } /@HAVE_PDFLATEX@/ { sub( /@HAVE_PDFLATEX@/, have_pdflatex); } /@INPUT@/ { sub( /@INPUT@/, "$(srcdir)" ); } { print }' \
$(srcdir)/doxygen.conf.tmpl > doxygen.conf
@echo "Running doxygen..."
***************
*** 229,295 ****
@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/@PACKAGE@-@VERSION@.xml: doxygen.conf
! @mv doc/xml/doxygen.xml doc/xml/@PACKAGE@-@VERSION@.xml
else
--- 234,319 ----
@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 doc/latex/doxygen.sty
! # @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
! # if USE_PDFLATEX
! # 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
! # endif
! # 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
!
! # if USE_PDFLATEX
!
! # 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
! # else
!
! # if USE_PS2PDF
!
! # doc/pdf/@PACKAGE@-@VERSION@.pdf: doc/ps/@PACKAGE@-@VERSION@.ps
! # @echo "unning @PS2PDF@...."
! # @@PDF2PDF@ "doc/ps/@PACKAGE@-@VERSION@.ps" -o "$@"
!
! # endif
!
! # endif
!
!
! # doc/xml/@PACKAGE@-@VERSION@.xml: doxygen.conf
! # @mv doc/xml/doxygen.xml doc/xml/@PACKAGE@-@VERSION@.xml
else
***************
*** 317,349 ****
! 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 "$@"; \
! fi
! 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
--- 341,373 ----
! # 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 "$@"; \
! # fi
! # 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
***************
*** 351,363 ****
endif
- 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 \
! doc/xml/@PACKAGE@-@VERSION@.xml \
! $(HTMLFILES) \
doxygen.conf.tmpl \
header.jpg \
--- 375,408 ----
endif
+ # if USE_PDFLATEX
+
+ # DOC=$(HTMLFILES) doc/ps/@PACKAGE@-@VERSION@.ps doc/pdf/@PACKAGE@-@VERSION@.pdf doc/xml/@PACKAGE@-@VERSION@.xml doc/htmlgz/@PACKAGE@-@VERSION@.html.tar.gz
+
+ # else
+
+ # if USE_PS2PDF
+
+ # DOC=$(HTMLFILES) doc/ps/@PACKAGE@-@VERSION@.ps doc/pdf/@PACKAGE@-@VERSION@.pdf doc/xml/@PACKAGE@-@VERSION@.xml doc/htmlgz/@PACKAGE@-@VERSION@.html.tar.gz
+
+ # else
+
+ # DOC=$(HTMLFILES) doc/ps/@PACKAGE@-@VERSION@.ps doc/xml/@PACKAGE@-@VERSION@.xml doc/htmlgz/@PACKAGE@-@VERSION@.html.tar.gz
+
+ # endif
+
+ #else
+
+ # DOC=$(HTMLFILES) doc/ps/@PACKAGE@-@VERSION@.ps doc/xml/@PACKAGE@-@VERSION@.xml doc/htmlgz/@PACKAGE@-@VERSION@.html.tar.gz
+
+ # endif
+
+ DOC=$(HTMLFILES) doc/htmlgz/@PACKAGE@-@VERSION@.html.tar.gz
+
+ doc: $(DOC)
EXTRA_DIST = clang.data out.data rcclexer.lpp rccparse.ypp \
ac_lib_rccparser.m4 \
! $(DOC) \
doxygen.conf.tmpl \
header.jpg \
***************
*** 379,392 ****
htmlgzdir = $(docdir)/htmlgz
! psdir = $(docdir)/ps
! pdfdir = $(docdir)/pdf
! 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
htmlgz_DATA = doc/htmlgz/@PACKAGE@-@VERSION@.html.tar.gz
! ps_DATA = doc/ps/@PACKAGE@-@VERSION@.ps
! pdf_DATA = doc/pdf/@PACKAGE@-@VERSION@.pdf
! xml_DATA = doc/xml/@PACKAGE@-@VERSION@.xml
--- 424,506 ----
htmlgzdir = $(docdir)/htmlgz
! # psdir = $(docdir)/ps
! # pdfdir = $(docdir)/pdf
! # 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
htmlgz_DATA = doc/htmlgz/@PACKAGE@-@VERSION@.html.tar.gz
! # ps_DATA = doc/ps/@PACKAGE@-@VERSION@.ps
!
! # if USE_PDFLATEX
!
! # pdf_DATA = doc/pdf/@PACKAGE@-@VERSION@.pdf
!
! # else
!
! # if USE_PS2PDF
+ # pdf_DATA = doc/pdf/@PACKAGE@-@VERSION@.pdf
+
+ # endif
+ # endif
+
+ # xml_DATA = doc/xml/@PACKAGE@-@VERSION@.xml
+
+ install_files:
+ rm -f install_files
+ @list='$(html_DATA)'; \
+ for p in $$list; do \
+ echo "%{_datadir}/@PACKAGE@/$$p" >> install_files; \
+ done
+ @list='$(htmlgz_DATA)'; \
+ for p in $$list; do \
+ echo "%{_datadir}/@PACKAGE@/$$p" >> install_files; \
+ done
+ @list='$(ps_DATA)'; \
+ for p in $$list; do \
+ echo "%{_datadir}/@PACKAGE@/$$p" >> install_files; \
+ done
+ @list='$(pdf_DATA)'; \
+ for p in $$list; do \
+ echo "%{_datadir}/@PACKAGE@/$$p" >> install_files; \
+ done
+ @list='$(xml_DATA)'; \
+ for p in $$list; do \
+ echo "%{_datadir}/@PACKAGE@/$$p" >> install_files; \
+ done
+ @list='$(pkglib_LTLIBRARIES)'; \
+ for p in $$list; do \
+ f=`echo $$p | sed -e 's/\.la/.*/'`; \
+ echo "%{_libdir}/@PACKAGE@/$$f" >> install_files; \
+ done
+ @list='$(lib_LTLIBRARIES)'; \
+ for p in $$list; do \
+ f=`echo $$p | sed -e 's/\.la/.*/'`; \
+ echo "%{_libdir}/$$f" >> install_files; \
+ done
+ @list='$(pkgbin_PROGRAMS)'; \
+ for p in $$list; do \
+ echo "%{_bindir}/@PACKAGE@/$$p" >> install_files; \
+ done
+ @list='$(bin_PROGRAMS)'; \
+ for p in $$list; do \
+ echo "%{_bindir}/$$p" >> install_files; \
+ done
+ @list='$(pkginclude_HEADERS)'; \
+ for p in $$list; do \
+ echo "%{_includedir}/@PACKAGE@/$$p" >> install_files; \
+ done
+ @list='$(include_HEADERS)'; \
+ for p in $$list; do \
+ echo "%{_includedir}/$$p" >> install_files; \
+ done
+ @list='$(pkgdata_DATA)'; \
+ for p in $$list; do \
+ echo "%{_datadir}/@PACKAGE@/$$p" >> install_files; \
+ done
+ @list='$(data_DATA)'; \
+ for p in $$list; do \
+ echo "%{_datadir}/$$p" >> install_files; \
+ done
Index: doxygen.conf.tmpl
===================================================================
RCS file: /cvsroot/rccparser/rccparser/src/doxygen.conf.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** doxygen.conf.tmpl 6 May 2003 07:24:17 -0000 1.2
--- doxygen.conf.tmpl 30 Jun 2003 06:45:35 -0000 1.3
***************
*** 94,105 ****
# configuration options related to the LaTeX output
#---------------------------------------------------------------------------
! GENERATE_LATEX = YES
LATEX_OUTPUT = latex
COMPACT_LATEX = NO
PAPER_TYPE = a4
EXTRA_PACKAGES =
! LATEX_HEADER = header.tex
PDF_HYPERLINKS = YES
! USE_PDFLATEX = YES
LATEX_BATCHMODE = NO
#---------------------------------------------------------------------------
--- 94,105 ----
# configuration options related to the LaTeX output
#---------------------------------------------------------------------------
! GENERATE_LATEX = NO
LATEX_OUTPUT = latex
COMPACT_LATEX = NO
PAPER_TYPE = a4
EXTRA_PACKAGES =
! LATEX_HEADER =
PDF_HYPERLINKS = YES
! USE_PDFLATEX = @HAVE_PDFLATEX@
LATEX_BATCHMODE = NO
#---------------------------------------------------------------------------
Index: rcclexer.lpp
===================================================================
RCS file: /cvsroot/rccparser/rccparser/src/rcclexer.lpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rcclexer.lpp 19 Mar 2003 18:40:31 -0000 1.7
--- rcclexer.lpp 30 Jun 2003 06:45:35 -0000 1.8
***************
*** 25,34 ****
#include <math.h>
- namespace
- {
- std::string
- stripQuotes( const char* str )
- { return std::string( str + 1, strlen( str ) - 2 ); }
- }
// #define YY_USER_ACTION { if( YYText()[ 0 ] != 0 ) std::cout << YYText(); else std::cout << "-" << std::endl; }
--- 25,28 ----
***************
*** 54,58 ****
QSTR \"[^\"]*\"
!
--- 48,52 ----
QSTR \"[^\"]*\"
! STR [a-zA-Z_]*
***************
*** 190,194 ****
goalie { return GOALIE_KW; }
! {QSTR} { *M_lexed_val = stripQuotes( YYText() ); return QSTR; }
coach { return COACH_KW; }
--- 184,188 ----
goalie { return GOALIE_KW; }
! {QSTR} { if( YYLeng() > rcc::Holder::STR_MAX ) return ERROR; M_lexed_val->setQStr( YYText() ); return QSTR; }
coach { return COACH_KW; }
***************
*** 249,253 ****
compression_unsupported { return COMPRESSION_KW; }
! [a-zA-Z_]* { *M_lexed_val = std::string( YYText() ); return OTHER; }
. { return ERROR; }
--- 243,247 ----
compression_unsupported { return COMPRESSION_KW; }
! {STR} { *M_lexed_val = YYText(); return OTHER; }
. { return ERROR; }
Index: rccparse.ypp
===================================================================
RCS file: /cvsroot/rccparser/rccparser/src/rccparse.ypp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** rccparse.ypp 3 May 2003 16:52:37 -0000 1.15
--- rccparse.ypp 30 Jun 2003 06:45:35 -0000 1.16
***************
*** 147,165 ****
inline
! const std::string&
getString( const rcc::Holder& holder )
{ return holder.getStr(); }
inline
! std::string&
getString( rcc::Holder& holder )
{ return holder.getStr(); }
inline
- const char*
- getCStr( const rcc::Holder& holder )
- { return holder.getCStr(); }
-
- inline
bool
getBool( const rcc::Holder& holder )
--- 147,160 ----
inline
! const char*
getString( const rcc::Holder& holder )
{ return holder.getStr(); }
inline
! const char*
getString( rcc::Holder& holder )
{ return holder.getStr(); }
inline
bool
getBool( const rcc::Holder& holder )
***************
*** 916,920 ****
{
PARAM.buildParam( getString( $2 ),
! getString( $3 ) );
}
;
--- 911,915 ----
{
PARAM.buildParam( getString( $2 ),
! rcss::stripQuotes( getString( $3 ) ) );
}
;
***************
*** 1087,1092 ****
| LP non_close_goal_name REAL RP
{ PARAM.buildGoal( false,
! getDouble( $3 ) );
! }
| LP close_goal_name REAL RP
{ PARAM.buildGoal( true,
--- 1082,1086 ----
| LP non_close_goal_name REAL RP
{ PARAM.buildGoal( false,
! getDouble( $3 ) ); }
| LP close_goal_name REAL RP
{ PARAM.buildGoal( true,
***************
*** 1243,1263 ****
! close_player_name: LP CLOSE_P_KW RP {}
! too_far_player_name: LP P_KW RP {}
! far_player_name: LP P_KW QSTR RP
! {
! PARAM.buildTeamName( getString( $3 ) );
! }
near_player_name: LP P_KW QSTR INT RP
{
! PARAM.buildTeamName( getString( $3 ) );
PARAM.buildUNum( getInt( $4 ) );
}
| LP P_KW QSTR INT GOALIE_KW RP
{
! PARAM.buildTeamName( getString( $3 ) );
PARAM.buildUNum( getInt( $4 ) );
PARAM.buildGoalie();
--- 1237,1258 ----
! close_player_name: LP CLOSE_P_KW RP {};
! too_far_player_name: LP P_KW RP {};
! far_player_name: LP P_KW QSTR
! {
! PARAM.buildTeamName( rcss::stripQuotes( getString( $3 ) ) );
! } RP
! ;
near_player_name: LP P_KW QSTR INT RP
{
! PARAM.buildTeamName( rcss::stripQuotes( getString( $3 ) ) );
PARAM.buildUNum( getInt( $4 ) );
}
| LP P_KW QSTR INT GOALIE_KW RP
{
! PARAM.buildTeamName( rcss::stripQuotes( getString( $3 ) ) );
PARAM.buildUNum( getInt( $4 ) );
PARAM.buildGoalie();
***************
*** 1267,1271 ****
| far_player_name {}
| too_far_player_name {}
!
score: LP SCORE_KW INT INT INT RP
--- 1262,1266 ----
| far_player_name {}
| too_far_player_name {}
! ;
score: LP SCORE_KW INT INT INT RP
***************
*** 1290,1294 ****
| CLANG
{
! if( !PARAM.parseCLang( getCStr( $1 ) ) )
YYERROR;
}
--- 1285,1289 ----
| CLANG
{
! if( !PARAM.parseCLang( getString( $1 ) ) )
YYERROR;
}
***************
*** 1301,1305 ****
{
PARAM.buildCoachAudio( getInt( $3 ),
! getString( $5 ) );
}
;
--- 1296,1300 ----
{
PARAM.buildCoachAudio( getInt( $3 ),
! rcss::stripQuotes( getString( $5 ) ) );
}
;
***************
*** 1323,1327 ****
{
PARAM.buildUnknownRefAudio( getInt( $3 ),
! getCStr( $5 ) );
}
;
--- 1318,1322 ----
{
PARAM.buildUnknownRefAudio( getInt( $3 ),
! getString( $5 ) );
}
;
***************
*** 1330,1351 ****
{
PARAM.buildPlayerAudio( getInt( $3 ),
! getDouble( $4 ),
! getString( $5 ) );
}
| LP HEAR_KW INT near_player_name QSTR RP
{
PARAM.buildPlayerAudio( getInt( $3 ),
! getString( $5 ) );
}
| LP HEAR_KW INT REAL OPP_KW QSTR RP
{
PARAM.buildPlayerAudio( getInt( $3 ), getDouble( $4 ),
! getString( $6 ) );
}
| LP HEAR_KW INT REAL OUR_KW INT QSTR RP
{
PARAM.buildPlayerAudio( getInt( $3 ), getDouble( $4 ),
! getInt( $6 ),
! getString( $7 ) );
}
| LP HEAR_KW INT OPP_KW RP
--- 1325,1346 ----
{
PARAM.buildPlayerAudio( getInt( $3 ),
! getDouble( $4 ),
! rcss::stripQuotes( getString( $5 ) ) );
}
| LP HEAR_KW INT near_player_name QSTR RP
{
PARAM.buildPlayerAudio( getInt( $3 ),
! rcss::stripQuotes( getString( $5 ) ) );
}
| LP HEAR_KW INT REAL OPP_KW QSTR RP
{
PARAM.buildPlayerAudio( getInt( $3 ), getDouble( $4 ),
! rcss::stripQuotes( getString( $6 ) ) );
}
| LP HEAR_KW INT REAL OUR_KW INT QSTR RP
{
PARAM.buildPlayerAudio( getInt( $3 ), getDouble( $4 ),
! getInt( $6 ),
! rcss::stripQuotes( getString( $7 ) ) );
}
| LP HEAR_KW INT OPP_KW RP
***************
*** 1363,1367 ****
{
PARAM.buildSelfAudio( getInt( $3 ),
! getString( $5 ) );
};
--- 1358,1362 ----
{
PARAM.buildSelfAudio( getInt( $3 ),
! rcss::stripQuotes( getString( $5 ) ) );
};
***************
*** 1466,1470 ****
STR: OTHER
! | COACH_KW { $$ = std::string( "coach" ); }
;
%%
--- 1461,1465 ----
STR: OTHER
! | COACH_KW { $$ = "coach"; }
;
%%
Index: rccparser.h
===================================================================
RCS file: /cvsroot/rccparser/rccparser/src/rccparser.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** rccparser.h 5 May 2003 21:56:51 -0000 1.37
--- rccparser.h 30 Jun 2003 06:45:35 -0000 1.38
***************
*** 367,387 ****
{
private:
! enum Type { S_CSTR, S_INT, S_DOUB, S_BOOL, S_STR };
union
{
! const char* m_cstr;
int m_int;
double m_double;
bool m_bool;
};
- std::string m_str;
Type m_type;
public:
Holder&
operator=( const char* x )
{
! m_cstr = x;
m_type = S_CSTR;
return *this;
--- 367,391 ----
{
private:
! enum Type { S_CSTR, S_INT, S_DOUB, S_BOOL };
+ public:
+ enum { STR_MAX = 8192 };
+
+ private:
union
{
! char m_cstr[ STR_MAX ];
int m_int;
double m_double;
bool m_bool;
};
Type m_type;
+
public:
Holder&
operator=( const char* x )
{
! strncpy( m_cstr, x, STR_MAX );
m_type = S_CSTR;
return *this;
***************
*** 389,392 ****
--- 393,417 ----
Holder&
+ setQStr( const char* x )
+ {
+ if( x[ 0 ] == '"' )
+ ++x;
+ int len = strlen( x );
+ strncpy( m_cstr, x, STR_MAX );
+ if( len > STR_MAX - 1 )
+ {
+ m_cstr[ STR_MAX - 1 ] = 0;
+ }
+ else
+ {
+ if( m_cstr[ len - 1 ] == '"' )
+ m_cstr[ len - 1 ] = 0;
+ }
+ m_type = S_CSTR;
+ return *this;
+ }
+
+
+ Holder&
operator=( int x )
{
***************
*** 411,425 ****
return *this;
}
!
! Holder&
! operator=( const std::string& x )
! {
! m_str = x;
! m_type = S_STR;
! return *this;
! }
!
const char*
! getCStr() const
{ return m_cstr; }
--- 436,442 ----
return *this;
}
!
const char*
! getStr() const
{ return m_cstr; }
***************
*** 435,446 ****
getBool() const
{ return m_bool; }
-
- std::string&
- getStr()
- { return m_str; }
-
- const std::string&
- getStr() const
- { return m_str; }
};
--- 452,455 ----
***************
*** 3941,3945 ****
* from those subsections.
*
! * \Warning This function is deprecated. Override doBuildSenseBody( int time,
* double stamina,
* double effort,
--- 3950,3954 ----
* from those subsections.
*
! * Warning: This function is deprecated. Override doBuildSenseBody( int time,
* double stamina,
* double effort,
|
