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

fix and add test cases for cpySize().

Browse Source
This commit is contained in:
CismonX 2019-09-21 19:45:08 +08:00
parent cb593e3a39
commit aeba61a787
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/resizable.cc
View File

@ -41,16 +41,18 @@ namespace php_arma
Z_PARAM_ZVAL(other)
ZEND_PARSE_PARAMETERS_END();
if (UNEXPECTED(Z_TYPE_P(other) != IS_OBJECT || instanceof_function(Z_OBJCE_P(other), base_ce))) {
if (UNEXPECTED(Z_TYPE_P(other) != IS_OBJECT || !instanceof_function(Z_OBJCE_P(other), base_ce))) {
ex_bad_type(ZSTR_VAL(base_ce->name), zval_get_type_name(other));
return;
}
std::variant<ds::base*, ds::subview*, ds::diagview*> other_native_v;
if (instanceof_function(Z_OBJCE_P(other), diagonal_ce)) {
other_native_v = to_native_object<ds::diagview>(Z_OBJ_P(other));
} else if (instanceof_function(Z_OBJCE_P(other), subview_ce)) {
other_native_v = to_native_object<ds::subview>(Z_OBJ_P(other));
if (instanceof_function(Z_OBJCE_P(other), subview_ce)) {
if (instanceof_function(Z_OBJCE_P(other), diagonal_ce)) {
other_native_v = to_native_object<ds::diagview>(Z_OBJ_P(other));
} else {
other_native_v = to_native_object<ds::subview>(Z_OBJ_P(other));
}
} else {
other_native_v = to_native_object<ds::base>(Z_OBJ_P(other));
}

25
tests/020-copy-size.phpt Normal file
View File

@ -0,0 +1,25 @@
--TEST--
Test for method `copySize()`
--SKIPIF--
<?php
require_once 'includes/loaded.php';
is_php_arma_loaded();
?>
--FILE--
<?php
require_once 'includes/assert.php';
$imat = Arma\IMat::init(3, 3);
$dmat = Arma\DMat::init(2, 5);
$dmat->copySize($dmat->submat(0, 1, 1, 3));
$imat->copySize($imat->diag());
batch_assert('method `copySize()`',
[$dmat->nRows(), 2],
[$dmat->nCols(), 3],
[$imat->nRows(), 3],
[$imat->nCols(), 1]
);
?>
--EXPECT--