zval passthru

[m6w6/ext-psi] / m4 / psi_type.m4

diff --git a/m4/psi_type.m4 b/m4/psi_type.m4
index 2936ef1e7eff07b047aa0862f6510bd171cdc8cb..b635e173c230e422819ca90f42137fac21c72fd4 100644 (file)
--- a/m4/psi_type.m4
+++ b/m4/psi_type.m4
@@ -4,6 +4,10 @@ psi_add_type() {
        cat >>$PSI_TYPES <<<"   $1, "
 }
 
+psi_add_stdtype() {
+       cat >>$PSI_STDTYPES <<<"        $1, "
+}
+
 # psi_type_pair(type, size)
 # Output a PSI_T_<TYPE>, \"<TYPENAME>\" tuple.
 # Uses stdint types when possible.
@@ -19,6 +23,9 @@ psi_type_pair() {
        struct*)
                echo "PSI_T_STRUCT, \"$2\""
                ;;
+       union*)
+               echo "PSI_T_UNION, \"$2\""
+               ;;
        void)
                echo "PSI_T_VOID, \"void\""
                ;;
@@ -48,11 +55,30 @@ AC_DEFUN(PSI_TYPE, [
        esac
        if test "$2" && PSI_SH_TEST_SIZEOF($1); then
                AS_TR_SH(psi_basic_type_$1)=$psi_basic_type
-               psi_add_type "{`psi_type_pair $psi_basic_type $AS_TR_SH([ac_cv_sizeof_]$1)`, \"$1\"}"
-               #cat >>$PSI_TYPES <<<"{`psi_type_pair $psi_basic_type $AS_TR_SH([ac_cv_sizeof_]$1)`, \"$1\"}, "
+               psi_add_type "{`psi_type_pair $psi_basic_type PSI_SH_SIZEOF($1)`, \"$1\"}"
        fi
 ])
 
+AC_DEFUN(PSI_STDTYPE, [
+       ifdef(AS_TR_CPP(AC_TYPE_$1), AS_TR_CPP(AC_TYPE_$1))
+       PSI_CHECK_SIZEOF($1)
+       if PSI_SH_TEST_SIZEOF($1); then
+               m4_case([$1],
+               [float],[psi_add_stdtype "{PSI_T_FLOAT, \"float\", NULL}"],
+               [double],[psi_add_stdtype "{PSI_T_DOUBLE, \"double\", NULL}"],
+               [long double],[psi_add_stdtype "{PSI_T_LONG_DOUBLE, \"long double\", NULL}"],
+               [
+                       AX_CHECK_SIGN($1, psi_basic_type=int, psi_basic_type=uint, PSI_INCLUDES)
+                       AS_TR_SH(psi_basic_type_$1)=$psi_basic_type
+                       psi_add_stdtype "{`psi_type_pair $psi_basic_type PSI_SH_SIZEOF($1)`, \"$1\"}"
+               ])
+       fi
+])
+
+dnl PSI_SH_BASIC_TYPE(type)
+dnl Expand to the basic type (int/uint) of a distinct type
+AC_DEFUN(PSI_SH_BASIC_TYPE, [$AS_TR_SH([psi_basic_type_]$1)])
+
 dnl PSI_OPAQUE_TYPE(type name)
 dnl Checks a type for being a scalar, a struct or a pointer type.
 dnl Calls AC_TYPE_<TYPE> (if defined) and PSI_CHECK_SIZEOF.
@@ -63,7 +89,7 @@ AC_DEFUN(PSI_OPAQUE_TYPE, [
        PSI_CHECK_SIZEOF($1)
        if PSI_SH_TEST_SIZEOF($1); then
                psi_type_class=
-               AC_CACHE_CHECK(type class of $1, AS_TR_SH([psi_cv_type_class_]$1), [
+               AC_CACHE_CHECK(kind of $1, AS_TR_SH([psi_cv_type_class_]$1), [
                        AC_TRY_COMPILE(PSI_INCLUDES, [char test@<:@($1)1@:>@;], [
                                psi_type_class=scalar
                        ], [
@@ -82,18 +108,16 @@ AC_DEFUN(PSI_OPAQUE_TYPE, [
                case "$AS_TR_SH([psi_cv_type_class_]$1)" in
                scalar)
                        AX_CHECK_SIGN($1, [psi_basic_type=int], [psi_basic_type=uint], PSI_INCLUDES)
-                       psi_add_type "{`psi_type_pair $psi_basic_type $AS_TR_SH([ac_cv_sizeof_]$1)`, \"$1\"}"
-                       #cat >>$PSI_TYPES <<<"  {`psi_type_pair $psi_basic_type $AS_TR_SH([ac_cv_sizeof_]$1)`, \"$1\"}, "
+                       psi_add_type "{`psi_type_pair $psi_basic_type PSI_SH_SIZEOF($1)`, \"$1\"}"
                        ;;
                struct)
                        PSI_STRUCT($1)
                        ;;
                pointer*)
                        psi_add_type "{PSI_T_POINTER, \"void\", \"$1\"}"
-                       #cat >>$PSI_TYPES <<<"  {PSI_T_POINTER, \"void\", \"$1\"}, "
                        ;;
                *)
-                       AC_MSG_WARN(could not detect type class of $1)
+                       AC_MSG_WARN(could not detect kind of $1)
                        ;;
                esac
        fi
@@ -141,6 +165,7 @@ dnl FIXME: There is also psi_type_pair()?
 AC_DEFUN(PSI_TYPE_PAIR, [m4_case(m4_bregexp([$1], [^\w+], [\&]),
        [void], [PSI_T_VOID, \"void\"],
        [struct], [PSI_T_STRUCT, \"m4_bregexp([$1], [^struct \(\w+\)], [\1])\"],
+       [union], [PSI_T_UNION, \"m4_bregexp([$1], [^union \(\w+\)], [\1])\"],
        [PSI_T_NAME, \"m4_bregexp([$1], [^\(\w+ \)*\w+], [\&])\"])])
 
 dnl PSI_CHECK_STD_TYPES()
@@ -172,40 +197,46 @@ AC_DEFUN(PSI_CHECK_STD_TYPES, [
        AC_TYPE_UINT64_T
        PSI_CHECK_SIZEOF(uint64_t)
        AC_CHECK_ALIGNOF(uint64_t)
+       
+       PSI_CHECK_SIZEOF(void *)
+       AC_CHECK_ALIGNOF(void *)
 
-       PSI_TYPE(float)
+       PSI_STDTYPE(float)
        AC_CHECK_ALIGNOF(float)
-       PSI_TYPE(double)
+       PSI_STDTYPE(double)
        AC_CHECK_ALIGNOF(double)
-       PSI_TYPE(long double)
+       PSI_STDTYPE(long double)
        AC_CHECK_ALIGNOF(long double)
-       PSI_TYPE(void *)
-       AC_CHECK_ALIGNOF(void *)
 
-       PSI_TYPE(char, int)
-       PSI_TYPE(signed char, int)
-       PSI_TYPE(unsigned char, uint)
-       PSI_TYPE(short, int)
-       PSI_TYPE(short int, int)
-       PSI_TYPE(signed short, int)
-       PSI_TYPE(signed short int, int)
-       PSI_TYPE(unsigned short, uint)
-       PSI_TYPE(unsigned short int, uint)
-       PSI_TYPE(int, int)
-       PSI_TYPE(signed int, int)
-       PSI_TYPE(signed, int)
-       PSI_TYPE(unsigned int, uint)
-       PSI_TYPE(unsigned, uint)
-       PSI_TYPE(long, int)
-       PSI_TYPE(long int, int)
-       PSI_TYPE(signed long int, int)
-       PSI_TYPE(unsigned long, uint)
-       PSI_TYPE(unsigned long int, uint)
-       PSI_TYPE(long long, int)
-       PSI_TYPE(signed long long, int)
-       PSI_TYPE(signed long long int, int)
-       PSI_TYPE(unsigned long long, uint)
-       PSI_TYPE(unsigned long long int, uint)
+       PSI_STDTYPE(char, int)
+       AC_CHECK_ALIGNOF(char)
+       PSI_STDTYPE(signed char, int)
+       PSI_STDTYPE(unsigned char, uint)
+       PSI_STDTYPE(short, int)
+       AC_CHECK_ALIGNOF(short)
+       PSI_STDTYPE(short int, int)
+       PSI_STDTYPE(signed short, int)
+       PSI_STDTYPE(signed short int, int)
+       PSI_STDTYPE(unsigned short, uint)
+       PSI_STDTYPE(unsigned short int, uint)
+       PSI_STDTYPE(int, int)
+       AC_CHECK_ALIGNOF(int)
+       PSI_STDTYPE(signed int, int)
+       PSI_STDTYPE(signed, int)
+       PSI_STDTYPE(unsigned int, uint)
+       PSI_STDTYPE(unsigned, uint)
+       PSI_STDTYPE(long, int)
+       AC_CHECK_ALIGNOF(long)
+       PSI_STDTYPE(long int, int)
+       PSI_STDTYPE(signed long int, int)
+       PSI_STDTYPE(unsigned long, uint)
+       PSI_STDTYPE(unsigned long int, uint)
+       PSI_STDTYPE(long long, int)
+       AC_CHECK_ALIGNOF(long long)
+       PSI_STDTYPE(signed long long, int)
+       PSI_STDTYPE(signed long long int, int)
+       PSI_STDTYPE(unsigned long long, uint)
+       PSI_STDTYPE(unsigned long long int, uint)
        dnl this must come after the check fo "unsigned long long int"; autoconf, wth?
-       PSI_TYPE(long long int, int)
+       PSI_STDTYPE(long long int, int)
 ])