archived
/
php-armadillo
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug fix and code reformat

This commit is contained in:
CismonX 2019-07-24 01:21:58 +08:00
parent 38aab4343a
commit 1c3d64740e
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/dense.hh
View File

@ -38,8 +38,10 @@ namespace php_arma
zend_always_inline
static bool compare_op(zval *zv1, zval *zv2, zval *return_value, F&& func)
{
if (Z_OBJCE_P(zv1) != Z_OBJCE_P(zv2)) {
ex_bad_type(zval_get_type_name(zv1), zval_get_type_name(zv2));
if (UNEXPECTED(Z_TYPE_P(zv1) != IS_OBJECT) ||
UNEXPECTED(Z_TYPE_P(zv2) != IS_OBJECT) ||
UNEXPECTED(Z_OBJCE_P(zv1) != Z_OBJCE_P(zv2))) {
throw_exception_ex(zend_ce_type_error, "bad comparison, object types should be the same");
return false;
}
@ -88,7 +90,7 @@ namespace php_arma
zend_always_inline
static bool equals(zval *zv1, zval *zv2, zval *retval)
{
return compare_op<true>(zv1, zv2, retval, [] (auto v1, auto v2) {
return compare_op<true>(zv1, zv2, retval, [](auto v1, auto v2) {
return *v1 == *v2;
});
}
@ -96,7 +98,7 @@ namespace php_arma
zend_always_inline
static bool not_equals(zval *zv1, zval *zv2, zval *retval)
{
return compare_op<true>(zv1, zv2, retval, [] (auto v1, auto v2) {
return compare_op<true>(zv1, zv2, retval, [](auto v1, auto v2) {
return *v1 != *v2;
});
}
@ -104,7 +106,7 @@ namespace php_arma
zend_always_inline
static bool greater_than(zval *zv1, zval *zv2, zval *retval)
{
return compare_op<false>(zv1, zv2, retval, [] (auto v1, auto v2) {
return compare_op<false>(zv1, zv2, retval, [](auto v1, auto v2) {
return *v1 > *v2;
});
}
@ -112,7 +114,7 @@ namespace php_arma
zend_always_inline
static bool smaller_than(zval *zv1, zval *zv2, zval *retval)
{
return compare_op<false>(zv1, zv2, retval, [] (auto v1, auto v2) {
return compare_op<false>(zv1, zv2, retval, [](auto v1, auto v2) {
return *v1 < *v2;
});
}
@ -120,7 +122,7 @@ namespace php_arma
zend_always_inline
static bool not_greater_than(zval *zv1, zval *zv2, zval *retval)
{
return compare_op<false>(zv1, zv2, retval, [] (auto v1, auto v2) {
return compare_op<false>(zv1, zv2, retval, [](auto v1, auto v2) {
return *v1 <= *v2;
});
}
@ -128,7 +130,7 @@ namespace php_arma
zend_always_inline
static bool not_smaller_than(zval *zv1, zval *zv2, zval *retval)
{
return compare_op<false>(zv1, zv2, retval, [] (auto v1, auto v2) {
return compare_op<false>(zv1, zv2, retval, [](auto v1, auto v2) {
return *v1 >= *v2;
});
}

2
src/operators.cc
View File

@ -19,7 +19,7 @@
#endif
#define PHP_ARMA_OP_HANDLER_FUNC \
[] (auto zv1, auto zv2, auto rv, auto ce)
[](auto zv1, auto zv2, auto rv, auto ce)
namespace php_arma
{