# psi_add_type(type triplet)
-# Add a pre-defined type to $PSI_TYPES.
+# Add a pre-defined type to $PSI_TYPES_H.
psi_add_type() {
- cat >>$PSI_TYPES <<EOF
- $1,
-EOF
+ PSI_TYPES="$PSI_TYPES
+ $1,"
}
psi_add_stdtype() {
- cat >>$PSI_STDTYPES <<EOF
- $1,
-EOF
+ PSI_STDTYPES="$PSI_STDTYPES
+ $1,"
}
# psi_type_pair(type, size)
psi_type_pair() {
local psi_type_name=`printf "%s" "$1" | tr -cd A-Za-z0-9_`
local psi_type_lower=`printf "%s" "$1" | tr A-Z a-z`
+ while expr "$psi_type_lower" : const >/dev/null; do
+ psi_type_lower=`printf "%s" "$psi_type_lower" | cut -d " " -f2-`
+ done
case $psi_type_lower in
int*|uint*)
local psi_type_upper=`printf "%s" "$psi_type_name" | tr a-z A-Z`
dnl PSI_TYPE(type name, basic type)
dnl Check for a specific type, optionally referring to a basic type.
dnl Calls AC_TYPE_<TYPE> (if defined) and PSI_CHECK_SIZEOF.
-dnl If the basic type is just specified as "int" (in contrast to "sint" or
+dnl If the basic type is just specified as "int" (in contrast to "sint" or
dnl "uint"), AX_CHECK_SIGN is used to discover signedness of the type.
-dnl Defines a pre-defined type in $PSI_TYPES.
+dnl Defines a pre-defined type in $PSI_TYPES_H.
AC_DEFUN(PSI_TYPE, [
ifdef(AS_TR_CPP(AC_TYPE_$1), AS_TR_CPP(AC_TYPE_$1))
PSI_CHECK_SIZEOF($1)
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],
+ m4_case(ifelse(,[$2],[$1],[$2]),
+ [bool],[psi_add_stdtype "{PSI_T_BOOL, \"bool\", NULL}"],
[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}"],
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.
-dnl Defines a pre-defined type in $PSI_TYPES and a pre-defined struct in
+dnl Defines a pre-defined type in $PSI_TYPES_H and a pre-defined struct in
dnl $PSI_STRUCTS if the type is a struct.
AC_DEFUN(PSI_OPAQUE_TYPE, [
ifdef(AS_TR_CPP(AC_TYPE_$1), AS_TR_CPP(AC_TYPE_$1))
dnl psi_add_type "{PSI_T_POINTER, \"void\", \"PSI_VAR_NAME($1)\"}"
AS_TR_SH([ac_cv_sizeof_]PSI_VAR_NAME($1))=PSI_SH_SIZEOF(void *)
PSI_DECL_TYPE([$1], [$2])
- if test "$PHP_DEBUG" = "1"; then
- AC_CHECK_TYPE(PSI_VAR_NAME($1), [], [
- psi_add_macro ["#undef ]PSI_VAR_NAME($1)["]
- psi_add_macro ["typedef ]PSI_VAR_TYPE($1)[ (*]PSI_VAR_NAME($1)[)]$2;"
- ])
- fi
+ AC_CHECK_TYPE(PSI_VAR_NAME($1), [], [
+ psi_add_macro ["#undef ]PSI_VAR_NAME($1)["]
+ psi_add_macro ["typedef ]PSI_VAR_TYPE($1)[ (*]PSI_VAR_NAME($1)[)]$2;"
+ ])
])
dnl PSI_VAR_TYPE(decl arg)
dnl Extracts the type of a decl arg, e.g. dnl unsigned char* buf[16] -> unsigned char*.
AC_DEFUN(PSI_VAR_TYPE, [m4_bregexp([$1], [^\(const \)?\(.*\) \([*]*\)[^ ]+$], [\2\3])])
+dnl PSI_VAR_TYPE_RETURN(decl arg)
+dnl Extracts the type of a decl arg usable for return types, e.g. dnl unsigned char* buf[16] -> unsigned char**.
+AC_DEFUN(PSI_VAR_TYPE_RETURN, [PSI_VAR_TYPE(m4_bpatsubst([$1], [\([^ ]+\) *@<:@[0-9]+@:>@], [* \1]))])
+
dnl PSI_VAR_NAME(decl arg)
dnl Extracts the var name of a decl arg, e.g. unsigned char* buf[16] -> buf.
AC_DEFUN(PSI_VAR_NAME, [m4_bregexp(m4_bregexp([$1], [\([^ ]+\)$], [\1]), [\w+], [\&])])
[PSI_T_NAME, \"m4_bregexp([$1], [^\(\w+ \)*\w+], [\&])\"])])
dnl PSI_CHECK_STD_TYPES()
-dnl Checks for standard ANSI-C and stdint types.
+dnl Checks for standard ANSI-C, stdint and stdbool types.
AC_DEFUN(PSI_CHECK_STD_TYPES, [
- AC_CHECK_HEADERS(stdint.h)
- AC_TYPE_INT8_T
- PSI_CHECK_SIZEOF(int8_t)
- AC_CHECK_ALIGNOF(int8_t)
- AC_TYPE_UINT8_T
- PSI_CHECK_SIZEOF(uint8_t)
- AC_CHECK_ALIGNOF(uint8_t)
- AC_TYPE_INT16_T
- PSI_CHECK_SIZEOF(int16_t)
- AC_CHECK_ALIGNOF(int16_t)
- AC_TYPE_UINT16_T
- PSI_CHECK_SIZEOF(uint16_t)
- AC_CHECK_ALIGNOF(uint16_t)
- AC_TYPE_INT32_T
- PSI_CHECK_SIZEOF(int32_t)
- AC_CHECK_ALIGNOF(int32_t)
- AC_TYPE_UINT32_T
- PSI_CHECK_SIZEOF(uint32_t)
- AC_CHECK_ALIGNOF(uint32_t)
- AC_TYPE_INT64_T
- PSI_CHECK_SIZEOF(int64_t)
- AC_CHECK_ALIGNOF(int64_t)
- AC_TYPE_UINT64_T
- PSI_CHECK_SIZEOF(uint64_t)
- AC_CHECK_ALIGNOF(uint64_t)
-
+ AC_HEADER_STDBOOL
+
PSI_CHECK_SIZEOF(void *)
AC_CHECK_ALIGNOF(void *)
PSI_STDTYPE(long double)
AC_CHECK_ALIGNOF(long double)
+ PSI_STDTYPE(bool)
+ AC_CHECK_ALIGNOF(bool, PSI_INCLUDES)
+
PSI_STDTYPE(char, int)
AC_CHECK_ALIGNOF(char)
PSI_STDTYPE(signed char, int)
PSI_STDTYPE(short int, int)
PSI_STDTYPE(signed short, int)
PSI_STDTYPE(signed short int, int)
+ PSI_STDTYPE(short signed, int)
+ PSI_STDTYPE(short signed int, int)
PSI_STDTYPE(unsigned short, uint)
PSI_STDTYPE(unsigned short int, uint)
+ PSI_STDTYPE(short unsigned, uint)
+ PSI_STDTYPE(short unsigned int, uint)
PSI_STDTYPE(int, int)
AC_CHECK_ALIGNOF(int)
PSI_STDTYPE(signed int, int)
AC_CHECK_ALIGNOF(long)
PSI_STDTYPE(long int, int)
PSI_STDTYPE(signed long int, int)
+ PSI_STDTYPE(long signed int, int)
PSI_STDTYPE(unsigned long, uint)
PSI_STDTYPE(unsigned long int, uint)
+ PSI_STDTYPE(long unsigned, uint)
+ PSI_STDTYPE(long unsigned 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(long signed long, int)
+ PSI_STDTYPE(long signed long int, int)
+ PSI_STDTYPE(long long signed, int)
+ PSI_STDTYPE(long long signed 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_STDTYPE(long unsigned long, uint)
+ PSI_STDTYPE(long unsigned long int, uint)
+ PSI_STDTYPE(long long unsigned, uint)
+ PSI_STDTYPE(long long unsigned int, uint)
+ dnl this must come after the check for "unsigned long long int"; autoconf, wth?
PSI_STDTYPE(long long int, int)
+
+ AC_CHECK_TYPE(__int128, [
+ AC_DEFINE([HAVE_INT128], [1], [ ])
+ AC_CHECK_ALIGNOF(__int128)
+ PSI_STDTYPE(__int128, int)
+ PSI_STDTYPE(signed __int128, int)
+ PSI_STDTYPE(unsigned __int128, uint)
+ ])
+
+ PSI_STDTYPE(_Float32)
+ PSI_STDTYPE(_Float32x)
+ PSI_STDTYPE(_Float64)
+ PSI_STDTYPE(_Float64x)
+ PSI_STDTYPE(_Float128)
])
projects / m6w6 / ext-psi / blobdiff