X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FParseHelpers.ih;h=b55c9a439d1937a2f628a393add14298d10d26a5;hb=82ad2ed94c12c3e53097fef92978de8c28239fab;hp=4b381e169d3f07f535561a623c8a56341dd4002a;hpb=3f8c584bbd5848888437d31c37a43eeac60c98f4;p=senf.git diff --git a/Packets/ParseHelpers.ih b/Packets/ParseHelpers.ih index 4b381e1..b55c9a4 100644 --- a/Packets/ParseHelpers.ih +++ b/Packets/ParseHelpers.ih @@ -81,13 +81,18 @@ public: # # /////////////////////////////////////////////////////////////////////////// -# // SENF_PARSE_FIELD_* +# // SENF_PARSER_FIELD* +# // SENF_PARSER_P_FIELD_* # -# define SENF_PARSE_FIELD_var(name, type) SENF_PARSER_FIELD_I(name, type, var, rw, public) -# define SENF_PARSE_FIELD_RO_var(name, type) SENF_PARSER_FIELD_I(name, type, var, ro, public) +# define SENF_PARSER_FIELD_var(name, type) SENF_PARSER_FIELD_I(name, type, var, rw, public) +# define SENF_PARSER_FIELD_RO_var(name, type) SENF_PARSER_FIELD_I(name, type, var, ro, public) +# define SENF_PARSER_FIELD_fix(name, type) SENF_PARSER_FIELD_I(name, type, fix, rw, public) +# define SENF_PARSER_FIELD_RO_fix(name, type) SENF_PARSER_FIELD_I(name, type, fix, ro, public) # -# define SENF_PARSE_FIELD_fix(name, type) SENF_PARSER_FIELD_I(name, type, fix, rw, public) -# define SENF_PARSE_FIELD_RO_fix(name, type) SENF_PARSER_FIELD_I(name, type, fix, ro, public) +# define SENF_PARSER_P_FIELD_var(name, type) SENF_PARSER_FIELD_I(name, type, var, rw, private) +# define SENF_PARSER_P_FIELD_RO_var(name, type) SENF_PARSER_FIELD_I(name, type, var, ro, private) +# define SENF_PARSER_P_FIELD_fix(name, type) SENF_PARSER_FIELD_I(name, type, fix, rw, private) +# define SENF_PARSER_P_FIELD_RO_fix(name, type) SENF_PARSER_FIELD_I(name, type, fix, ro, private) # # define SENF_PARSER_FIELD_I(name, type, ofstype, rwtype, access) \ access: \ @@ -100,7 +105,7 @@ BOOST_PP_CAT(SENF_PARSER_I_SIZE_, ofstype) (name, type), \ BOOST_PP_CAT(SENF_PARSER_I_INITBYTES_, ofstype) (name, type), \ access ) \ - BOOST_PP_CAT(SENF_PARSER_I_FIELD_VAL_, rwtype) (name, type, ofstype, access) \ + BOOST_PP_CAT(SENF_PARSER_I_FIELD_VAL_, rwtype) (name, type, access) \ public: # # //////////////////////////////////////// @@ -176,28 +181,22 @@ # //////////////////////////////////////// # // SENF_PARSER_I_FIELD_VAL_* # -# define SENF_PARSER_I_MAYBECALL_var() () -# define SENF_PARSER_I_MAYBECALL_fix() -# -# define SENF_PARSER_I_FIELD_VAL_rw(name, type, ofstype, access) \ +# define SENF_PARSER_I_FIELD_VAL_rw(name, type, access) \ BOOST_PP_CAT(name, _t) name() const { \ - return parse( \ - BOOST_PP_CAT(name,_offset) BOOST_PP_CAT(SENF_PARSER_I_MAYBECALL_, ofstype)()); \ + return parse( SENF_PARSER_OFFSET(name) ); \ } # -# define SENF_PARSER_I_FIELD_VAL_ro(name, type, ofstype, access) \ +# define SENF_PARSER_I_FIELD_VAL_ro(name, type, access) \ BOOST_PP_CAT(name, _t)::value_type name() const { \ - return parse( \ - BOOST_PP_CAT(name,_offset) BOOST_PP_CAT(SENF_PARSER_I_MAYBECALL_, ofstype)()) \ - .value(); \ + return parse( SENF_PARSER_OFFSET(name) ).value(); \ } # # /////////////////////////////////////////////////////////////////////////// -# // SENF_PARSE_CUSTOM_FIELD_* +# // SENF_PARSER_CUSTOM_FIELD_* # -# define SENF_PARSE_CUSTOM_FIELD_var(name, type, size, isize) \ +# define SENF_PARSER_CUSTOM_FIELD_var(name, type, size, isize) \ SENF_PARSER_CUSTOM_FIELD_I(name, type, size, isize, var) -# define SENF_PARSE_CUSTOM_FIELD_fix(name, type, size) \ +# define SENF_PARSER_CUSTOM_FIELD_fix(name, type, size) \ SENF_PARSER_CUSTOM_FIELD_I(name, type, size, size, fix) # # define SENF_PARSER_CUSTOM_FIELD_I(name, type, size, isize, ofstype) \ @@ -209,18 +208,27 @@ BOOST_PP_CAT(name, _t) name() const # # /////////////////////////////////////////////////////////////////////////// -# // SENF_PARSE_BITFIELD_* +# // SENF_PARSER_BITFIELD_* +# // SENF_PARSER_P_BITFIELD_* # -# define SENF_PARSE_BITFIELD_var(name, bits, type) \ +# define SENF_PARSER_BITFIELD_var(name, bits, type) \ SENF_PARSER_BITFIELD_I(name, bits, type, var, rw, public) -# define SENF_PARSE_BITFIELD_RO_var(name, bits, type) \ +# define SENF_PARSER_BITFIELD_RO_var(name, bits, type) \ SENF_PARSER_BITFIELD_I(name, bits, type, var, ro, public) -# -# define SENF_PARSE_BITFIELD_fix(name, bits, type) \ +# define SENF_PARSER_BITFIELD_fix(name, bits, type) \ SENF_PARSER_BITFIELD_I(name, bits, type, fix, rw, public) -# define SENF_PARSE_BITFIELD_RO_fix(name, bits, type) \ +# define SENF_PARSER_BITFIELD_RO_fix(name, bits, type) \ SENF_PARSER_BITFIELD_I(name, bits, type, fix, ro, public) # +# define SENF_PARSER_P_BITFIELD_var(name, bits, type) \ + SENF_PARSER_BITFIELD_I(name, bits, type, var, rw, private) +# define SENF_PARSER_P_BITFIELD_RO_var(name, bits, type) \ + SENF_PARSER_BITFIELD_I(name, bits, type, var, ro, private) +# define SENF_PARSER_P_BITFIELD_fix(name, bits, type) \ + SENF_PARSER_BITFIELD_I(name, bits, type, fix, rw, private) +# define SENF_PARSER_P_BITFIELD_RO_fix(name, bits, type) \ + SENF_PARSER_BITFIELD_I(name, bits, type, fix, ro, private) +# # //////////////////////////////////////// # // SENF_PARSER_BITFIELD_I # @@ -250,7 +258,7 @@ private: \ SENF_MPL_SLOT_SET(bitfield_size, BOOST_PP_CAT(name, _t)::fixed_bytes); \ access: \ - BOOST_PP_CAT(SENF_PARSER_I_FIELD_VAL_, rwtype) (name, type, ofstype, access) \ + BOOST_PP_CAT(SENF_PARSER_I_FIELD_VAL_, rwtype) (name, type, access) \ public: # # //////////////////////////////////////// @@ -274,30 +282,6 @@ SENF_MPL_SLOT_SET(bitfield_size, 0); # # /////////////////////////////////////////////////////////////////////////// -# // SENF_PARSER_FINALIZE_* -# -# define SENF_PARSER_FINALIZE_var(name) \ - SENF_PARSER_FINALIZE_GENERIC(name) \ - size_type bytes() const { \ - return field_offset_(static_cast*>(0)); \ - } \ - static size_type const init_bytes = SENF_MPL_SLOT_GET(init_bytes) -# -# define SENF_PARSER_FINALIZE_fix(name) \ - SENF_PARSER_FINALIZE_GENERIC(name) \ - static size_type const fixed_bytes = SENF_MPL_SLOT_GET(offset); -# -# define SENF_PARSER_FINALIZE_GENERIC(name) \ - void defaultInit() { \ - init_chain(static_cast*>(0)); \ - } \ - name(data_iterator i, state_type s) : parser_base_type(i,s) {} \ - private: \ - template void init(T) { defaultInit(); } \ - public: \ - void init() { init(0); } -# -# /////////////////////////////////////////////////////////////////////////// # // SENF_PARSER_SKIP_* # # define SENF_PARSER_SKIP_var(bytes, ibytes) \ @@ -316,6 +300,15 @@ public: # # /////////////////////////////////////////////////////////////////////////// +# // SENF_PARSER_SKIP_BITS_* +# +# define SENF_PARSER_SKIP_BITS_var(bits) SENF_PARSER_I_SKIP_BITS(bits, var) +# define SENF_PARSER_SKIP_BITS_fix(bits) SENF_PARSER_I_SKIP_BITS(bits, fix) +# +# define SENF_PARSER_I_SKIP_BITS(bits, ofstype) \ + SENF_MPL_SLOT_SET(bit, SENF_MPL_SLOT_GET(bit) + bits) +# +# /////////////////////////////////////////////////////////////////////////// # // SENF_PARSER_GOTO_* # # define SENF_PARSER_GOTO_var(name) \ @@ -341,16 +334,16 @@ SENF_PARSER_I_BITFIELD_RESET() \ SENF_PARSER_I_FIELD_INTRO(name, void, private) \ SENF_PARSER_I_FIELD_INIT_ro(name, void, private) \ - BOOST_PP_CAT( SENF_PARSE_I_GOTO_SET_OFS_, ofstype ) (name, offset, initsize) \ + BOOST_PP_CAT( SENF_PARSER_I_GOTO_SET_OFS_, ofstype ) (name, offset, initsize) \ public: # -# define SENF_PARSE_I_GOTO_SET_OFS_var(name, offs, initsize) \ +# define SENF_PARSER_I_GOTO_SET_OFS_var(name, offs, initsize) \ size_type field_offset_(senf::mpl::rv*) const { \ return offs; \ } \ SENF_MPL_SLOT_SET(init_bytes, initsize); # -# define SENF_PARSE_I_GOTO_SET_OFS_fix(name, offs, initsize) \ +# define SENF_PARSER_I_GOTO_SET_OFS_fix(name, offs, initsize) \ SENF_MPL_SLOT_SET(offset, offs); # # /////////////////////////////////////////////////////////////////////////// @@ -368,6 +361,48 @@ BOOST_PP_CAT(SENF_PARSER_I_ADVANCE_OFS_, ofstype) (name, void, 0, 0,access) \ public: # +# /////////////////////////////////////////////////////////////////////////// +# // SENF_PARSER_OFFSET_* +# +# define SENF_PARSER_OFFSET_fix(name) BOOST_PP_CAT(name, _offset) +# define SENF_PARSER_OFFSET_var(name) BOOST_PP_CAT(name, _offset)() +# +# /////////////////////////////////////////////////////////////////////////// +# // SENF_PARSER_FIXED_OFFSET_* +# +# define SENF_PARSER_FIXED_OFFSET_fix(name) BOOST_PP_CAT(name, _offset) +# define SENF_PARSER_FIXED_OFFSET_var(name) BOOST_PP_CAT(name, _init_bytes) +# +# /////////////////////////////////////////////////////////////////////////// +# // SENF_PARSER_FIXED_OFFSET_* +# +# define SENF_PARSER_CURRENT_FIXED_OFFSET_fix() SENF_MPL_SLOT_GET(offset) +# define SENF_PARSER_CURRENT_FIXED_OFFSET_var() SENF_MPL_SLOT_GET(init_bytes) +# +# /////////////////////////////////////////////////////////////////////////// +# // SENF_PARSER_FINALIZE_* +# +# define SENF_PARSER_FINALIZE_var(name) \ + SENF_PARSER_FINALIZE_GENERIC(name) \ + size_type bytes() const { \ + return field_offset_(static_cast*>(0)); \ + } \ + static size_type const init_bytes = SENF_MPL_SLOT_GET(init_bytes) +# +# define SENF_PARSER_FINALIZE_fix(name) \ + SENF_PARSER_FINALIZE_GENERIC(name) \ + static size_type const fixed_bytes = SENF_MPL_SLOT_GET(offset); +# +# define SENF_PARSER_FINALIZE_GENERIC(name) \ + void defaultInit() { \ + init_chain(static_cast*>(0)); \ + } \ + name(data_iterator i, state_type s) : parser_base_type(i,s) {} \ + private: \ + template void init(T) { defaultInit(); } \ + public: \ + void init() { init(0); } +# # ////////////////////////////////ih.e/////////////////////////////////////// # endif #