Packets: Some more porting of old parsers to the new parse helpers

[senf.git] / doclib / Doxyfile.global

diff --git a/doclib/Doxyfile.global b/doclib/Doxyfile.global
index c91d4a1..a9a4c4b 100644 (file)
--- a/doclib/Doxyfile.global
+++ b/doclib/Doxyfile.global
@@ -29,23 +29,26 @@ MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = YES
 PREDEFINED             = DOXYGEN \
                          "SENF_PPI_MODULE(x)=" \
+                         "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_FIELD_AFTER(name,type,prev)=type name() const" \
-                         "SENF_PARSER_FIELD_AFTER_RO(name,type,prev)=type::value_type name() const" \
-                         "SENF_PARSER_BITFIELD(name, bits, type)=senf::ParseField_ ## type name() const" \
-                         "SENF_PARSER_BITFIELD_RO(name, bits, type)=type ## _ ## bits name() const" \
-                         "SENF_PARSER_INHERIT(name)=" \
-                         "SENF_PARSER_FINALIZE(name)=" \
-                         "SENF_PARSER_INIT()=void init()" \
+                         "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)=" \
-                         "ParseField_unsigned=Parse_UIntField" \
-                         "ParseField_signed=Parse_IntField" \
-                         "ParseField_bool=Parse_Flag"
+                         "SENF_PARSER_INIT()=void init()" \
+                         "SENF_PARSER_FINALIZE(name)=" \
+                         "ParseField_unsigned(b)=Parse_UIntField<?,?+b>" \
+                         "ParseField_signed(b)=Parse_IntField<?,?+b>" \
+                         "ParseField_bool(b)=Parse_Flag<?>"
 EXPAND_AS_DEFINED      = prefix_
 
 HTML_HEADER            = "$(TOPDIR)/doclib/doxy-header.html"