Menu
▾
▴
rccparser-commits — CVS commits
You can subscribe to this list here.
| 2003 |
Jan
(23) |
Feb
(10) |
Mar
(25) |
Apr
(16) |
May
(10) |
Jun
(2) |
Jul
(7) |
Aug
|
Sep
|
Oct
(6) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(9) |
Aug
(5) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Fredrik H. <fr...@us...> - 2004-09-05 12:17:36
|
Update of /cvsroot/rccparser/rccparser/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8424 Modified Files: rccparse.ypp Log Message: Fixed coach hear from player. Index: rccparse.ypp =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rccparse.ypp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** rccparse.ypp 1 Sep 2004 14:29:55 -0000 1.22 --- rccparse.ypp 5 Sep 2004 12:17:24 -0000 1.23 *************** *** 1342,1345 **** --- 1342,1350 ---- getInt( $6 ) ); } + | LP HEAR_KW REF_KW INT QSTR RP + { + PARAM.buildUnknownRefAudio( getInt( $4 ), + getString( $5 ) ); + } | LP HEAR_KW INT REF_KW OTHER RP { *************** *** 1360,1363 **** --- 1365,1373 ---- rcss::stripQuotes( getString( $5 ) ) ); } + | LP HEAR_KW near_player_name INT QSTR RP + { + PARAM.buildPlayerAudio( getInt( $4 ), + rcss::stripQuotes( getString( $5 ) ) ); + } | LP HEAR_KW INT REAL OPP_KW QSTR RP { |
|
From: Fredrik H. <fr...@us...> - 2004-09-01 14:30:06
|
Update of /cvsroot/rccparser/rccparser/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25031 Modified Files: rccparse.ypp rcclexer.lpp Log Message: Made a hacky solution to parsing (hear referee 3000 half_time) and server_param (half_time 3000). Index: rccparse.ypp =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rccparse.ypp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** rccparse.ypp 30 Aug 2004 14:23:05 -0000 1.21 --- rccparse.ypp 1 Sep 2004 14:29:55 -0000 1.22 *************** *** 255,259 **** %token PK_LEFT_KW %token PK_RIGHT_KW ! %token FIRST_HALF_OVER_KW %token PAUSE_KW %token HUMAN_KW --- 255,260 ---- %token PK_LEFT_KW %token PK_RIGHT_KW ! %token FIRST_HALF_OVER_KW ! %token HALF_TIME_KW %token PAUSE_KW %token HUMAN_KW *************** *** 442,445 **** --- 443,448 ---- | FIRST_HALF_OVER_KW { PARAM.buildFirstHalfOverPlayMode(); } + | HALF_TIME_KW + { PARAM.buildFirstHalfOverPlayMode(); } | PAUSE_KW { PARAM.buildPausePlayMode(); } *************** *** 920,923 **** --- 923,931 ---- getDouble( $3 ) ); } + | LP HALF_TIME_KW INT RP + { + PARAM.buildParam( "half_time", + getInt( $3 ) ); + } | LP STR QSTR RP { Index: rcclexer.lpp =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rcclexer.lpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** rcclexer.lpp 27 Aug 2004 14:25:26 -0000 1.11 --- rcclexer.lpp 1 Sep 2004 14:29:55 -0000 1.12 *************** *** 134,137 **** --- 134,138 ---- penalty_kick_r { return PK_RIGHT_KW; } first_half_over { return FIRST_HALF_OVER_KW ; } + half_time { return HALF_TIME_KW ; } pause { return PAUSE_KW; } human_judge { return HUMAN_KW; } |
|
From: Fredrik H. <fr...@us...> - 2004-08-30 14:23:14
|
Update of /cvsroot/rccparser/rccparser/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9512 Modified Files: rccparse.ypp Log Message: Fixed bug in parsing referee messages for the trainer. Index: rccparse.ypp =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rccparse.ypp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** rccparse.ypp 27 Aug 2004 14:25:26 -0000 1.20 --- rccparse.ypp 30 Aug 2004 14:23:05 -0000 1.21 *************** *** 1323,1327 **** { PARAM.buildRefAudio( getInt( $3 ) ); } | LP HEAR_KW REF_KW INT play_mode RP ! { PARAM.buildRefAudio( getInt( $3 ) ); } | LP HEAR_KW INT REF_KW side INT RP { --- 1323,1327 ---- { PARAM.buildRefAudio( getInt( $3 ) ); } | LP HEAR_KW REF_KW INT play_mode RP ! { PARAM.buildRefAudio( getInt( $4 ) ); } | LP HEAR_KW INT REF_KW side INT RP { *************** *** 1329,1332 **** --- 1329,1337 ---- getInt( $6 ) ); } + | LP HEAR_KW REF_KW INT side INT RP + { + PARAM.buildGoalRefAudio( getInt( $4 ), + getInt( $6 ) ); + } | LP HEAR_KW INT REF_KW OTHER RP { |
|
From: Fredrik H. <fr...@us...> - 2004-08-27 14:26:34
|
Update of /cvsroot/rccparser/rccparser/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20871 Removed Files: .h .cc Log Message: Removed garbage. --- .h DELETED --- --- .cc DELETED --- |
|
From: Fredrik H. <fr...@us...> - 2004-08-27 14:25:35
|
Update of /cvsroot/rccparser/rccparser/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20601 Modified Files: rcclexer.lpp rccparse.ypp rccparser.h rccptest.cpp v8-sensor_data.txt Log Message: Added support for (ok team_names ...) Index: rcclexer.lpp =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rcclexer.lpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** rcclexer.lpp 23 Aug 2004 13:28:49 -0000 1.10 --- rcclexer.lpp 27 Aug 2004 14:25:26 -0000 1.11 *************** *** 70,73 **** --- 70,75 ---- see { return SEE_KW; } see_global { return SEE_GLOBAL_KW; } + team_names { return TEAM_NAMES_KW; } + team { return TEAM_KW; } score { return SCORE_KW; } init { return INIT_KW; } *************** *** 79,82 **** --- 81,87 ---- warning { return WARN_KW; } + left { return LEFT_KW; } + right { return RIGHT_KW; } + self { return SELF_KW; } pmode { return P_MODE_KW; } Index: rccparse.ypp =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rccparse.ypp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** rccparse.ypp 23 Aug 2004 19:24:00 -0000 1.19 --- rccparse.ypp 27 Aug 2004 14:25:26 -0000 1.20 *************** *** 187,190 **** --- 187,192 ---- %token SEE_KW "see" %token SEE_GLOBAL_KW "see_global" + %token TEAM_NAMES_KW "team_names" + %token TEAM_KW "team" %token SCORE_KW "score" %token INIT_KW "init" *************** *** 206,211 **** %token V_MODE_KW "vmode" %token BALL_KW "ball" ! %token L_KW "left" ! %token R_KW "right" %token OUR_KW "our" %token OPP_KW "opp" --- 208,215 ---- %token V_MODE_KW "vmode" %token BALL_KW "ball" ! %token LEFT_KW "left" ! %token RIGHT_KW "right" ! %token L_KW "l" ! %token R_KW "r" %token OUR_KW "our" %token OPP_KW "opp" *************** *** 640,644 **** side: L_KW { PARAM.buildLeftSide(); } ! | R_KW { PARAM.buildRightSide(); } | OUR_KW { PARAM.buildOurSide(); } | OPP_KW { PARAM.buildOppSide(); } --- 644,650 ---- side: L_KW { PARAM.buildLeftSide(); } ! | LEFT_KW { PARAM.buildLeftSide(); } ! | R_KW { PARAM.buildRightSide(); } ! | RIGHT_KW { PARAM.buildRightSide(); } | OUR_KW { PARAM.buildOurSide(); } | OPP_KW { PARAM.buildOppSide(); } *************** *** 1316,1319 **** --- 1322,1327 ---- ref_audio: LP HEAR_KW INT REF_KW play_mode RP { PARAM.buildRefAudio( getInt( $3 ) ); } + | LP HEAR_KW REF_KW INT play_mode RP + { PARAM.buildRefAudio( getInt( $3 ) ); } | LP HEAR_KW INT REF_KW side INT RP { *************** *** 1388,1392 **** ; ! error_msg: LP CANT_KW INIT_KW RP { PARAM.buildCantReconnect(); } | LP ERROR_KW INIT_KW RP --- 1396,1411 ---- ; ! ! team: LP TEAM_KW side STR RP ! { PARAM.buildTeamName( getString( $4 ) ); } ! ; ! ! teams: /* empty */ ! | team ! | team team ! ; ! ! ! error_msg: LP CANT_KW INIT_KW RP { PARAM.buildCantReconnect(); } | LP ERROR_KW INIT_KW RP *************** *** 1466,1469 **** --- 1485,1490 ---- | LP OK_KW SAY_KW RP { PARAM.buildSayOK( ); } + | LP OK_KW TEAM_NAMES_KW teams RP + { PARAM.buildTeamNamesOK( ); } | LP OK_KW STR RP { PARAM.buildUnknownOK( getString( $3 ) ); } Index: rccparser.h =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rccparser.h,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** rccparser.h 23 Aug 2004 19:24:00 -0000 1.41 --- rccparser.h 27 Aug 2004 14:25:26 -0000 1.42 *************** *** 1611,1614 **** --- 1611,1618 ---- void + buildTeamNamesOK( ) + { M_parser.doBuildTeamNamesOK( ); } + + void buildChangePlayerTypeOK( int unum, int type ) { M_parser.doBuildChangePlayerTypeOK( unum, type ); } *************** *** 8600,8603 **** --- 8604,8625 ---- doBuildSayOK( ) {} + /** This function is called after parsing a \c team_names OK + * message. + * + * Override this function in your subclass to handle + * \c team_names OK messages. + * + * \pre The client is an online or offline coach + * + * \pre The client sent a \c team_names command + * + * \pre An entire \c team_names OK + * message has been parsed. + * + */ + virtual + void + doBuildTeamNamesOK( ) { std::cout << "HEJ!" << std::endl; } + /** This function is called after parsing an \c change_player_type * OK message Index: rccptest.cpp =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rccptest.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** rccptest.cpp 24 Mar 2003 18:15:22 -0000 1.5 --- rccptest.cpp 27 Aug 2004 14:25:26 -0000 1.6 *************** *** 2080,2083 **** --- 2080,2111 ---- virtual void + doBuildTeamNamesOK( ) + { + std::ostringstream strm; + strm << "(ok team_names"; + if( !M_stack.empty() ) + { + std::string team_name1 = M_stack.top(); + team_name1 = team_name1.substr(1, team_name1.size()-2); + M_stack.pop(); + std::string side1 = M_stack.top(); + M_stack.pop(); + if ( !M_stack.empty() ) + { + std::string team_name2 = M_stack.top(); + team_name2 = team_name2.substr(1, team_name2.size()-2); + M_stack.pop(); + std::string side2 = M_stack.top(); + M_stack.pop(); + strm << " (team " << side2 << " " << team_name2 << ")"; + } + strm << " (team " << side1 << " " << team_name1 << ")"; + } + strm << ")"; + M_stack.push( strm.str() ); + } + + virtual + void doBuildChangePlayerTypeOK( int unum, int type ) { Index: v8-sensor_data.txt =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/v8-sensor_data.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** v8-sensor_data.txt 28 Sep 2002 14:13:58 -0000 1.1 --- v8-sensor_data.txt 27 Aug 2004 14:25:26 -0000 1.2 *************** *** 163,164 **** --- 163,170 ---- (fullstate 29 (pmode kick_off_l) (vmode high normal) (count 0 0 0 0 0 0 0 0) (arm (movable 0) (expires 0) (target 0 0) (count 0)) (score 0 0) ((b) 0 0 0 0) ((p l 1 0) -3 -37 0 0 0 0 (stamina 4000 1 1))) (see 29 ((g r) 66.7 34) ((f r t) 55.7 3) ((f g r b) 70.8 38) ((f g r t) 62.8 28) ((f p r c) 53.5 43) ((f p r t) 42.5 23) ((f t 0) 3.6 -34 0 0) ((f t r 10) 13.2 -9 0 0) ((f t r 20) 23.1 -5) ((f t r 30) 33.1 -3) ((f t r 40) 42.9 -3) ((f t r 50) 53 -2) ((f r 0) 70.8 31) ((f r t 10) 66 24) ((f r t 20) 62.8 16) ((f r t 30) 60.9 7) ((f r b 10) 76.7 38) ((f r b 20) 83.1 43)) + + (ok team_names) + + (ok team_names (team l RoboSoc)) + + (ok team_names (team l RoboSoc) (team r BobbySoc)) |
|
From: Fredrik H. <fr...@us...> - 2004-08-23 19:24:20
|
Update of /cvsroot/rccparser/rccparser/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5586 Modified Files: rccparse.ypp rccparser.h Log Message: Added support for (ok move) Index: rccparse.ypp =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rccparse.ypp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** rccparse.ypp 23 Aug 2004 13:28:49 -0000 1.18 --- rccparse.ypp 23 Aug 2004 19:24:00 -0000 1.19 *************** *** 1455,1458 **** --- 1455,1460 ---- | LP OK_KW EAR_KW ON_OFF_KW RP { PARAM.buildEarOK( getBool( $4 ) ); } + | LP OK_KW MOVE_KW RP + { PARAM.buildMoveOK( ); } | LP OK_KW CHANGE_KW INT INT RP { Index: rccparser.h =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rccparser.h,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** rccparser.h 23 Aug 2004 13:28:49 -0000 1.40 --- rccparser.h 23 Aug 2004 19:24:00 -0000 1.41 *************** *** 1603,1606 **** --- 1603,1610 ---- void + buildMoveOK( ) + { M_parser.doBuildMoveOK( ); } + + void buildSayOK( ) { M_parser.doBuildSayOK( ); } *************** *** 8559,8562 **** --- 8563,8584 ---- void doBuildEarOK( bool on ) {} + + /** This function is called after parsing an \c move OK + * message. + * + * Override this function in your subclass to handle + * \c move OK messages. + * + * \pre The client is an online or offline coach + * + * \pre The client sent a \c move command + * + * \pre An entire \c move OK + * message has been parsed. + * + */ + virtual + void + doBuildMoveOK( ) {} /** This function is called after parsing an \c say OK |
|
From: Fredrik H. <fr...@us...> - 2004-08-23 13:29:17
|
Update of /cvsroot/rccparser/rccparser/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21575 Modified Files: rcclexer.lpp rccparse.ypp rccparser.h Log Message: Added support for (ok ear on) Index: rcclexer.lpp =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rcclexer.lpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** rcclexer.lpp 8 Jul 2004 02:15:30 -0000 1.9 --- rcclexer.lpp 23 Aug 2004 13:28:49 -0000 1.10 *************** *** 227,230 **** --- 227,231 ---- off { *M_lexed_val = false; return ON_OFF_KW; } eye { return EYE_KW; } + ear { return EAR_KW; } arm { return ARM_KW; } Index: rccparse.ypp =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rccparse.ypp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** rccparse.ypp 8 Jul 2004 02:15:30 -0000 1.17 --- rccparse.ypp 23 Aug 2004 13:28:49 -0000 1.18 *************** *** 342,345 **** --- 342,346 ---- %token ON_OFF_KW %token EYE_KW "eye" + %token EAR_KW "ear" %token ARM_KW *************** *** 1452,1455 **** --- 1453,1458 ---- | LP OK_KW EYE_KW ON_OFF_KW RP { PARAM.buildEyeOK( getBool( $4 ) ); } + | LP OK_KW EAR_KW ON_OFF_KW RP + { PARAM.buildEarOK( getBool( $4 ) ); } | LP OK_KW CHANGE_KW INT INT RP { Index: rccparser.h =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rccparser.h,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** rccparser.h 8 Jul 2004 02:15:30 -0000 1.39 --- rccparser.h 23 Aug 2004 13:28:49 -0000 1.40 *************** *** 1599,1602 **** --- 1599,1606 ---- void + buildEarOK( bool on ) + { M_parser.doBuildEarOK( on ); } + + void buildSayOK( ) { M_parser.doBuildSayOK( ); } *************** *** 8537,8540 **** --- 8541,8562 ---- void doBuildEyeOK( bool on ) {} + + /** This function is called after parsing an \c ear OK + * message. + * + * Override this function in your subclass to handle + * \c ear OK messages. + * + * \pre The client is an online or offline coach + * + * \pre The client sent a \c ear command + * + * \pre An entire \c ear OK + * message has been parsed. + * + */ + virtual + void + doBuildEarOK( bool on ) {} /** This function is called after parsing an \c say OK |
|
From: Tom H. <tom...@us...> - 2004-07-08 02:57:56
|
Update of /cvsroot/rccparser/rccparser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18091 Modified Files: NEWS Log Message: 2003-07-01 Tom Howard <tom...@us...> * ./Makefile.am Corrected email addresses Index: NEWS =================================================================== RCS file: /cvsroot/rccparser/rccparser/NEWS,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** NEWS 1 Jul 2003 03:44:48 -0000 1.27 --- NEWS 8 Jul 2004 02:57:44 -0000 1.28 *************** *** 1,2 **** --- 1,6 ---- + [1.2.6] + * rcc::Parser can now be used without a CLang parser. If a CLang parser is + not specified, then CLang messages will be ignored. + [1.2.5] * Unfortunalty documentation is no longer generated. This is due to |
|
From: Tom H. <tom...@us...> - 2004-07-08 02:55:46
|
Update of /cvsroot/rccparser/rccserializer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17843 Modified Files: NEWS Log Message: 2003-10-02 Tom Howard <tom...@us...> * ./src/rccofflinecoachserializer.cpp Added patch from oliver, which fixed bug in offline coach's init Index: NEWS =================================================================== RCS file: /cvsroot/rccparser/rccserializer/NEWS,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** NEWS 1 Oct 2003 23:05:59 -0000 1.5 --- NEWS 8 Jul 2004 02:55:36 -0000 1.6 *************** *** 1,2 **** --- 1,7 ---- + [0.0.2] + * The serializers can now be constructed with no parameters and have the + output stream set later. It is an error to call any of the serialization + functions before the output stream has been set. + [0.0.1] * Fixed bug in init message for offline coach |
|
From: Tom H. <tom...@us...> - 2004-07-08 02:52:42
|
Update of /cvsroot/rccparser/rcclient In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17459 Modified Files: NEWS README Log Message: 2003-01-10 Tom Howard <tom...@us...> * ./configure.ac Released rcclient-0.0.1 Index: NEWS =================================================================== RCS file: /cvsroot/rccparser/rcclient/NEWS,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** NEWS 10 Jan 2003 18:56:47 -0000 1.3 --- NEWS 8 Jul 2004 02:52:33 -0000 1.4 *************** *** 1,2 **** --- 1,8 ---- + [0.1.0] + * RCClient interface has been completely rebuilt and it now used the + RCCSerializer libraries to provide serialization functions. Please see the + README files for details on how to use the CLient libraries and rcctest for + and example. + [0.0.1] * RCClient supports compressed communications with the server, through *************** *** 25,29 **** What's more, you CANNOT send any data after your request to change to ! the compression level until the server has responded of you give up the request as lost. Sound nasty? Well it is. Unfortunately there is no nice solution because the server uses plain UDP, which does not --- 31,35 ---- What's more, you CANNOT send any data after your request to change to ! the compression level until the server has responded or you give up the request as lost. Sound nasty? Well it is. Unfortunately there is no nice solution because the server uses plain UDP, which does not *************** *** 31,35 **** we can get. ! The rcctest example now uses compression, so demostrate how it's done. [0.0.0] --- 37,41 ---- we can get. ! The rcctest example now uses compression, to demostrate how it's done. [0.0.0] Index: README =================================================================== RCS file: /cvsroot/rccparser/rcclient/README,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** README 10 Jan 2003 18:56:47 -0000 1.3 --- README 8 Jul 2004 02:52:33 -0000 1.4 *************** *** 4,10 **** (http://sserver.sf.net). The library is designed for use with the RCCParser library and provides complete network send and receive ! functionality for version 7 and 8 players (including goalies). Send ! support for other clients (coaches) will be added soon (recv ! functionality is already implemented). =========== CONFIGURING =========== --- 4,9 ---- (http://sserver.sf.net). The library is designed for use with the RCCParser library and provides complete network send and receive ! functionality for version 7, 8 and 9 players (including goalies and ! coaches). =========== CONFIGURING =========== *************** *** 89,125 **** ================ USING THE LIBRARY ================ ! The parser can be interfaced with your code by adding ! #include <rcclient/rcclient.h> ! in one of you source files. You can then create an instance of a ! rcc::Client by passing it an instance of a rcc::Parser, the port you ! wish to connect on and the host name of the machine running the ! server. For instance ! rcc::Client your_client( your_parser, server_port, server_host ); ! You would then send an init message to the server by calling ! init(). E.G. ! your_client.init( your_teamname, protocol_version, goalie_flag ); ! Apon receiving your init message, the server will start to send data ! to your client. You can start parsing the data by either calling the ! operator() or by passing your client to a thread and have it call the ! operator(). The operator() is used to provide direct compatibility ! with rcss::thread::Thread. ! The operator() does not return until some error in parsing has ! occurred, so if you chose not to use a threaded approach (which is a ! perfectly valid thing to do) you will only be able to call send ! functions (such as dash and turn) from within the rcc::Parser virtual ! functions. ! Also note, if you choose to use a single threaded approach you will ! also have to make sure that you return promptly from any of the ! rcc::Parser virtual functions. Failure to do so may result in a ! backup of data and potential data loss if the network buffer ! overflows. RCClient supports compressed communications with the server, through --- 88,132 ---- ================ USING THE LIBRARY ================ ! To use the library you must subclass from rcc::Player, rcc::OnlineCoach or ! rcc::OfflineCoach, which will allow you to override the parser fuctions and ! provide you with access to the serialization functions. rcc::Player, ! rcc::OnlineCoach and rcc::OfflineCoach subclass rcc::Parser and either ! rcc::PlayerSerializer, rcc::OnlineCoachSerializer or ! rcc::OfflineCoachSerializer respectively. ! The following is an example of how to create a Player Client. ! #include <rcclient/rccplayer.hpp> ! class EGPlayer ! : public rcc::Player ! { ! private: ! virtual ! void ! doBuildInit( int unum ) ! { ! std::cout << "Got init\n"; ! move( -10, -10 ); ! } ! }; ! In this example the client will move to position (-10, -10), whenever an init ! message is recieved. ! rcc::Player, rcc::OnlineCoach and rcc::OfflineCoach use iostreams for ! communication with the server. Convienience decorator classes are provided ! that create a UDP iostream and set them in your player. For instance ! EGPlayer player; ! rcc::UDPPlayer udpplayer( player, addr ); ! will connect your player to the address specified by addr. ! To start your client you then use the overloaded () operator. This will call ! onStart() and then proceed to parse data until there is no more left or an ! error occurs. Since the server will not send you any data until your client ! has sent and init message, you must call the init() serialisation function ! within onStart(). RCClient supports compressed communications with the server, through *************** *** 127,131 **** change the current compression level (default is none), you first need to send the request to the simulator, which is done with the ! compression() function. The server will then reply with either (ok compression LEVEL) --- 134,138 ---- change the current compression level (default is none), you first need to send the request to the simulator, which is done with the ! compression() serialisation function. The server will then reply with either (ok compression LEVEL) *************** *** 148,152 **** What's more, you CANNOT send any data after your request to change to ! the compression level until the server has responded of you give up the request as lost. Sound nasty? Well it is. Unfortunately there is no nice solution because the server uses plain UDP, which does not --- 155,159 ---- What's more, you CANNOT send any data after your request to change to ! the compression level until the server has responded or you give up the request as lost. Sound nasty? Well it is. Unfortunately there is no nice solution because the server uses plain UDP, which does not |
|
From: Tom H. <tom...@us...> - 2004-07-08 02:52:42
|
Update of /cvsroot/rccparser/rcclient/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17459/src Modified Files: rcclient.hpp rcctest.cpp Log Message: 2003-01-10 Tom Howard <tom...@us...> * ./configure.ac Released rcclient-0.0.1 Index: rcclient.hpp =================================================================== RCS file: /cvsroot/rccparser/rcclient/src/rcclient.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rcclient.hpp 8 Jul 2004 02:16:46 -0000 1.1 --- rcclient.hpp 8 Jul 2004 02:52:33 -0000 1.2 *************** *** 89,92 **** --- 89,93 ---- operator()() { + onStart(); while( input().good() ) { *************** *** 122,125 **** --- 123,130 ---- { return *m_coutput; } + virtual + void + onStart() {} + std::istream* m_input; std::ostream* m_output; Index: rcctest.cpp =================================================================== RCS file: /cvsroot/rccparser/rcclient/src/rcctest.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** rcctest.cpp 8 Jul 2004 02:16:46 -0000 1.3 --- rcctest.cpp 8 Jul 2004 02:52:33 -0000 1.4 *************** *** 29,32 **** --- 29,36 ---- {} + virtual + ~TestClient() + {} + private: virtual *************** *** 67,70 **** --- 71,81 ---- move( -20, -20 ); } + + virtual + void + onStart() + { + init( "test", 8 ); + } }; *************** *** 76,80 **** TestClient player; rcc::UDPPlayer udpplayer( player, addr ); - udpplayer.serializer().init( "test", 8 ); udpplayer(); } --- 87,90 ---- |
|
From: Tom H. <tom...@us...> - 2004-07-08 02:16:57
|
Update of /cvsroot/rccparser/rcclient/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12925/src Modified Files: Makefile.am rcclient.cpp rcctest.cpp Added Files: rcclient.hpp rccofflinecoach.cpp rccofflinecoach.hpp rcconlinecoach.cpp rcconlinecoach.hpp rccplayer.cpp rccplayer.hpp Removed Files: rcclient.h Log Message: 2003-01-10 Tom Howard <tom...@us...> * ./configure.ac Released rcclient-0.0.1 --- NEW FILE: rcclient.hpp --- // -*-c++-*- /*************************************************************************** rcclient.hpp RoboCup Client ------------------- begin : 03-JAN-2003 copyright : (C) 2003 by Tom Howard email : tom...@us... ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU GPL as published by the Free Software * * Foundation; either version 2 of the License, or (at your option) any * * later version. * * * ***************************************************************************/ #ifndef RCCLIENT_HPP #define RCCLIENT_HPP #include <rccparser/rccparser.h> #include <boost/shared_ptr.hpp> #include <rcssbase/net/addr.hpp> #include <rcssbase/net/udpsocket.hpp> #include <rcssbase/net/iosocketstream.hpp> #include <rcssbase/gz/gzstream.hpp> #include <rccserializer/rccplayerserializer.hpp> #include <rccserializer/rccofflinecoachserializer.hpp> #include <rccserializer/rcconlinecoachserializer.hpp> namespace rcc { template< typename S > class Client : public Parser, public S { public: typedef S Serializer; Client() : m_input( NULL ), m_output( NULL ), m_level( -1 ) {} Client( std::iostream& io, int io_buffer_size = 8192 ) : m_input( NULL ), m_output( NULL ), m_level( -1 ) { setInput( io, io_buffer_size ); setOutput( io, io_buffer_size ); } Client( std::istream& input, std::ostream& output, int input_buffer_size = 8192, int output_buffer_size = 8192 ) : m_input( NULL ), m_output( NULL ), m_level( -1 ) { setInput( input, input_buffer_size ); setOutput( output, output_buffer_size ); } ~Client() {} void setCompression( int level ) { m_cinput->setLevel( level ); m_coutput->setLevel( level ); m_level = level; } int getCompression() const { return m_level; } bool operator()() { while( input().good() ) { if( !parse( input() ) ) return false; } return true; } void setInput( std::istream& i, int input_buffer_size ) { m_input = &i; m_cinput.reset( new rcss::gz::gzistream( i, input_buffer_size ) ); m_cinput->setLevel( m_level ); } void setOutput( std::ostream& o, int output_buffer_size ) { m_output = &o; m_coutput.reset( new rcss::gz::gzostream( o, output_buffer_size ) ); m_coutput->setLevel( m_level ); Serializer::setOutput( *m_coutput ); } private: std::istream& input() { return *m_cinput; } std::ostream& output() { return *m_coutput; } std::istream* m_input; std::ostream* m_output; boost::shared_ptr< rcss::gz::gzistream > m_cinput; boost::shared_ptr< rcss::gz::gzostream > m_coutput; int m_level; }; template< typename S > class UDPClient { public: typedef S Serializer; UDPClient( Client< S >& client, const rcss::net::Addr& addr, int input_buffer_size = 8192, int output_buffer_size = 8192 ) : m_client( client ), m_input( m_socket, input_buffer_size ), m_output( m_socket, output_buffer_size ) { m_input.setEndPoint( addr ); m_output.setEndPoint( addr ); m_client.setInput( m_input, input_buffer_size ); m_client.setOutput( m_output, output_buffer_size ); } bool operator()() { m_client(); } Serializer& serializer() { return m_client; } private: Client< S >& m_client; rcss::net::UDPSocket m_socket; rcss::net::ISocketStream m_input; rcss::net::OSocketStream m_output; }; } #endif --- NEW FILE: rccofflinecoach.cpp --- // -*-c++-*- /*************************************************************************** rccofflinecoach.cpp RoboCup Offline Coach Client ------------------- begin : 08-JUL-2004 copyright : (C) 2004 by Tom Howard email : tom...@us... ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU GPL as published by the Free Software * * Foundation; either version 2 of the License, or (at your option) any * * later version. * * * ***************************************************************************/ #include "rccofflinecoach.hpp" namespace rcc { } --- NEW FILE: rccofflinecoach.hpp --- // -*-c++-*- /*************************************************************************** rccofflinecoach.hpp RoboCup Offline Coach Client ------------------- begin : 08-JUL-2004 copyright : (C) 2004 by Tom Howard email : tom...@us... ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU GPL as published by the Free Software * * Foundation; either version 2 of the License, or (at your option) any * * later version. * * * ***************************************************************************/ #ifndef RCCOFFLINECOACH_HPP #define RCCOFFLINECOACH_HPP #include "rcclient.hpp" #include <rccserializer/rccofflinecoachserializer.hpp> namespace rcc { typedef Client< OfflineCoachSerializer > OfflineCoach; typedef UDPClient< OfflineCoachSerializer > UDPOfflineCoach; } #endif --- NEW FILE: rcconlinecoach.cpp --- // -*-c++-*- /*************************************************************************** rcconlinecoach.cpp RoboCup Online Coach Client ------------------- begin : 08-JUL-2004 copyright : (C) 2004 by Tom Howard email : tom...@us... ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU GPL as published by the Free Software * * Foundation; either version 2 of the License, or (at your option) any * * later version. * * * ***************************************************************************/ #include "rcconlinecoach.hpp" namespace rcc { } --- NEW FILE: rcconlinecoach.hpp --- // -*-c++-*- /*************************************************************************** rcconlinecoach.hpp RoboCup Online Coach Client ------------------- begin : 08-JUL-2004 copyright : (C) 2004 by Tom Howard email : tom...@us... ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU GPL as published by the Free Software * * Foundation; either version 2 of the License, or (at your option) any * * later version. * * * ***************************************************************************/ #ifndef RCCONLINECOACH_HPP #define RCCONLINECOACH_HPP #include "rcclient.hpp" #include <rccserializer/rcconlinecoachserializer.hpp> namespace rcc { typedef Client< OnlineCoachSerializer > OnlineCoach; typedef UDPClient< OnlineCoachSerializer > UDPOnlineCoach; } #endif --- NEW FILE: rccplayer.cpp --- // -*-c++-*- /*************************************************************************** rccplayer.cpp RoboCup Player Client ------------------- begin : 08-JUL-2004 copyright : (C) 2004 by Tom Howard email : tom...@us... ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU GPL as published by the Free Software * * Foundation; either version 2 of the License, or (at your option) any * * later version. * * * ***************************************************************************/ #include "rccplayer.hpp" namespace rcc { } --- NEW FILE: rccplayer.hpp --- // -*-c++-*- /*************************************************************************** rccplayer.hpp RoboCup Player Client ------------------- begin : 08-JUL-2004 copyright : (C) 2004 by Tom Howard email : tom...@us... ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU GPL as published by the Free Software * * Foundation; either version 2 of the License, or (at your option) any * * later version. * * * ***************************************************************************/ #ifndef RCCPLAYER_HPP #define RCCPLAYER_HPP #include "rcclient.hpp" #include <rccserializer/rccplayerserializer.hpp> namespace rcc { typedef Client< PlayerSerializer > Player; typedef UDPClient< PlayerSerializer > UDPPlayer; } #endif Index: Makefile.am =================================================================== RCS file: /cvsroot/rccparser/rcclient/src/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 6 Jan 2003 17:22:46 -0000 1.2 --- Makefile.am 8 Jul 2004 02:16:46 -0000 1.3 *************** *** 1,3 **** ! lib_LTLIBRARIES = librcclient.la CLEANFILES = \ --- 1,7 ---- ! lib_LTLIBRARIES = \ ! librcclient.la \ ! librccplayer.la \ ! librcconlinecoach.la \ ! librccofflinecoach.la CLEANFILES = \ *************** *** 8,12 **** rcclient.cpp ! librcclient_la_LDFLAGS = -version-info 0:0:0 # 1. Start with version information of `0:0:0' for each libtool library. # --- 12,28 ---- rcclient.cpp ! librccplayer_la_SOURCES = \ ! rccplayer.cpp ! ! librcconlinecoach_la_SOURCES = \ ! rcconlinecoach.cpp ! ! librccofflinecoach_la_SOURCES = \ ! rccofflinecoach.cpp ! ! librcclient_la_LDFLAGS = -version-info 1:0:0 ! librccplayer_la_LDFLAGS = -version-info 0:0:0 ! librcconlinecoach_la_LDFLAGS = -version-info 0:0:0 ! librccofflinecoach_la_LDFLAGS = -version-info 0:0:0 # 1. Start with version information of `0:0:0' for each libtool library. # *************** *** 28,36 **** # then set AGE to 0. ! pkginclude_HEADERS = \ ! rcclient.h bin_PROGRAMS = rcctest rcctest_SOURCES = rcctest.cpp ! rcctest_LDADD = librcclient.la --- 44,59 ---- # then set AGE to 0. ! librcclient_la_LIBADD = -lrcssbase -lrcssnet -lrcssgz -lrccparser ! librccplayer_la_LIBADD = librcclient.la -lrccplayerserializer ! librcconlinecoach_la_LIBADD = librcclient.la -lrcconlinecoachserializer ! librccofflinecoach_la_LIBADD = librcclient.la -lrccofflinecoachserializer + pkginclude_HEADERS = \ + rcclient.hpp \ + rccplayer.hpp \ + rcconlinecoach.hpp \ + rccofflinecoach.hpp bin_PROGRAMS = rcctest rcctest_SOURCES = rcctest.cpp ! rcctest_LDADD = librccplayer.la Index: rcclient.cpp =================================================================== RCS file: /cvsroot/rccparser/rcclient/src/rcclient.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** rcclient.cpp 10 Jan 2003 18:56:47 -0000 1.4 --- rcclient.cpp 8 Jul 2004 02:16:46 -0000 1.5 *************** *** 19,350 **** ***************************************************************************/ - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif ! #include "rcclient.h" ! #include <rcssbase/net/udpsocket.hpp> ! #include <rcssbase/net/iosocketstream.hpp> ! #include <rcssbase/gzstream.h> namespace rcc { ! class ClientImpl ! { ! public: ! ClientImpl( Parser& parser, const rcss::net::Addr& addr, ! int input_buffer_size, int output_buffer_size ) ! : m_parser( parser ), ! m_socket(), ! m_input( m_socket, input_buffer_size ), ! m_output( m_socket, output_buffer_size ), ! m_cinput( (std::istream&)m_input ), ! m_coutput( (std::ostream&)m_output ) ! { ! m_input.setEndPoint( addr ); ! m_output.setEndPoint( addr ); ! m_cinput.setLevel( -1 ); ! m_coutput.setLevel( -1 ); ! } ! ! ~ClientImpl() ! { ! m_socket.close(); ! } ! ! Parser& ! parser() ! { return m_parser; } ! ! std::istream& ! input() ! { return m_cinput; } ! ! std::ostream& ! output() ! { return m_coutput; } ! ! void ! setCompression( int level ) ! { ! m_cinput.setLevel( level ); ! m_coutput.setLevel( level ); ! } ! private: ! Parser& m_parser; ! rcss::net::UDPSocket m_socket; ! rcss::net::ISocketStream m_input; ! rcss::net::OSocketStream m_output; ! rcss::gz::gzistream m_cinput; ! rcss::gz::gzostream m_coutput; ! }; ! ! const char* Client::PLAYERS[] = { "", "(goalie)" }; ! const char* Client::VIEW_WIDTHS[] = { "narrow", "normal", "wide" }; ! const char* Client::VIEW_QUALITIES[] = { "low", "high" }; ! const char* Client::TEAMS[] = { "left", "right", "our", "opp" }; ! const char* Client::EAR_MODES[] = { "partial", "complete" }; ! const char* Client::ON_OFF[] = { "on", "off" }; ! ! std::ostream& ! operator<<( std::ostream& o, Client::PlayerType player ) ! { ! o << Client::PLAYERS[ player ]; ! } ! ! std::ostream& ! operator<<( std::ostream& o, Client::ViewWidthType width ) ! { ! o << Client::VIEW_WIDTHS[ width ]; ! } ! ! std::ostream& ! operator<<( std::ostream& o, Client::ViewQualityType qual ) ! { ! o << Client::VIEW_QUALITIES[ qual ]; ! } ! ! std::ostream& ! operator<<( std::ostream& o, Client::TeamType team ) ! { ! o << Client::TEAMS[ team ]; ! } ! ! std::ostream& ! operator<<( std::ostream& o, Client::EarModeType ear_mode ) ! { ! o << Client::EAR_MODES[ ear_mode ]; ! } ! ! std::ostream& ! operator<<( std::ostream& o, Client::OnOffType on_off ) ! { ! o << Client::ON_OFF[ on_off ]; ! } ! ! Client::Client( Parser& parser, const rcss::net::Addr& addr, ! int input_buffer_size, int output_buffer_size ) ! : m_impl( new ClientImpl( parser, addr, ! input_buffer_size, output_buffer_size ) ) ! {} ! ! Client::~Client() ! {} ! ! void ! Client::setCompression( int level ) ! { m_impl->setCompression( level ); } ! ! std::istream& ! Client::input() ! { return m_impl->input(); } ! ! std::ostream& ! Client::output() ! { return m_impl->output(); } ! ! Parser& ! Client::parser() ! { return m_impl->parser(); } ! ! bool ! Client::operator()() ! { ! while( input().good() ) ! { ! if( !parser().parse( input() ) ) ! return false; ! } ! return true; ! } ! ! void ! Client::init( const std::string& team_name, int version, ! PlayerType type ) ! { ! output() << "(init " << team_name << " (version " << version << ")" ! << type << ")" << std::ends << std::flush; ! } ! ! void ! Client::reconnect( const std::string& team_name, int unum ) ! { ! output() << "(reconnect " << team_name << " " << unum << ")" ! << std::ends << std::flush; ! } ! ! void ! Client::dash( double power ) ! { ! output() << "(dash " << power << ")" << std::ends << std::flush; ! } ! ! void ! Client::turn( double moment ) ! { ! output() << "(turn " << moment << ")" << std::ends << std::flush; ! } ! ! void ! Client::turnNeck( double moment ) ! { ! output() << "(turn_neck " << moment << ")" << std::ends << std::flush; ! } ! ! void ! Client::kick( double power, double dir ) ! { ! output() << "(kick " << power << " " << dir << ")" ! << std::ends << std::flush; ! } ! ! void ! Client::catchBall( double dir ) ! { ! output() << "(catch " << dir << ")" << std::ends << std::flush; ! } ! ! void ! Client::say( std::string message ) ! { ! output() << "(say \"" << message << "\")" << std::ends << std::flush; ! } ! ! void ! Client::senseBody() ! { ! output() << "(sense_body)" << std::ends << std::flush; ! } ! ! void ! Client::score() ! { ! output() << "(score)" << std::ends << std::flush; ! } ! ! void ! Client::move( double x, double y ) ! { ! output() << "(move " << x << " " << y << ")" ! << std::ends << std::flush; ! } ! ! void ! Client::changeView( ViewWidthType width, ViewQualityType quality ) ! { ! output() << "(change_view " << width << " " << quality << ")" ! << std::ends << std::flush; ! } ! ! void ! Client::compression( int level ) ! { ! output() << "(compression " << level << ")" ! << std::ends << std::flush; ! } ! ! void ! Client::bye() ! { ! output() << "(bye)" << std::ends << std::flush; ! } ! ! void ! Client::done() ! { ! output() << "(done)" << std::ends << std::flush; ! } ! ! void ! Client::pointTo( double dist, double head ) ! { ! output() << "(pointto " << dist << " " << head << ")" ! << std::ends << std::flush; ! } ! ! void ! Client::pointToOff() ! { ! output() << "(pointto off)" << std::ends << std::flush; ! } ! ! void ! Client::attentionTo( TeamType team, int unum ) ! { ! output() << "(attentionto " << team << " " << unum << ")" ! << std::ends << std::flush; ! } ! ! void ! Client::attentionTo( const std::string& team_name, int unum ) ! { ! output() << "(attentionto " << team_name << " " << unum << ")" ! << std::ends << std::flush; ! } ! ! void ! Client::attentionToOff() ! { ! output() << "(attentionto off)" << std::ends << std::flush; ! } ! ! void ! Client::tackle( double power ) ! { ! output() << "(tackle " << power << ")" << std::ends << std::flush; ! } ! ! void ! Client::clangVer( int min, int max ) ! { ! output() << "(clang (ver " << min << " " << max << "))" ! << std::ends << std::flush; ! } ! ! void ! Client::ear( OnOffType on_off, TeamType side, EarModeType mode ) ! { ! output() << "(ear (" << on_off << " " << side << " " << mode << "))" ! << std::ends << std::flush; ! } ! ! void ! Client::ear( OnOffType on_off, const std::string& team, EarModeType mode ) ! { ! output() << "(ear (" << on_off << " " << team << " " << mode << "))" ! << std::ends << std::flush; ! } ! ! void ! Client::ear( OnOffType on_off, TeamType side ) ! { ! output() << "(ear (" << on_off << " " << side << "))" ! << std::ends << std::flush; ! } ! ! void ! Client::ear( OnOffType on_off, const std::string& team ) ! { ! output() << "(ear (" << on_off << " " << team << "))" ! << std::ends << std::flush; ! } ! ! void ! Client::ear( OnOffType on_off, EarModeType mode ) ! { ! output() << "(ear (" << on_off << " " << mode << "))" ! << std::ends << std::flush; ! } ! ! void ! Client::ear( OnOffType on_off ) ! { ! output() << "(ear (" << on_off << "))" ! << std::ends << std::flush; ! } ! ! void ! Client::sendUnknown( const std::string& message ) ! { output() << message << std::ends << std::flush; } ! } --- 19,28 ---- ***************************************************************************/ ! #include "rcclient.hpp" namespace rcc { ! ! } Index: rcctest.cpp =================================================================== RCS file: /cvsroot/rccparser/rcclient/src/rcctest.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rcctest.cpp 10 Jan 2003 18:56:48 -0000 1.2 --- rcctest.cpp 8 Jul 2004 02:16:46 -0000 1.3 *************** *** 19,47 **** ***************************************************************************/ ! #include "rcclient.h" ! ! class CLangParser ! : public rcss::Parser ! { ! bool ! doParse( std::istream& ) ! { return true; } ! }; ! class ClientParser ! : public rcc::Parser { public: ! ClientParser( rcss::Parser& clp ) ! : rcc::Parser( clp ), ! m_client( NULL ), ! m_level( -1 ) ! {} ! ! void ! setClient( rcc::Client& client ) ! { ! m_client = &client; ! } private: --- 19,31 ---- ***************************************************************************/ ! #include "rccplayer.hpp" ! #include <rccserializer/rccplayerserializer.hpp> ! class TestClient ! : public rcc::Player { public: ! TestClient() ! {} private: *************** *** 51,59 **** { std::cout << "Got init\n"; ! if( m_client ) ! { ! m_client->move( -10, -10 ); ! m_client->compression( 9 ); ! } } --- 35,40 ---- { std::cout << "Got init\n"; ! move( -10, -10 ); ! compression( 9 ); } *************** *** 62,69 **** doBuildCompressionOK( int level ) { ! m_client->setCompression( level ); ! m_level = level; ! std::cout << "Compression level changed to " << level << std::endl; ! } --- 43,48 ---- doBuildCompressionOK( int level ) { ! setCompression( level ); ! std::cout << "Compression level changed to " << level << std::endl; } *************** *** 85,104 **** int chg_view_count ) { ! if( m_level == 9 ) ! m_client->move( -20, -20 ); } - private: - rcc::Client* m_client; - int m_level; }; int main() { ! CLangParser clp; ! ClientParser parser( clp ); ! rcc::Client client( parser, rcss::net::Addr( 6000, "localhost" ) ); ! parser.setClient( client ); ! ! client.init( "test", 8 ); ! client(); } --- 64,80 ---- int chg_view_count ) { ! if( getCompression() == 9 ) ! move( -20, -20 ); } }; int main() { ! rcss::net::Addr addr( 6000 ); ! if( !addr.setHost( "localhost" ) ) ! exit( EXIT_FAILURE ); ! TestClient player; ! rcc::UDPPlayer udpplayer( player, addr ); ! udpplayer.serializer().init( "test", 8 ); ! udpplayer(); } --- rcclient.h DELETED --- |
|
From: Tom H. <tom...@us...> - 2004-07-08 02:16:56
|
Update of /cvsroot/rccparser/rcclient In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12925 Modified Files: acinclude.m4 configure.ac Log Message: 2003-01-10 Tom Howard <tom...@us...> * ./configure.ac Released rcclient-0.0.1 Index: acinclude.m4 =================================================================== RCS file: /cvsroot/rccparser/rcclient/acinclude.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** acinclude.m4 10 Jan 2003 18:56:47 -0000 1.2 --- acinclude.m4 8 Jul 2004 02:16:46 -0000 1.3 *************** *** 15,21 **** }], [AS_VAR_SET(ac_lib_rccparser, yes)], ! [AS_VAR_SET(ac_lib_rccparser, no) ! LDFLAGS="$OLD_LDFLAGS" ! ]) AC_LANG_POP(C++) ]) --- 15,20 ---- }], [AS_VAR_SET(ac_lib_rccparser, yes)], ! [AS_VAR_SET(ac_lib_rccparser, no)]) ! LDFLAGS="$OLD_LDFLAGS" AC_LANG_POP(C++) ]) *************** *** 39,45 **** }], [AS_VAR_SET(ac_lib_rcssnet, yes)], ! [AS_VAR_SET(ac_lib_rcssnet, no) ! LDFLAGS="$OLD_LDFLAGS" ! ]) AC_LANG_POP(C++) ]) --- 38,43 ---- }], [AS_VAR_SET(ac_lib_rcssnet, yes)], ! [AS_VAR_SET(ac_lib_rcssnet, no)]) ! LDFLAGS="$OLD_LDFLAGS" AC_LANG_POP(C++) ]) *************** *** 47,48 **** --- 45,209 ---- AS_VAR_POPDEF([ac_lib_rcssnet])dnl ])# AC_LIB_RCSSNET + # AC_LIB_RCSSCONFPARSER([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + # --------------------------------------------------------- + # Checks for the rcssconfparser library + AC_DEFUN([AC_LIB_RCSSCONFPARSER], + [AS_VAR_PUSHDEF([ac_lib_rcssconfparser], [ac_cv_lib_rcssconfparser])dnl + AC_CACHE_CHECK(whether the rcssconfparser library is available, ac_cv_lib_rcssconfparser, + [AC_LANG_PUSH(C++) + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lrcssconfparser" + AC_LINK_IFELSE([@%:@include <rcssbase/conf/builder.hpp> + @%:@include <rcssbase/conf/parser.hpp> + int main() + { + rcss::conf::Builder builder( "test" ); + rcss::conf::Parser parser( builder ); + return 0; + }], + [AS_VAR_SET(ac_lib_rcssconfparser, yes)], + [AS_VAR_SET(ac_lib_rcssconfparser, no)]) + LDFLAGS="$OLD_LDFLAGS" + AC_LANG_POP(C++) + ]) + AS_IF([test AS_VAR_GET(ac_lib_rcssconfparser) = yes], [$1], [$2]) + AS_VAR_POPDEF([ac_lib_rcssconfparser])dnl + ])# AC_LIB_RCSSCONFPARSER + # AC_LIB_RCSSBASE([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + # --------------------------------------------------------- + # Checks for the rcssbase library + AC_DEFUN([AC_LIB_RCSSBASE], + [AS_VAR_PUSHDEF([ac_lib_rcssbase], [ac_cv_lib_rcssbase])dnl + AC_CACHE_CHECK(whether the rcssbase library is available, ac_cv_lib_rcssbase, + [AC_LANG_PUSH(C++) + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lrcssbase" + AC_LINK_IFELSE([@%:@include <rcssbase/version.hpp> + int main() + { + rcss::base::version(); + return 0; + }], + [AS_VAR_SET(ac_lib_rcssbase, yes)], + [AS_VAR_SET(ac_lib_rcssbase, no)]) + LDFLAGS="$OLD_LDFLAGS" + AC_LANG_POP(C++) + ]) + AS_IF([test AS_VAR_GET(ac_lib_rcssbase) = yes], [$1], [$2]) + AS_VAR_POPDEF([ac_lib_rcssbase])dnl + ])# AC_LIB_RCSSBASE + # AC_LIB_RCSSLIB([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + # --------------------------------------------------------- + # Checks for the rcsslib library + AC_DEFUN([AC_LIB_RCSSLIB], + [AS_VAR_PUSHDEF([ac_lib_rcsslib], [ac_cv_lib_rcsslib])dnl + AC_CACHE_CHECK(whether the rcsslib library is available, ac_cv_lib_rcsslib, + [AC_LANG_PUSH(C++) + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lrcsslib" + AC_LINK_IFELSE([@%:@include <rcssbase/lib/loader.hpp> + int main() + { + rcss::lib::Loader::libsLoaded(); + return 0; + }], + [AS_VAR_SET(ac_lib_rcsslib, yes)], + [AS_VAR_SET(ac_lib_rcsslib, no)]) + LDFLAGS="$OLD_LDFLAGS" + AC_LANG_POP(C++) + ]) + AS_IF([test AS_VAR_GET(ac_lib_rcsslib) = yes], [$1], [$2]) + AS_VAR_POPDEF([ac_lib_rcsslib])dnl + ])# AC_LIB_RCSSLIB + # AC_LIB_RCSSGZ([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + # --------------------------------------------------------- + # Checks for the rcssgz library + AC_DEFUN([AC_LIB_RCSSGZ], + [AS_VAR_PUSHDEF([ac_lib_rcssgz], [ac_cv_lib_rcssgz])dnl + AC_CACHE_CHECK(whether the rcssgz library is available, ac_cv_lib_rcssgz, + [AC_LANG_PUSH(C++) + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lrcssgz" + AC_LINK_IFELSE([@%:@include <rcssbase/gz/gzstream.hpp> + int main() + { + rcss::gz::gzostream strm( std::cout ); + return 0; + }], + [AS_VAR_SET(ac_lib_rcssgz, yes)], + [AS_VAR_SET(ac_lib_rcssgz, no)]) + LDFLAGS="$OLD_LDFLAGS" + AC_LANG_POP(C++) + ]) + AS_IF([test AS_VAR_GET(ac_lib_rcssgz) = yes], [$1], [$2]) + AS_VAR_POPDEF([ac_lib_rcssgz])dnl + ])# AC_LIB_RCSSGZ + # AC_LIB_RCCOFFLINECOACHSERIALIZER([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + # --------------------------------------------------------- + # Checks for the rccofflinecoachserializer library + AC_DEFUN([AC_LIB_RCCOFFLINECOACHSERIALIZER], + [AS_VAR_PUSHDEF([ac_lib_rccofflinecoachserializer], [ac_cv_lib_rccofflinecoachserializer])dnl + AC_CACHE_CHECK(whether the rccofflinecoachserializer library is available, ac_cv_lib_rccofflinecoachserializer, + [AC_LANG_PUSH(C++) + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lrccofflinecoachserializer" + AC_LINK_IFELSE([@%:@include <rccserializer/rccofflinecoachserializer.h> + int main() + { + rcc::OfflineCoachSerializer ser( std::cout ); + return 0; + }], + [AS_VAR_SET(ac_lib_rccofflinecoachserializer, yes)], + [AS_VAR_SET(ac_lib_rccofflinecoachserializer, no)]) + LDFLAGS="$OLD_LDFLAGS" + AC_LANG_POP(C++) + ]) + AS_IF([test AS_VAR_GET(ac_lib_rccofflinecoachserializer) = yes], [$1], [$2]) + AS_VAR_POPDEF([ac_lib_rccofflinecoachserializer])dnl + ])# AC_LIB_RCCOFFLINECOACHSERIALIZER + # AC_LIB_RCCONLINECOACHSERIALIZER([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + # --------------------------------------------------------- + # Checks for the rcconlinecoachserializer library + AC_DEFUN([AC_LIB_RCCONLINECOACHSERIALIZER], + [AS_VAR_PUSHDEF([ac_lib_rcconlinecoachserializer], [ac_cv_lib_rcconlinecoachserializer])dnl + AC_CACHE_CHECK(whether the rcconlinecoachserializer library is available, ac_cv_lib_rcconlinecoachserializer, + [AC_LANG_PUSH(C++) + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lrcconlinecoachserializer" + AC_LINK_IFELSE([@%:@include <rccserializer/rcconlinecoachserializer.h> + int main() + { + rcc::OnlineCoachSerializer ser( std::cout ); + return 0; + }], + [AS_VAR_SET(ac_lib_rcconlinecoachserializer, yes)], + [AS_VAR_SET(ac_lib_rcconlinecoachserializer, no)]) + LDFLAGS="$OLD_LDFLAGS" + AC_LANG_POP(C++) + ]) + AS_IF([test AS_VAR_GET(ac_lib_rcconlinecoachserializer) = yes], [$1], [$2]) + AS_VAR_POPDEF([ac_lib_rcconlinecoachserializer])dnl + ])# AC_LIB_RCCONLINECOACHSERIALIZER + # AC_LIB_RCCPLAYERSERIALIZER([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + # --------------------------------------------------------- + # Checks for the rccplayerserializer library + AC_DEFUN([AC_LIB_RCCPLAYERSERIALIZER], + [AS_VAR_PUSHDEF([ac_lib_rccplayerserializer], [ac_cv_lib_rccplayerserializer])dnl + AC_CACHE_CHECK(whether the rccplayerserializer library is available, ac_cv_lib_rccplayerserializer, + [AC_LANG_PUSH(C++) + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lrccplayerserializer" + AC_LINK_IFELSE([@%:@include <rccserializer/rccplayerserializer.h> + int main() + { + rcc::PlayerSerializer ser( std::cout ); + return 0; + }], + [AS_VAR_SET(ac_lib_rccplayerserializer, yes)], + [AS_VAR_SET(ac_lib_rccplayerserializer, no)]) + LDFLAGS="$OLD_LDFLAGS" + AC_LANG_POP(C++) + ]) + AS_IF([test AS_VAR_GET(ac_lib_rccplayerserializer) = yes], [$1], [$2]) + AS_VAR_POPDEF([ac_lib_rccplayerserializer])dnl + ])# AC_LIB_RCCPLAYERSERIALIZER Index: configure.ac =================================================================== RCS file: /cvsroot/rccparser/rcclient/configure.ac,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configure.ac 10 Jan 2003 19:00:37 -0000 1.4 --- configure.ac 8 Jul 2004 02:16:46 -0000 1.5 *************** *** 18,21 **** --- 18,35 ---- AC_CHECK_LIB(z, deflate) + AC_ARG_VAR(RCCPARSER, [The prefix that was used when installing rccparser]) + if test "$RCCPARSER"; then + if test -z "$LDFLAGS"; then + LDFLAGS="-L$RCCPARSER/lib" + else + LDFLAGS="$LDFLAGS -L$RCCARSER/lib" + fi + if test -z "$CPPFLAGS"; then + CPPFLAGS="-I$RCCPARSER/include" + else + CPPFLAGS="$CPPFLAGS -I$RCCPARSER/include" + fi + fi + AC_LIB_RCCPARSER([], [ AC_MSG_ERROR([Could not find the rccparser library or it's headers *************** *** 25,47 **** command line arguments.])]) ! dnl Checks for header files. ! AC_LIB_RCSSNET([], [ ! AC_MSG_ERROR([Could not find the rcsoccersim/rcssbase files or they ! are out of date. Please (re)install rcsoccersim/rcssbase before ! proceeding or specify the path to the rccbase headers by adding ! 'CXXFLAGS=\"-I<INCLUDEDIR> <YOUR_OTHER_FLAGS>\"' to configure's ! command line arguments.]) ! ]) ! AC_CHECK_HEADER([rcssbase/gzstream.h], [], [ ! AC_MSG_ERROR([Could not find the rcsoccersim/rcssbase files or they ! are out of date. Please (re)install rcsoccersim/rcssbase before ! proceeding or specify the path to the rccbase headers by adding ! 'CXXFLAGS=\"-I<INCLUDEDIR> <YOUR_OTHER_FLAGS>\"' to configure's ! command line arguments.]) ! ]) dnl Checks for typedefs, structures, and compiler characteristics. --- 39,115 ---- command line arguments.])]) + AC_ARG_VAR(RCCSERIALIZER, [The prefix that was used when installing rccserializer]) + if test "$RCCSERIALIZER"; then + if test -z "$LDFLAGS"; then + LDFLAGS="-L$RCCSERIALIZER/lib" + else + LDFLAGS="$LDFLAGS -L$RCCARSER/lib" + fi + if test -z "$CPPFLAGS"; then + CPPFLAGS="-I$RCCSERIALIZER/include" + else + CPPFLAGS="$CPPFLAGS -I$RCCSERIALIZER/include" + fi + fi ! AC_LIB_RCCOFFLINECOACHSERIALIZER([].[ ! AC_MSG_ERROR([Could not find the rccserializer library or it's headers ! or it is out of date. Please (re)install rccparser or specify the ! path to the rccparser library by adding 'LDFLAGS=\"-L<LIBDIR> ! CXXFLAGS=\"-I<INCLUDEDIR> <YOUR_OTHER_FLAGS>\"' to configure's ! command line arguments.])]) ! AC_LIB_RCCONLINECOACHSERIALIZER([].[ ! AC_MSG_ERROR([Could not find the rccserializer library or it's headers ! or it is out of date. Please (re)install rccparser or specify the ! path to the rccparser library by adding 'LDFLAGS=\"-L<LIBDIR> ! CXXFLAGS=\"-I<INCLUDEDIR> <YOUR_OTHER_FLAGS>\"' to configure's ! command line arguments.])]) ! AC_LIB_RCCPLAYERSERIALIZER([].[ ! AC_MSG_ERROR([Could not find the rccserializer library or it's headers ! or it is out of date. Please (re)install rccparser or specify the ! path to the rccparser library by adding 'LDFLAGS=\"-L<LIBDIR> ! CXXFLAGS=\"-I<INCLUDEDIR> <YOUR_OTHER_FLAGS>\"' to configure's ! command line arguments.])]) ! dnl Checks for header files. ! AC_ARG_VAR(RCSSBASE, [The prefix that was used when installing rcssbase]) ! if test "$RCSSBASE"; then ! if test -z "$PATH"; then ! PATH="$RCSSBASE/bin" ! else ! PATH="$PATH:$RCSSBASE/bin" ! fi ! if test -z "$LDFLAGS"; then ! LDFLAGS="-L$RCSSBASE/lib" ! else ! LDFLAGS="$LDFLAGS -L$RCSSBASE/lib" ! fi ! if test -z "$CPPFLAGS"; then ! CPPFLAGS="-I$RCSSBASE/include" ! else ! CPPFLAGS="$CPPFLAGS -I$RCSSBASE/include" ! fi ! fi + AC_LIB_RCSSNET([], + [AC_MSG_ERROR([ + Could not find the rcssbase/net library or it is out of + date. Please (re)install rcssbase before proceeding, or + specify where it was installed with the RCSSBASE + environment variable. + ])]) + AC_LIB_RCSSGZ([], [AC_MSG_ERROR([ + Could not find the rcssbase/gz library or it is out of + date. Please (re)install rcssbase before proceeding, or + specify where it was installed with the RCSSBASE + environment variable. + ])]) + AC_LIB_RCSSBASE([],[AC_MSG_ERROR([ + Could not find the rcssbase library or it is out of + date. Please (re)install rcssbase before proceeding, or + specify where it was installed with the RCSSBASE + environment variable. + ])]) dnl Checks for typedefs, structures, and compiler characteristics. *************** *** 49,65 **** AC_C_INLINE - dnl Checks for library functions. - - - - - dnl optional features - - dnl test for debug mode - - DO_DEBUG=`echo "$CXXFLAGS" | $AWK '/-g/ { print "true" }'` - if test "$DO_DEBUG" == "true"; then - CXXFLAGS="$CXXFLAGS -DDEBUG"; - fi --- 117,120 ---- |
|
From: Tom H. <tom...@us...> - 2004-07-08 02:16:21
|
Update of /cvsroot/rccparser/rccserializer/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12868/src Modified Files: Makefile.am rcccoachserializer.cpp rcccoachserializer.hpp rccofflinecoachserializer.cpp rccofflinecoachserializer.hpp rcconlinecoachserializer.cpp rcconlinecoachserializer.hpp rccplayerserializer.cpp rccplayerserializer.hpp rccserializer.cpp rccserializer.hpp Log Message: 2003-10-02 Tom Howard <tom...@us...> * ./src/rccofflinecoachserializer.cpp Added patch from oliver, which fixed bug in offline coach's init Index: Makefile.am =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Makefile.am 25 Mar 2003 17:03:02 -0000 1.1.1.1 --- Makefile.am 8 Jul 2004 02:16:12 -0000 1.2 *************** *** 25,33 **** rcconlinecoachserializer.cpp ! librccserializer_la_LDFLAGS = -version-info 0:0:0 ! librccplayerserializer_la_LDFLAGS = -version-info 0:0:0 ! librcccoachserializer_la_LDFLAGS = -version-info 0:0:0 ! librccofflinecoachserializer_la_LDFLAGS = -version-info 0:0:0 ! librcconlinecoachserializer_la_LDFLAGS = -version-info 0:0:0 # 1. Start with version information of `0:0:0' for each libtool library. # --- 25,33 ---- rcconlinecoachserializer.cpp ! librccserializer_la_LDFLAGS = -version-info 1:0:1 ! librccplayerserializer_la_LDFLAGS = -version-info 1:0:1 ! librcccoachserializer_la_LDFLAGS = -version-info 1:0:1 ! librccofflinecoachserializer_la_LDFLAGS = -version-info 1:0:1 ! librcconlinecoachserializer_la_LDFLAGS = -version-info 1:0:1 # 1. Start with version information of `0:0:0' for each libtool library. # Index: rcccoachserializer.cpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rcccoachserializer.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rcccoachserializer.cpp 1 Oct 2003 00:12:51 -0000 1.2 --- rcccoachserializer.cpp 8 Jul 2004 02:16:12 -0000 1.3 *************** *** 29,32 **** --- 29,36 ---- namespace rcc { + CoachSerializer::CoachSerializer() + : Serializer() + {} + CoachSerializer::CoachSerializer( std::ostream& o ) : Serializer( o ) Index: rcccoachserializer.hpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rcccoachserializer.hpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** rcccoachserializer.hpp 25 Mar 2003 17:03:02 -0000 1.1.1.1 --- rcccoachserializer.hpp 8 Jul 2004 02:16:12 -0000 1.2 *************** *** 30,33 **** --- 30,34 ---- { public: + CoachSerializer(); CoachSerializer( std::ostream& o ); Index: rccofflinecoachserializer.cpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rccofflinecoachserializer.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** rccofflinecoachserializer.cpp 1 Oct 2003 23:01:33 -0000 1.3 --- rccofflinecoachserializer.cpp 8 Jul 2004 02:16:12 -0000 1.4 *************** *** 29,32 **** --- 29,36 ---- namespace rcc { + OfflineCoachSerializer::OfflineCoachSerializer() + : CoachSerializer() + {} + OfflineCoachSerializer::OfflineCoachSerializer( std::ostream& o ) : CoachSerializer( o ) Index: rccofflinecoachserializer.hpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rccofflinecoachserializer.hpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** rccofflinecoachserializer.hpp 25 Mar 2003 17:03:02 -0000 1.1.1.1 --- rccofflinecoachserializer.hpp 8 Jul 2004 02:16:12 -0000 1.2 *************** *** 30,33 **** --- 30,34 ---- { public: + OfflineCoachSerializer(); OfflineCoachSerializer( std::ostream& o ); Index: rcconlinecoachserializer.cpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rcconlinecoachserializer.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** rcconlinecoachserializer.cpp 1 Oct 2003 01:56:14 -0000 1.3 --- rcconlinecoachserializer.cpp 8 Jul 2004 02:16:12 -0000 1.4 *************** *** 31,38 **** #endif namespace rcc { OnlineCoachSerializer::OnlineCoachSerializer( std::ostream& o ) ! : CoachSerializer( o ) {} --- 31,46 ---- #endif + #ifdef HAVE_LIBRCSSCLANGPARSER + #include <rcssserver/clangmsg.h> + #endif + namespace rcc { + OnlineCoachSerializer::OnlineCoachSerializer() + : CoachSerializer() + {} + OnlineCoachSerializer::OnlineCoachSerializer( std::ostream& o ) ! : CoachSerializer( o ) {} *************** *** 48,51 **** --- 56,67 ---- void + sayClang( const rcss::clang::Msg& msg ) + { + #ifdef HAVE_LIBRCSSCLANGPARSER + output() << "(say " << msg << ")" << std::ends << std::flush; + #endif + } + + void OnlineCoachSerializer::changePlayerType( UNumType unum, unsigned int type ) { Index: rcconlinecoachserializer.hpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rcconlinecoachserializer.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rcconlinecoachserializer.hpp 1 Oct 2003 01:56:14 -0000 1.2 --- rcconlinecoachserializer.hpp 8 Jul 2004 02:16:12 -0000 1.3 *************** *** 22,33 **** #define RCCONLINECOACHSERIALIZER_HPP - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif #include "rcccoachserializer.hpp" - #ifdef HAVE_LIBRCSSCLANGPARSER - #include <rcssserver/clangmsg.h> namespace rcss { --- 22,28 ---- *************** *** 37,41 **** } } - #endif namespace rcc --- 32,35 ---- *************** *** 45,48 **** --- 39,43 ---- { public: + OnlineCoachSerializer(); OnlineCoachSerializer( std::ostream& o ); *************** *** 52,62 **** init( const std::string& team_name, int version ); ! #ifdef HAVE_LIBRCSSCLANGPARSER void sayClang( const rcss::clang::Msg& msg ); ! { ! output() << "(say " << msg << ")" << std::ends << std::flush; ! } ! #endif void --- 47,60 ---- init( const std::string& team_name, int version ); ! /* depracated */ void sayClang( const rcss::clang::Msg& msg ); ! ! template< typename CLANG_MSG > ! void ! sayClang( const CLANG_MSG& msg ) ! { ! output() << "(say " << msg << ")" << std::ends << std::flush; ! } void Index: rccplayerserializer.cpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rccplayerserializer.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** rccplayerserializer.cpp 1 Oct 2003 01:56:14 -0000 1.3 --- rccplayerserializer.cpp 8 Jul 2004 02:16:12 -0000 1.4 *************** *** 29,32 **** --- 29,36 ---- namespace rcc { + PlayerSerializer::PlayerSerializer() + : Serializer() + {} + PlayerSerializer::PlayerSerializer( std::ostream& o ) : Serializer( o ) Index: rccplayerserializer.hpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rccplayerserializer.hpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** rccplayerserializer.hpp 25 Mar 2003 17:03:02 -0000 1.1.1.1 --- rccplayerserializer.hpp 8 Jul 2004 02:16:12 -0000 1.2 *************** *** 30,33 **** --- 30,34 ---- { public: + PlayerSerializer(); PlayerSerializer( std::ostream& o ); Index: rccserializer.cpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rccserializer.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rccserializer.cpp 1 Oct 2003 00:12:51 -0000 1.2 --- rccserializer.cpp 8 Jul 2004 02:16:12 -0000 1.3 *************** *** 125,130 **** } Serializer::Serializer( std::ostream& o ) ! : m_strm( o ) {} --- 125,134 ---- } + Serializer::Serializer() + : m_strm( NULL ) + {} + Serializer::Serializer( std::ostream& o ) ! : m_strm( &o ) {} *************** *** 132,138 **** {} std::ostream& Serializer::output() ! { return m_strm; } void --- 136,146 ---- {} + void + Serializer::setOutput( std::ostream& o ) + { m_strm = &o; } + std::ostream& Serializer::output() ! { return *m_strm; } void Index: rccserializer.hpp =================================================================== RCS file: /cvsroot/rccparser/rccserializer/src/rccserializer.hpp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** rccserializer.hpp 25 Mar 2003 17:03:02 -0000 1.1.1.1 --- rccserializer.hpp 8 Jul 2004 02:16:12 -0000 1.2 *************** *** 141,148 **** --- 141,153 ---- operator<<( std::ostream& o, PlayModeType on_off ); + Serializer(); + Serializer( std::ostream& o ); ~Serializer(); + void + setOutput( std::ostream& o ); + std::ostream& output(); *************** *** 161,165 **** private: ! std::ostream& m_strm; }; } --- 166,170 ---- private: ! std::ostream* m_strm; }; } |
|
From: Tom H. <tom...@us...> - 2004-07-08 02:15:44
|
Update of /cvsroot/rccparser/rccparser/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12748/src Modified Files: Makefile.am rcclexer.lpp rccparse.ypp rccparser.cpp rccparser.h Added Files: rcclexer.hpp Removed Files: rcclexer.h Log Message: 2003-07-01 Tom Howard <tom...@us...> * ./Makefile.am Corrected email addresses --- NEW FILE: rcclexer.hpp --- // -*-c++-*- /*************************************************************************** rcclexer.h Lexer for RoboCup language ------------------- begin : 24-JUNE-2002 copyright : (C) 2002 by Tom Howard email : tom...@us... ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU LGPL as published by the Free Software * * Foundation; either version 2 of the License, or (at your option) any * * later version. * * * ***************************************************************************/ #ifndef RCCLEXER_H #define RCCLEXER_H #undef yyFlexLexer #define yyFlexLexer RCCFlexLexer #include <rcssbase/FlexLexer.h> #include <string> #include "rccparser.h" class RCCLexer : public yyFlexLexer { public: typedef rcc::Holder Holder; virtual int yylex(); inline int lex( Holder& holder ) { M_lexed_val = &holder; return yylex(); } private: Holder* M_lexed_val; }; namespace rcc { class Lexer : public RCCLexer { }; } #endif Index: Makefile.am =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/Makefile.am,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** Makefile.am 1 Jul 2003 03:44:48 -0000 1.43 --- Makefile.am 8 Jul 2004 02:15:30 -0000 1.44 *************** *** 29,33 **** rccparser.cpp ! librccparser_la_LDFLAGS = -version-info 3:0:3 # 1. Start with version information of `0:0:0' for each libtool library. # --- 29,33 ---- rccparser.cpp ! librccparser_la_LDFLAGS = -version-info 4:0:4 # 1. Start with version information of `0:0:0' for each libtool library. # *************** *** 55,63 **** pkginclude_HEADERS = \ ! rcclexer.h \ rccparser.h pkgdata_DATA = clang.data out.data ac_lib_rccparser.m4 AM_CXXFLAGS=-W --- 55,66 ---- pkginclude_HEADERS = \ ! rcclexer.hpp \ rccparser.h pkgdata_DATA = clang.data out.data ac_lib_rccparser.m4 + + + AM_CXXFLAGS=-W *************** *** 97,112 **** .lpp.cpp: $*.lpp ! $(FLEX) $(FLEXFLAGS) $(AM_FLEXFLAGS) -o$@.tmp $< ! sed 's/#include <FlexLexer\.h>/#include \"$*.h\"/;\ ! s/class istream;/#include <iosfwd>/;\ ! s/cin/std::cin/;s/cout/std::cout/;s/cerr/std::cerr/;\ ! s/ostream/std::ostream/;\ ! s/#include <istd::ostream.h>/#include <iostream>/;\ ! s/istream/std::istream/;\ ! s/std::std/std/g;\ ! s/rcclexer\.cpp\.tmp/rcclexer.cpp/;\ ! s/#include <unistd\.h>//;\ ! s/#include<unistd\.h>//' $@.tmp > $@ ! rm -f $@.tmp noinst_SCRIPTS = test_script_v7 test_script_v8 --- 100,111 ---- .lpp.cpp: $*.lpp ! $(FLEX) $(FLEXFLAGS) $(AM_FLEXFLAGS) $< ! sed 's/#include <FlexLexer\.h>/#include \"$*.hpp\"/;s/class istream;/\#include <iosfwd>\nusing namespace std;/;s/#include <iostream.h>/#include <iostream>/;s/lex\.yy\.c/$@/' lex.yy.c > $@ ! rm -f lex.yy.c ! ! .ll.cc: $*.ll ! $(FLEX) $(FLEXFLAGS) $(AM_FLEXFLAGS) $< ! sed 's/#include <FlexLexer\.h>/#include \"$*.h\"/;s/class istream;/\#include <iosfwd>\nusing namespace std;/;s/#include <iostream.h>/#include <iostream>/;s/lex\.yy\.c/$@/' lex.yy.c > $@ ! rm -f lex.yy.c noinst_SCRIPTS = test_script_v7 test_script_v8 Index: rcclexer.lpp =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rcclexer.lpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** rcclexer.lpp 30 Jun 2003 06:45:35 -0000 1.8 --- rcclexer.lpp 8 Jul 2004 02:15:30 -0000 1.9 *************** *** 20,24 **** %{ ! #include "rcclexer.h" #include "rccparse.h" #include <string> --- 20,24 ---- %{ ! #include "rcclexer.hpp" #include "rccparse.h" #include <string> Index: rccparse.ypp =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rccparse.ypp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** rccparse.ypp 30 Jun 2003 06:45:35 -0000 1.16 --- rccparse.ypp 8 Jul 2004 02:15:30 -0000 1.17 *************** *** 32,36 **** #include "rccparser.h" ! #include "rcclexer.h" --- 32,36 ---- #include "rccparser.h" ! #include "rcclexer.hpp" *************** *** 89,106 **** Parser::parseCLang( const char* message ) { #ifdef HAVE_SSTREAM ! std::istringstream strm( message ); #else ! std::istrstream strm( message ); #endif ! if( M_clang_parser.parse( strm ) ) ! { ! doParsedCLang( message ); ! return true; ! } ! else ! { ! return false; ! } } --- 89,111 ---- Parser::parseCLang( const char* message ) { + if( M_clang_parser ) + { #ifdef HAVE_SSTREAM ! std::istringstream strm( message ); #else ! std::istrstream strm( message ); #endif ! if( M_clang_parser->parse( strm ) ) ! { ! doParsedCLang( message ); ! return true; ! } ! else ! { ! return false; ! } ! } ! else ! return true; } Index: rccparser.cpp =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rccparser.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rccparser.cpp 24 Mar 2003 18:15:21 -0000 1.1 --- rccparser.cpp 8 Jul 2004 02:15:30 -0000 1.2 *************** *** 21,25 **** #include "rccparser.h" ! #include "rcclexer.h" #include <algorithm> --- 21,25 ---- #include "rccparser.h" ! #include "rcclexer.hpp" #include <algorithm> Index: rccparser.h =================================================================== RCS file: /cvsroot/rccparser/rccparser/src/rccparser.h,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** rccparser.h 30 Jun 2003 06:45:35 -0000 1.38 --- rccparser.h 8 Jul 2004 02:15:30 -0000 1.39 *************** *** 278,294 **** -# rcc::Parser::doBuildInit() - You will also need to pass a rcss::Parser object (note the different - namespace) to rcc::Parser when it is - initialized. This so the rcssclangparser library that comes with rcsserver - can be used to parse CLang messages (thus making sure the CLang parsing is - always upto date). - Assuming the data to be parsed is in a char array, the following code would cause parsing to occur. \code ! rcss::clang::MsgBuilder clang_builder; ! rcss::clang::Parser clang_parser( clang_builder ); ! YourParser parser( clang_parser ); [...snip...] --- 278,286 ---- -# rcc::Parser::doBuildInit() Assuming the data to be parsed is in a char array, the following code would cause parsing to occur. \code ! YourParser parser(); [...snip...] *************** *** 302,305 **** --- 294,305 ---- \endcode + rcc::Parser does not provide parsing for CLang messages. instead + you can pass a rcss::Parser object (note the different + namespace) to rcc::Parser when it is + initialized. This will allow the rcssclangparser library that comes with rcsserver + can be used to parse CLang messages (thus making sure the CLang parsing is + always upto date). If rcc::Parser is not initialed with a CLang parsing + library then CLang messages will be ignored. + Instances of rcc::Parser derived classes can be used in a multi-threaded environment, but you will either need prevent *************** *** 1475,1483 **** void ! buildClangPlayerVersionMsg( ) { M_parser.doBuildClangPlayerVersionMsg( ); } void ! buildClangPlayerVersion( int min, int max ) { M_parser.doBuildClangPlayerVersion( min, max ); } --- 1475,1483 ---- void ! buildClangPlayerVersionMsg( ) { M_parser.doBuildClangPlayerVersionMsg( ); } void ! buildClangPlayerVersion( int min, int max ) { M_parser.doBuildClangPlayerVersion( min, max ); } *************** *** 1619,1623 **** Param M_param; ! rcss::Parser& M_clang_parser; friend int RCC_lex( rcc::Holder*, --- 1619,1623 ---- Param M_param; ! rcss::Parser* M_clang_parser; friend int RCC_lex( rcc::Holder*, *************** *** 1646,1658 **** /** Parser constructor. * ! * You will need to call this constuctor from your subclass's contructor. ! * The clang_parser parameter is a reference to another parser which will ! * be used for parsing CLang messages. This is compatible with the CLang ! * parser that is part of the simulator. * */ Parser( rcss::Parser& clang_parser ) : M_param( *this ), ! M_clang_parser( clang_parser ) {} --- 1646,1671 ---- /** Parser constructor. * ! * If you client does not need to support CLang, then you can call ! * this contructor from your subclass. This will cause all CLang ! * messages to be ignored. ! * ! */ ! Parser() ! : M_param( *this ), ! M_clang_parser( NULL ) ! {} ! ! /** Parser constructor. ! * ! * You will need to call this constuctor from your subclass's ! * contructor if you want to support CLang. The clang_parser ! * parameter is a reference to another parser which will be used for ! * parsing CLang messages. This is compatible with the CLang parser ! * that is part of the simulator. * */ Parser( rcss::Parser& clang_parser ) : M_param( *this ), ! M_clang_parser( &clang_parser ) {} *************** *** 1661,1664 **** --- 1674,1690 ---- {} + /** CLang initialisation function. + * + * If you do not, set the CLang parser during construction, you can + * specify the CLang parser at a later date by using this function. + * + */ + void + setCLangParser( rcss::Parser& clang_parser ) + { + M_clang_parser = &clang_parser; + } + + #ifdef DOXYGEN_ONLY /* The following functions are actually inherited from rcss::Parser, *************** *** 1736,1739 **** --- 1762,1769 ---- * Override this function in your subclass to * execute code \b after a CLang message has been parsed. + * + * \note this function will not be called if you have not intialized + * the parser with a CLang parser and have not set it with + * setClangParser(); * * If this function is not overridden then the default behaviour is to call --- rcclexer.h DELETED --- |
|
From: Tom H. <tom...@us...> - 2004-07-08 02:15:44
|
Update of /cvsroot/rccparser/rccparser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12748 Modified Files: configure.in Log Message: 2003-07-01 Tom Howard <tom...@us...> * ./Makefile.am Corrected email addresses Index: configure.in =================================================================== RCS file: /cvsroot/rccparser/rccparser/configure.in,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** configure.in 1 Jul 2003 03:49:04 -0000 1.39 --- configure.in 8 Jul 2004 02:15:29 -0000 1.40 *************** *** 16,19 **** --- 16,20 ---- flex, $srcdir/missingflex) + AM_FLEXFLAGS="-olex.yy.c" |
|
From: Tom H. <tom...@us...> - 2003-10-01 23:06:03
|
Update of /cvsroot/rccparser/rccserializer
In directory sc8-pr-cvs1:/tmp/cvs-serv5166
Modified Files:
ChangeLog NEWS
Log Message:
2003-10-02 Tom Howard <tom...@us...>
* ./src/rccofflinecoachserializer.cpp
Added patch from oliver, which fixed bug in offline coach's init
Index: ChangeLog
===================================================================
RCS file: /cvsroot/rccparser/rccserializer/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ChangeLog 1 Oct 2003 01:56:14 -0000 1.5
--- ChangeLog 1 Oct 2003 23:05:59 -0000 1.6
***************
*** 1,2 ****
--- 1,7 ----
+ 2003-10-02 Tom Howard <tom...@us...>
+
+ * ./src/rccofflinecoachserializer.cpp
+ Added patch from oliver, which fixed bug in offline coach's init
+
2003-10-01 Tom Howard <tom...@us...>
Index: NEWS
===================================================================
RCS file: /cvsroot/rccparser/rccserializer/NEWS,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NEWS 1 Oct 2003 01:56:14 -0000 1.4
--- NEWS 1 Oct 2003 23:05:59 -0000 1.5
***************
*** 1,3 ****
--- 1,5 ----
[0.0.1]
+ * Fixed bug in init message for offline coach
+
* Fixed missing includes
|
|
From: Tom H. <tom...@us...> - 2003-10-01 23:01:37
|
Update of /cvsroot/rccparser/rccserializer/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4628/src
Modified Files:
rccofflinecoachserializer.cpp
Log Message:
2003-10-01 Tom Howard <tom...@us...>
* ./Makefile.am
* ./NEWS
* ./acinclude.m4
* ./configure.ac
* ./src/rcconlinecoachserializer.cpp
* ./src/rcconlinecoachserializer.hpp
* ./src/rccplayerserializer.cpp
clang usage is now optional
Index: rccofflinecoachserializer.cpp
===================================================================
RCS file: /cvsroot/rccparser/rccserializer/src/rccofflinecoachserializer.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rccofflinecoachserializer.cpp 1 Oct 2003 00:12:51 -0000 1.2
--- rccofflinecoachserializer.cpp 1 Oct 2003 23:01:33 -0000 1.3
***************
*** 39,43 ****
OfflineCoachSerializer::init( int version )
{
! output() << "(init " << version << ")" << std::ends << std::flush;
}
--- 39,43 ----
OfflineCoachSerializer::init( int version )
{
! output() << "(init (version " << version << "))" << std::ends << std::flush;
}
|
|
From: Tom H. <tom...@us...> - 2003-10-01 01:56:19
|
Update of /cvsroot/rccparser/rccserializer/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19769/src
Modified Files:
rcconlinecoachserializer.cpp rcconlinecoachserializer.hpp
rccplayerserializer.cpp
Log Message:
2003-10-01 Tom Howard <tom...@us...>
* ./Makefile.am
* ./NEWS
* ./acinclude.m4
* ./configure.ac
* ./src/rcconlinecoachserializer.cpp
* ./src/rcconlinecoachserializer.hpp
* ./src/rccplayerserializer.cpp
clang usage is now optional
Index: rcconlinecoachserializer.cpp
===================================================================
RCS file: /cvsroot/rccparser/rccserializer/src/rcconlinecoachserializer.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rcconlinecoachserializer.cpp 25 Mar 2003 17:24:50 -0000 1.2
--- rcconlinecoachserializer.cpp 1 Oct 2003 01:56:14 -0000 1.3
***************
*** 25,30 ****
#include "rcconlinecoachserializer.hpp"
- #include <rcssserver/clangmsg.h>
-
#ifdef HAVE_SSTREAM
#include <sstream>
--- 25,28 ----
***************
*** 47,56 ****
output() << "(init " << team_name << "(version " << version << "))"
<< std::ends << std::flush;
- }
-
- void
- OnlineCoachSerializer::sayClang( const rcss::clang::Msg& msg )
- {
- output() << "(say " << msg << ")" << std::ends << std::flush;
}
--- 45,48 ----
Index: rcconlinecoachserializer.hpp
===================================================================
RCS file: /cvsroot/rccparser/rccserializer/src/rcconlinecoachserializer.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rcconlinecoachserializer.hpp 25 Mar 2003 17:03:02 -0000 1.1.1.1
--- rcconlinecoachserializer.hpp 1 Oct 2003 01:56:14 -0000 1.2
***************
*** 22,27 ****
--- 22,33 ----
#define RCCONLINECOACHSERIALIZER_HPP
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+
#include "rcccoachserializer.hpp"
+ #ifdef HAVE_LIBRCSSCLANGPARSER
+ #include <rcssserver/clangmsg.h>
namespace rcss
{
***************
*** 31,34 ****
--- 37,41 ----
}
}
+ #endif
namespace rcc
***************
*** 45,50 ****
--- 52,62 ----
init( const std::string& team_name, int version );
+ #ifdef HAVE_LIBRCSSCLANGPARSER
void
sayClang( const rcss::clang::Msg& msg );
+ {
+ output() << "(say " << msg << ")" << std::ends << std::flush;
+ }
+ #endif
void
Index: rccplayerserializer.cpp
===================================================================
RCS file: /cvsroot/rccparser/rccserializer/src/rccplayerserializer.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rccplayerserializer.cpp 1 Oct 2003 00:12:51 -0000 1.2
--- rccplayerserializer.cpp 1 Oct 2003 01:56:14 -0000 1.3
***************
*** 19,23 ****
***************************************************************************/
! #ifdef HAVE_CONFIG_H
#include "config.h"
#endif
--- 19,23 ----
***************************************************************************/
! #ifdef HAVE__CONFIG_H
#include "config.h"
#endif
|
|
From: Tom H. <tom...@us...> - 2003-10-01 01:56:19
|
Update of /cvsroot/rccparser/rccserializer
In directory sc8-pr-cvs1:/tmp/cvs-serv19769
Modified Files:
ChangeLog Makefile.am NEWS acinclude.m4 configure.ac
Log Message:
2003-10-01 Tom Howard <tom...@us...>
* ./Makefile.am
* ./NEWS
* ./acinclude.m4
* ./configure.ac
* ./src/rcconlinecoachserializer.cpp
* ./src/rcconlinecoachserializer.hpp
* ./src/rccplayerserializer.cpp
clang usage is now optional
Index: ChangeLog
===================================================================
RCS file: /cvsroot/rccparser/rccserializer/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ChangeLog 1 Oct 2003 00:12:51 -0000 1.4
--- ChangeLog 1 Oct 2003 01:56:14 -0000 1.5
***************
*** 1,4 ****
--- 1,15 ----
2003-10-01 Tom Howard <tom...@us...>
+ * ./Makefile.am
+ * ./NEWS
+ * ./acinclude.m4
+ * ./configure.ac
+ * ./src/rcconlinecoachserializer.cpp
+ * ./src/rcconlinecoachserializer.hpp
+ * ./src/rccplayerserializer.cpp
+ clang usage is now optional
+
+ 2003-10-01 Tom Howard <tom...@us...>
+
* ./src/rcccoachserializer.cpp
* ./src/rccofflinecoachserializer.cpp
Index: Makefile.am
===================================================================
RCS file: /cvsroot/rccparser/rccserializer/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am 25 Mar 2003 17:03:01 -0000 1.1.1.1
--- Makefile.am 1 Oct 2003 01:56:14 -0000 1.2
***************
*** 10,15 ****
NEWS \
README \
! INSTALL \
! config.h.in
CLEANFILES = \
--- 10,14 ----
NEWS \
README \
! INSTALL
CLEANFILES = \
***************
*** 17,24 ****
core \
*.tar.gz \
! *.tmp
!
! pkginclude_HEADERS = \
! config.h
branch-major: commit
--- 16,20 ----
core \
*.tar.gz \
! *.tmp
branch-major: commit
Index: NEWS
===================================================================
RCS file: /cvsroot/rccparser/rccserializer/NEWS,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NEWS 1 Oct 2003 00:12:51 -0000 1.3
--- NEWS 1 Oct 2003 01:56:14 -0000 1.4
***************
*** 2,5 ****
--- 2,22 ----
* Fixed missing includes
+ * Clients that use CLang can now do so optionally. If you wish to
+ use clang, you must link your executable with rcssclangparser and
+ either add -DHAVE_LIBRCSSCLANGPARSER=1 to the CPPFLAGS, or put
+
+ #define HAVE_LIBRCSSCLANGPARSER 1
+
+ in config.h and add -DHAVE_CONFIG_H=1 to your CPPFLAGS. If you
+ are using autotools, this can be done by having the following lines
+ in you configure.{in,ac}
+
+ AM_CONFIG_HEADER(config.h)
+ AC_LIB_RCSSCLANGPARSER([LIBS="$LIBS -lrcssclangparser"
+ AC_DEFINE(HAVE_LIBRCSSCLANGPARSER,1,
+ [Define to 1 if rcssclangparser is available])])
+
+ and adding ac_lib_rcssclangparser.m4 to you acinclude.m4
+
[0.0.0]
* Initial release. Please see the README file for some basic
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/rccparser/rccserializer/acinclude.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** acinclude.m4 25 Mar 2003 17:03:01 -0000 1.1.1.1
--- acinclude.m4 1 Oct 2003 01:56:14 -0000 1.2
***************
*** 1,3706 ****
- # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
- ## Copyright 1996, 1997, 1998, 1999, 2000, 2001
- ## Free Software Foundation, Inc.
- ## Originally by Gordon Matzigkeit <go...@gn...>, 1996
- ##
- ## This program is free software; you can redistribute it and/or modify
- ## it under the terms of the GNU General Public License as published by
- ## the Free Software Foundation; either version 2 of the License, or
- ## (at your option) any later version.
- ##
[...3706 lines suppressed...]
- AC_CACHE_CHECK(whether the rcssclangparser library is available, ac_cv_lib_rcssclangparser,
- [AC_LANG_PUSH(C++)
- OLD_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -lrcssclangparser"
- AC_LINK_IFELSE([@%:@include <rcssserver/clangrulemsg.h>
- int main()
- {
- rcss::clang::RuleMsg rule;
- return 0;
- }],
- [AS_VAR_SET(ac_lib_rcssclangparser, yes)],
- [AS_VAR_SET(ac_lib_rcssclangparser, no)
- LDFLAGS="$OLD_LDFLAGS"
- ])
- AC_LANG_POP(C++)
- ])
- AS_IF([test AS_VAR_GET(ac_lib_rcssclangparser) = yes], [$1], [$2])
- AS_VAR_POPDEF([ac_lib_rcssclangparser])dnl
- ])# AC_LIB_RCSSCLANGPARSER
--- 36,37 ----
Index: configure.ac
===================================================================
RCS file: /cvsroot/rccparser/rccserializer/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure.ac 25 Mar 2003 17:31:01 -0000 1.2
--- configure.ac 1 Oct 2003 01:56:14 -0000 1.3
***************
*** 48,60 ****
dnl Checks for library functions.
- AC_LIB_RCSSCLANGPARSER([AC_SUBST(ONLINEC_LIBS, "-lrcssclangparser")],[AC_MSG_WARN([
-
- The rcssclangparser library could not be found. This means that you
- will not be able to use the rcc::OnlineCoachSerializer::say() function
- unless you link you executable with the rcssclangparser library
- ])
- ])
-
-
dnl optional features
--- 48,51 ----
|
|
From: Tom H. <tom...@us...> - 2003-10-01 00:12:55
|
Update of /cvsroot/rccparser/rccserializer
In directory sc8-pr-cvs1:/tmp/cvs-serv1957
Modified Files:
ChangeLog NEWS
Log Message:
2003-10-01 Tom Howard <tom...@us...>
* ./src/rcccoachserializer.cpp
* ./src/rccofflinecoachserializer.cpp
* ./src/rccplayerserializer.cpp
* ./src/rccserializer.cpp
Added patch from oliver, which fixed missing includes
Index: ChangeLog
===================================================================
RCS file: /cvsroot/rccparser/rccserializer/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ChangeLog 25 Mar 2003 17:29:39 -0000 1.3
--- ChangeLog 1 Oct 2003 00:12:51 -0000 1.4
***************
*** 1,2 ****
--- 1,10 ----
+ 2003-10-01 Tom Howard <tom...@us...>
+
+ * ./src/rcccoachserializer.cpp
+ * ./src/rccofflinecoachserializer.cpp
+ * ./src/rccplayerserializer.cpp
+ * ./src/rccserializer.cpp
+ Added patch from oliver, which fixed missing includes
+
2003-03-25 Tom Howard <tom...@us...>
Index: NEWS
===================================================================
RCS file: /cvsroot/rccparser/rccserializer/NEWS,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NEWS 25 Mar 2003 17:24:49 -0000 1.2
--- NEWS 1 Oct 2003 00:12:51 -0000 1.3
***************
*** 1,2 ****
--- 1,5 ----
+ [0.0.1]
+ * Fixed missing includes
+
[0.0.0]
* Initial release. Please see the README file for some basic
|
|
From: Tom H. <tom...@us...> - 2003-10-01 00:12:55
|
Update of /cvsroot/rccparser/rccserializer/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1957/src
Modified Files:
rcccoachserializer.cpp rccofflinecoachserializer.cpp
rccplayerserializer.cpp rccserializer.cpp
Log Message:
2003-10-01 Tom Howard <tom...@us...>
* ./src/rcccoachserializer.cpp
* ./src/rccofflinecoachserializer.cpp
* ./src/rccplayerserializer.cpp
* ./src/rccserializer.cpp
Added patch from oliver, which fixed missing includes
Index: rcccoachserializer.cpp
===================================================================
RCS file: /cvsroot/rccparser/rccserializer/src/rcccoachserializer.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rcccoachserializer.cpp 25 Mar 2003 17:03:02 -0000 1.1.1.1
--- rcccoachserializer.cpp 1 Oct 2003 00:12:51 -0000 1.2
***************
*** 25,28 ****
--- 25,30 ----
#include "rcccoachserializer.hpp"
+ #include <iostream>
+
namespace rcc
{
Index: rccofflinecoachserializer.cpp
===================================================================
RCS file: /cvsroot/rccparser/rccserializer/src/rccofflinecoachserializer.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rccofflinecoachserializer.cpp 25 Mar 2003 17:03:02 -0000 1.1.1.1
--- rccofflinecoachserializer.cpp 1 Oct 2003 00:12:51 -0000 1.2
***************
*** 25,28 ****
--- 25,30 ----
#include "rccofflinecoachserializer.hpp"
+ #include <iostream>
+
namespace rcc
{
Index: rccplayerserializer.cpp
===================================================================
RCS file: /cvsroot/rccparser/rccserializer/src/rccplayerserializer.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rccplayerserializer.cpp 25 Mar 2003 17:03:02 -0000 1.1.1.1
--- rccplayerserializer.cpp 1 Oct 2003 00:12:51 -0000 1.2
***************
*** 25,28 ****
--- 25,30 ----
#include "rccplayerserializer.hpp"
+ #include <iostream>
+
namespace rcc
{
Index: rccserializer.cpp
===================================================================
RCS file: /cvsroot/rccparser/rccserializer/src/rccserializer.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rccserializer.cpp 25 Mar 2003 17:03:02 -0000 1.1.1.1
--- rccserializer.cpp 1 Oct 2003 00:12:51 -0000 1.2
***************
*** 25,28 ****
--- 25,30 ----
#include "rccserializer.hpp"
+ #include <iostream>
+
namespace rcc
{
|
|
From: Tom H. <tom...@us...> - 2003-07-01 05:28:24
|
Update of /cvsroot/rccparser/rccparser
In directory sc8-pr-cvs1:/tmp/cvs-serv14523
Modified Files:
ChangeLog Makefile.am
Log Message:
2003-07-01 Tom Howard <tom...@us...>
* ./Makefile.am
Corrected email addresses
Index: ChangeLog
===================================================================
RCS file: /cvsroot/rccparser/rccparser/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** ChangeLog 1 Jul 2003 05:25:41 -0000 1.80
--- ChangeLog 1 Jul 2003 05:28:20 -0000 1.81
***************
*** 2,5 ****
--- 2,10 ----
* ./Makefile.am
+ Corrected email addresses
+
+ 2003-07-01 Tom Howard <tom...@us...>
+
+ * ./Makefile.am
Added spec to dist
Index: Makefile.am
===================================================================
RCS file: /cvsroot/rccparser/rccparser/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Makefile.am 1 Jul 2003 05:25:41 -0000 1.20
--- Makefile.am 1 Jul 2003 05:28:20 -0000 1.21
***************
*** 75,79 ****
USERNAME="$$USER"; fi; \
if test "$$USEREMAIL" = ""; then \
! USEREMAIL="sse...@li..."; fi; \
DATE=`date +"%Y-%m-%d"`; \
LOGHEADER=`echo -e "$$DATE\t$$USERNAME\t<$$USEREMAIL>\n"`; \
--- 75,79 ----
USERNAME="$$USER"; fi; \
if test "$$USEREMAIL" = ""; then \
! USEREMAIL="un...@us..."; fi; \
DATE=`date +"%Y-%m-%d"`; \
LOGHEADER=`echo -e "$$DATE\t$$USERNAME\t<$$USEREMAIL>\n"`; \
***************
*** 152,158 ****
echo ""; \
echo "@PACKAGE@-@VERSION@-0.$${dir}.$(PLATFORM_SUFFIX).rpm has been created."; \
! echo "If you are not a maintainer, please consider emailing the"; \
! echo "RPM to sse...@li..., so they can make it" ; \
! echo "available for others"; \
echo ""; \
found=true; \
--- 152,157 ----
echo ""; \
echo "@PACKAGE@-@VERSION@-0.$${dir}.$(PLATFORM_SUFFIX).rpm has been created."; \
! echo "Please consider emailing the RPM to tom...@li...,"; \
! echo "so I can make it available for others"; \
echo ""; \
found=true; \
|
|
From: Tom H. <tom...@us...> - 2003-07-01 05:25:46
|
Update of /cvsroot/rccparser/rccparser In directory sc8-pr-cvs1:/tmp/cvs-serv14248 Modified Files: ChangeLog Makefile.am Log Message: 2003-07-01 Tom Howard <tom...@us...> * ./Makefile.am Added spec to dist Index: ChangeLog =================================================================== RCS file: /cvsroot/rccparser/rccparser/ChangeLog,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** ChangeLog 1 Jul 2003 03:47:54 -0000 1.79 --- ChangeLog 1 Jul 2003 05:25:41 -0000 1.80 *************** *** 1,4 **** --- 1,9 ---- 2003-07-01 Tom Howard <tom...@us...> + * ./Makefile.am + Added spec to dist + + 2003-07-01 Tom Howard <tom...@us...> + * ./configure.in Released rccparser-1.2.5 Index: Makefile.am =================================================================== RCS file: /cvsroot/rccparser/rccparser/Makefile.am,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Makefile.am 30 Jun 2003 06:45:34 -0000 1.19 --- Makefile.am 1 Jul 2003 05:25:41 -0000 1.20 *************** *** 21,25 **** rccparser/rccparser.plg \ src/out.data \ ! src/v8-sensor_data.txt CLEANFILES = \ --- 21,26 ---- rccparser/rccparser.plg \ src/out.data \ ! src/v8-sensor_data.txt \ ! @PACKAGE@-@VERSION@.spec CLEANFILES = \ |
|
From: Tom H. <tom...@us...> - 2003-07-01 05:12:23
|
Update of /cvsroot/rccparser/rccparser In directory sc8-pr-cvs1:/tmp/cvs-serv12601 Added Files: spec.tmpl Log Message: 2003-07-01 Tom Howard <tom...@us...> * ./configure.in Released rccparser-1.2.5 --- NEW FILE: spec.tmpl --- Summary: The RoboCup Soccer Simulator Client Parser Name: @NAME@ Version: @VER@ Release: 0 Copyright: GPL Group: Development/Libraries Source0: http://prdownloads.sourceforge.net/rccparser/%{name}-%{version}.tar.gz URL: http://rccparser.sf.net BuildRoot: %{_tmppath}/%{name}-root Prefix: %{_prefix} %description The RoboCup Soccer Simulator Client Parser package (rccparser) is a C++ library for parsing sensor information sent by the Simulator to a client. %prep %setup %build %configure make %install %makeinstall %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README %changelog |
