[Rccparser-commits] CVS: rccparser/src Makefile.am,1.27,1.28 rcclexer.h,1.3,1.4 rcclexer.lpp,1.3,1.4 rccparse.ypp,1.2,1.3

[Tom H. <tom...@us...>]

Update of /cvsroot/rccparser/rccparser/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15473/src

Modified Files:
	Makefile.am rcclexer.h rcclexer.lpp rccparse.ypp 
Log Message:
2003-01-06	Tom Howard	<tom...@us...>

	* ./src/Makefile.am
	Fixed bug in test_script
	
	* ./src/rcclexer.h
	* ./src/rcclexer.lpp
	* ./src/rccparse.ypp
	Added support for embedded nulls in messages from server

	* ./src/ac_lib_rccparser.m4
	Added autoconf marco for use in client programs to detect rccparser



Index: Makefile.am
===================================================================
RCS file: /cvsroot/rccparser/rccparser/src/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Makefile.am	17 Dec 2002 18:33:29 -0000	1.27
--- Makefile.am	6 Jan 2003 15:41:31 -0000	1.28
***************
*** 5,9 ****
  *~\
  y.tab.h \
! test_scriptq
  
  BUILT_SOURCES = \
--- 5,9 ----
  *~\
  y.tab.h \
! test_script
  
  BUILT_SOURCES = \
***************
*** 44,49 ****
  rccparser.h
  
! pkgdata_DATA = clang.data out.data
! EXTRA_DIST = clang.data out.data rcclexer.lpp
  
  AM_CXXFLAGS=-W
--- 44,49 ----
  rccparser.h
  
! pkgdata_DATA = clang.data out.data ac_lib_rccparser.m4
! EXTRA_DIST = clang.data out.data rcclexer.lpp ac_lib_rccparser.m4
  
  AM_CXXFLAGS=-W
***************
*** 86,91 ****
  	rm -f $@
  	echo '#! /bin/sh' > $@
! 	echo '$(srcdir)/rccptest < $(srcdir)/out.data' >> $@
! 	echo '$(srcdir)/rccptest < $(srcdir)/v8-sensor_data.txt' >> $@
  	chmod +x $@
  
--- 86,91 ----
  	rm -f $@
  	echo '#! /bin/sh' > $@
! 	echo './rccptest < $(srcdir)/out.data' >> $@
! 	echo './rccptest < $(srcdir)/v8-sensor_data.txt' >> $@
  	chmod +x $@
  

Index: rcclexer.h
===================================================================
RCS file: /cvsroot/rccparser/rccparser/src/rcclexer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rcclexer.h	17 Dec 2002 17:08:39 -0000	1.3
--- rcclexer.h	6 Jan 2003 15:41:32 -0000	1.4
***************
*** 26,29 ****
--- 26,31 ----
  #include <rcssbase/FlexLexer.h>
  
+ #include <string>
+ 
  class RCCLexer
    : public yyFlexLexer

Index: rcclexer.lpp
===================================================================
RCS file: /cvsroot/rccparser/rccparser/src/rcclexer.lpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rcclexer.lpp	17 Dec 2002 17:53:02 -0000	1.3
--- rcclexer.lpp	6 Jan 2003 15:41:32 -0000	1.4
***************
*** 225,228 ****
--- 225,229 ----
  [a-zA-Z_]* { *M_lexed_val = std::string( YYText() ); return OTHER; }
  
+ \0   { return ENDS; }
  .	 { return ERROR; }
  

Index: rccparse.ypp
===================================================================
RCS file: /cvsroot/rccparser/rccparser/src/rccparse.ypp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rccparse.ypp	17 Dec 2002 17:08:39 -0000	1.2
--- rccparse.ypp	6 Jan 2003 15:41:33 -0000	1.3
***************
*** 98,102 ****
    {
      int rval =  param.getLexer().lex( *holder );
! /*     cout << rval << endl;*/
      return rval;
    }
--- 98,102 ----
    {
      int rval =  param.getLexer().lex( *holder );
! /*    cout << rval << endl; */
      return rval;
    }
***************
*** 167,170 ****
--- 167,171 ----
  %token CANT_KW
  
+ %token ENDS
  %token ERROR
  
***************
*** 323,326 ****
--- 324,328 ----
          |       warning
          |       ok
+         |       ENDS
  ;