cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1150cce0bf306958ab2b7ae560f26700fd35f38c
commit 1150cce0bf306958ab2b7ae560f26700fd35f38c Author: Cedric BAIL <[email protected]> Date: Tue Jan 22 11:59:23 2019 +0000 eina: add Eina_Value helper that convert efficiently to a target native C type. Reviewed-by: SangHyeon Jade Lee <[email protected]> Differential Revision: https://phab.enlightenment.org/D7650 --- doc/Doxyfile.in | 4 +-- src/lib/eina/eina_inline_value_util.x | 59 +++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 970156898b..e52f7a2807 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -228,7 +228,7 @@ OPTIMIZE_OUTPUT_VHDL = NO # (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions # you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. -EXTENSION_MAPPING = +EXTENSION_MAPPING = x=C # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want # to include (a tag file for) the STL sources as input, then you should @@ -1457,7 +1457,7 @@ PREDEFINED = EINA_MAGIC_DEBUG \ # The macro definition that is found in the sources will be used. # Use the PREDEFINED tag if you want to use a different macro definition that overrules the definition found in the source code. -EXPAND_AS_DEFINED = +EXPAND_AS_DEFINED = EINA_VALUE_CONVERT # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then # doxygen's preprocessor will remove all references to function-like macros diff --git a/src/lib/eina/eina_inline_value_util.x b/src/lib/eina/eina_inline_value_util.x index f755b4bf1c..5dc2a9b8df 100644 --- a/src/lib/eina/eina_inline_value_util.x +++ b/src/lib/eina/eina_inline_value_util.x @@ -16,6 +16,10 @@ * if not, see <http://www.gnu.org/licenses/>. */ +/** + * @addtogroup Eina_Value_Value_group + * @{ + */ #ifndef EINA_INLINE_VALUE_UTIL_X_ #define EINA_INLINE_VALUE_UTIL_X_ @@ -977,6 +981,57 @@ eina_value_error_get(const Eina_Value *v, Eina_Error *err) return EINA_FALSE; } +/// @brief For internal use only. +/// @hideinitializer +#define EINA_VALUE_CONVERT(Compress_Type, Uppercase_Compress_Type, Type) \ +/** + @brief Check value type and convert contents. + @param v The value to check type and convert contents. + @param c Where to store the value contents. + @return #EINA_TRUE if type matches and fetched contents, + #EINA_FALSE on different type or failures. + @since 1.22 + */ \ +static inline Eina_Bool \ +eina_value_##Compress_Type##_convert(const Eina_Value *v, Type *c) \ +{ \ + Eina_Value dst = EINA_VALUE_EMPTY; \ + Eina_Bool r = EINA_FALSE; \ + \ + EINA_SAFETY_ON_NULL_RETURN_VAL(c, EINA_FALSE); \ + EINA_SAFETY_ON_NULL_RETURN_VAL(v, EINA_FALSE); \ + \ + /* Try no conversion first */ \ + if (eina_value_##Compress_Type##_get(v, c)) return EINA_TRUE; \ + \ + if (!eina_value_setup(&dst, EINA_VALUE_TYPE_##Uppercase_Compress_Type)) return EINA_FALSE; \ + if (!eina_value_convert(v, &dst)) goto on_error; \ + if (!eina_value_##Compress_Type##_get(&dst, c)) goto on_error; \ + r = EINA_TRUE; \ + \ + on_error: \ + eina_value_flush(&dst); \ + return r; \ +} + +EINA_VALUE_CONVERT(uchar, UCHAR, unsigned char); +EINA_VALUE_CONVERT(ushort, USHORT, unsigned short); +EINA_VALUE_CONVERT(uint, UINT, unsigned int); +EINA_VALUE_CONVERT(ulong, ULONG, unsigned long); +EINA_VALUE_CONVERT(uint64, UINT64, uint64_t); +EINA_VALUE_CONVERT(char, CHAR, char); +EINA_VALUE_CONVERT(short, SHORT, short); +EINA_VALUE_CONVERT(int, INT, int); +EINA_VALUE_CONVERT(long, LONG, long); +EINA_VALUE_CONVERT(int64, INT64, int64_t); +EINA_VALUE_CONVERT(float, FLOAT, float); +EINA_VALUE_CONVERT(double, DOUBLE, double); +EINA_VALUE_CONVERT(bool, BOOL, Eina_Bool); +EINA_VALUE_CONVERT(string, STRING, const char *); +EINA_VALUE_CONVERT(stringshare, STRINGSHARE, const char *); +EINA_VALUE_CONVERT(time, TIMESTAMP, time_t); +EINA_VALUE_CONVERT(error, ERROR, Eina_Error); + /** * @brief Create a new #Eina_Value containing the passed parameter * @param val The value to use @@ -1058,3 +1113,7 @@ eina_value_string_copy(const Eina_Value *val, char **str) } #endif + +/** + * @} + */ --
