[fU-cvs] libfunutil/lib/s11n/parsers hex.flex.at,1.1,1.2

[<sg...@us...>]

Update of /cvsroot/libfunutil/libfunutil/lib/s11n/parsers
In directory sc8-pr-cvs1:/tmp/cvs-serv2339/lib/s11n/parsers

Modified Files:
	hex.flex.at 
Log Message:
some build changes for s11n which i forgot to commit the other day. :/

Index: hex.flex.at
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/lib/s11n/parsers/hex.flex.at,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hex.flex.at	14 Oct 2003 20:37:50 -0000	1.1
+++ hex.flex.at	19 Nov 2003 22:40:09 -0000	1.2
@@ -2,7 +2,7 @@
 %{
 //
 // LICENSE: Public Domain
-// Author: stephan - sg...@us...
+// Author: stephan - st...@s1...
 //
 
 #define YY_SKIP_YYWRAP 1
@@ -14,18 +14,18 @@
 #include <string>
 #include <deque>
 
-#include <s11n/s11n-macros.h> // COUT/CERR
+#include <fun/s11n-macros.h> // COUT/CERR
 #define PCERR CERR << "hex.flex error:"
-// #include <toolbox/string_util.h> // trim_string()
+// #include <fun/string_util.h> // trim_string()
 
-// #include <toolbox/PropertyStore.h>
-// #include <toolbox/ClassLoader.h>
-// #include <toolbox/Instantiator.h>
-// #include <toolbox/KeyValueParser.h>
+// #include <fun/property_store.h>
+// #include <fun/class_loader.h>
+// #include <fun/instantiator.h>
+// #include <fun/key_value_parser.h>
 
-#include <s11n/node_builder.h>
-#include <s11n/flex_lexers.h>
-#include <toolbox/string_util.h> // hex2int()
+#include <fun/node_builder.h>
+#include <fun/flex_lexers.h>
+#include <fun/string_util.h> // hex2int()
 
 using std::cin;
 using std::cerr;
@@ -56,11 +56,11 @@
         bool in_prop;
         unsigned int decval = 0;
         unsigned int lcv = 0;
-        s11n::node_builder * serbuilder = 0;
+        fun::node_builder * serbuilder = 0;
 }
 
 
-namespace s11n {
+namespace fun {
         FlexLexer *
         HexTreeBuilder::lexer()
         {
@@ -81,7 +81,7 @@
                 serbuilder = this->builder();
                 node_depth = 0;
         }
-} // namespace s11n
+} // namespace fun
 
 
 
@@ -95,7 +95,7 @@
                 if( 0 == inchar ) {word=""; return 0;} \
                 word += inchar; \
         };\
-	decval = toolbox::hex2int(word);\
+	decval = fun::hex2int(word);\
 	if( 0 == decval ) { PCERR << "Error reading word (size="<<SZ<<"). Maybe reached end of input?" << endl; return 0; }
 
 
@@ -103,7 +103,7 @@
 
 HEX_DIGIT		([a-fA-F0-9])
 WORD2			{HEX_DIGIT}{2}
-	// maintenance note: these hex codes must be kept in sync with those from HexSerializer's enum
+	// maintenance note: these hex codes must be kept in sync with those from hex_serializer's enum
 NODE_OPEN		11
 NODE_CLOSE		10
 PROP_OPEN		21
@@ -186,19 +186,19 @@
 %%
 
 #if HEX_DO_MAIN
-#include <s11n/s11n_io.h> // HexSerializer
-// #include <s11n/FlexShell.h>
-// #include <s11n/ELib.h>
-using namespace s11n;
+#include <fun/s11n_io.h> // hex_serializer
+// #include <fun/FlexShell.h>
+// #include <fun/ELib.h>
+using namespace fun;
 int main( int argc, char ** argv )
 {
-        s11n::HexTreeBuilder bob;
+        fun::HexTreeBuilder bob;
         FlexLexer * lexer = bob.lexer();
 //         FlexLexer * lexer = new hexFlexLexer();
         while( 0 != (lexer->yylex() ) );
         if( bob.root_node() )
         {
-                s11n::ParenSerializer ser;
+                fun::paren_serializer ser;
                 ser.serialize( *(bob.root_node()), std::cout );
         }
         return 0;