filled up PREDEFINED doxygen macros

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1418 270642c3-0616-0410-b53a-bc976706d245

diff --git a/site_scons/lib/Doxyfile b/site_scons/lib/Doxyfile
index 5cc9370..b09c43c 100644 (file)
--- a/site_scons/lib/Doxyfile
+++ b/site_scons/lib/Doxyfile
@@ -5,41 +5,83 @@ ALIASES                = "fixme=\xrefitem fixme \"Fix\" \"Fixmes\"" \
                          "autotoc=\htmlonly <div id=\"autotoc\"></div> \endhtmlonly" \
                          "seechapter=<b>\htmlonly &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&rarr;&nbsp;\endhtmlonly see </b>"
 
-PREDEFINED             = DOXYGEN \
-                         "SENF_PPI_MODULE(x)=" \
-                         "SENF_PARSER()=" \
-                         "SENF_FIXED_PARSER()=" \
-                         "SENF_PARSER_INHERIT(name)=" \
-                         "SENF_PARSER_FIELD(name,type)=type name() const" \
-                         "SENF_PARSER_FIELD_RO(name,type)=type::value_type name() const" \
-                         "SENF_PARSER_BITFIELD(name, bits, type)=senf::ParseField_ ## type(bits) name() const" \
-                         "SENF_PARSER_BITFIELD_RO(name, bits, type)=senf::ParseField_ ## type(bits)::value_type name() const" \
-                         "SENF_PARSER_CUSTOM_FIELD(name, type, size, isize)=type name() const" \
-                         "SENF_PARSER_PRIVATE_FIELD(name,type)=private: type name() const; public:" \
-                         "SENF_PARSER_PRIVATE_FIELD_RO(name, type)=private: type::value_type name() const; public:" \
-                         "SENF_PARSER_PRIVATE_BITFIELD(name, bits, type)=private: senf::ParseField_ ## type(bits) name() const; public:" \
-                         "SENF_PARSER_PRIVATE_BITFIELD_RO(name, bits, type)=private: senf::ParseField_ ## type(bits)::value_type name() const; public:" \
-                         "SENF_PARSER_SKIP(x)=" \
-                         "SENF_PARSER_SKIP_BITS(x)=" \
-                         "SENF_PARSER_GOTO(x)=" \
-                         "SENF_PARSER_GOTO_OFFSET(x)=" \
-                         "SENF_PARSER_LABEL(x)=" \
-                         "SENF_PARSER_INIT()=void init()" \
-                         "SENF_PARSER_FINALIZE(name)=" \
-                         "ParseField_unsigned(b)=UIntFieldParser<?,?+b>" \
-                         "ParseField_signed(b)=IntFieldParser<?,?+b>" \
-                         "ParseField_bool(b)=FlagParser<?>" \
-                         "SENF_PARSER_ARRAY(name,elt_type,size)=senf::Parse_Array<size,elt_type> name() const" \
-                         "SENF_PARSER_LIST_B(name,elt_type,size_type)=senf::Parse_ListB<elt_type,size_type>::parser name() const" \
-                         "SENF_PARSER_LIST_N(name,elt_type,size_type)=senf::Parse_ListN<elt_type,size_type>::parser name() const" \
-                         "SENF_PARSER_VARIANT(name,chooser,types)=senf::Parse_Variant_Direct<chooser ## _t,?,types>::parser name() const" \
-                         "SENF_PARSER_PRIVATE_VARIANT(name,chooser,types)=private: senf::Parse_Variant_Direct<chooser ## _t,?,types>::parser name() const; public:" \
-                         "SENF_PARSER_VEC_N(name,elt_type,size_type)=senf::Parse_VectorN<elt_type,size_type> name() const" \
-                         "SENF_LOG_CLASS_AREA()=" \
-                         "SENF_LOG_DEFAULT_AREA(area)=" \
-                         "SENF_LOG_DEFAULT_STREAM(stream)=" \
-                         "BOOST_PP_ITERATE()=" \
-                         "BOOST_PARAMETER_KEYWORD(ns, name)=unspecified_keyword_type name;"
+PREDEFINED             = \
+    DOXYGEN                                                                                 \
+    SENF_PPI_MODULE(x)=                                                                     \
+    SENF_PARSER()=                                                                          \
+    SENF_FIXED_PARSER()=                                                                    \
+    SENF_PARSER_INHERIT(name)=                                                              \
+    SENF_PARSER_FIELD(name,type)="                                                          \
+        type name() const;                                                                  \ 
+        typedef type name##_t;"                                                             \
+    SENF_PARSER_FIELD_RO(name,type)="                                                       \
+        public:                                                                             \
+            type::value_type name() const                                                   \
+            typedef type name##_t;                                                          \
+        protected:                                                                          \
+            type name##_() const;"                                                          \
+    SENF_PARSER_BITFIELD(name,bits,type)="                                                  \
+        senf::ParseField_##type(bits) name() const"                                         \
+    SENF_PARSER_BITFIELD_RO(name,bits,type)="                                               \
+        senf::ParseField_##type(bits)::value_type name() const"                             \
+    SENF_PARSER_CUSTOM_FIELD(name,type,size,isize)="                                        \
+        type name() const"                                                                  \
+    SENF_PARSER_PRIVATE_FIELD(name,type)="                                                  \
+        protected:                                                                          \ 
+            type name() const;                                                              \
+            typedef type name##_t;"                                                         \
+        public:"                                                                            \
+    SENF_PARSER_PRIVATE_FIELD_RO(name,type)="                                               \
+        protected:                                                                          \
+            type::value_type name() const;                                                  \
+            type name##_() const;"                                                          \
+            typedef type name##_t;                                                          \
+        public:"                                                                            \
+    SENF_PARSER_PRIVATE_BITFIELD(name,bits,type)="                                          \
+        protected:                                                                          \ 
+            senf::ParseField_##type(bits) name() const;                                     \ 
+        public:"                                                                            \
+    SENF_PARSER_PRIVATE_BITFIELD_RO(name,bits,type)="                                       \
+        protected:                                                                          \ 
+            senf::ParseField_##type(bits)::value_type name() const;                         \
+        public:"                                                                            \
+    SENF_PARSER_VECTOR(name,size,elt_type)="                                                \
+        senf::VectorParser<elt_type> name() const;                                          \
+        typedef senf::VectorParser<elt_type> name##_t;"                                     \
+    SENF_PARSER_SKIP(x)=                                                                    \
+    SENF_PARSER_SKIP_BITS(x)=                                                               \
+    SENF_PARSER_GOTO(x)=                                                                    \
+    SENF_PARSER_GOTO_OFFSET(x)=                                                             \
+    SENF_PARSER_LABEL(x)=                                                                   \
+    SENF_PARSER_INIT()="                                                                    \
+        void init()"                                                                        \
+    SENF_PARSER_FINALIZE(name)=                                                             \
+    ParseField_unsigned(b)="                                                                \
+        UIntFieldParser<?,?+b>"                                                             \
+    ParseField_signed(b)="                                                                  \
+        IntFieldParser<?,?+b>"                                                              \
+    ParseField_bool(b)="                                                                    \
+        FlagParser<?>"                                                                      \
+    SENF_PARSER_ARRAY(name,elt_type,size)="                                                 \
+        senf::Parse_Array<size,elt_type> name() const"                                      \
+    SENF_PARSER_LIST_B(name,elt_type,size_type)="                                           \
+        senf::Parse_ListB<elt_type,size_type>::parser name() const"                         \
+    SENF_PARSER_LIST_N(name,elt_type,size_type)="                                           \
+        senf::Parse_ListN<elt_type,size_type>::parser name() const"                         \
+    SENF_PARSER_VARIANT(name,chooser,types)="                                               \
+        senf::Parse_Variant_Direct<chooser##_t,?,types>::parser name() const"               \
+    SENF_PARSER_PRIVATE_VARIANT(name,chooser,types)="                                       \
+        private:                                                                            \
+            senf::Parse_Variant_Direct<chooser##_t,?,types>::parser name() const;           \
+        public:"                                                                            \
+    SENF_PARSER_VEC_N(name,elt_type,size_type)="                                            \
+        senf::Parse_VectorN<elt_type,size_type> name() const"                               \
+    SENF_LOG_CLASS_AREA()=                                                                  \
+    SENF_LOG_DEFAULT_AREA(area)=                                                            \
+    SENF_LOG_DEFAULT_STREAM(stream)=                                                        \
+    BOOST_PP_ITERATE()=                                                                     \
+    BOOST_PARAMETER_KEYWORD(ns,name)="                                                      \
+        unspecified_keyword_type name;"
 
 EXPAND_AS_DEFINED      = prefix_ \
                          SENF_LOG_DEF_STREAM \