diff options
Diffstat (limited to 'zend/constantimpl.h')
| -rw-r--r-- | zend/constantimpl.h | 82 |
1 files changed, 42 insertions, 40 deletions
diff --git a/zend/constantimpl.h b/zend/constantimpl.h index 46a16d2..9de8a31 100644 --- a/zend/constantimpl.h +++ b/zend/constantimpl.h @@ -1,8 +1,8 @@ /** * ConstantImpl.h - * + * * Implementation file for the constant class - * + * * @author Emiel Bruijntjes <emiel.bruijntjes@copernica.com> * @copyright 2015 Copernica BV */ @@ -11,7 +11,7 @@ * Set up namespace */ namespace Php { - + /** * Class definition */ @@ -28,7 +28,7 @@ public: // initialize the zval ZVAL_NULL(&_constant.value); } - + /** * Constructor * @param name @@ -39,7 +39,7 @@ public: // initialize the zval ZVAL_BOOL(&_constant.value, value); } - + /** * Constructor * @param name @@ -72,7 +72,7 @@ public: // initialize the zval ZVAL_DOUBLE(&_constant.value, value); } - + /** * Constructor * @param name @@ -82,9 +82,9 @@ public: ConstantImpl(const char *name, const char *value, size_t len) : _name(name) { // initialize the zval - ZVAL_STRINGL(&_constant.value, value, len, 0); + ZVAL_STRINGL(&_constant.value, value, len); } - + /** * Constructor * @param name @@ -93,9 +93,9 @@ public: ConstantImpl(const char *name, const char *value) : _name(name) { // initialize the zval - ZVAL_STRINGL(&_constant.value, value, ::strlen(value), 0); + ZVAL_STRINGL(&_constant.value, value, ::strlen(value)); } - + /** * Constructor * @param name @@ -104,9 +104,9 @@ public: ConstantImpl(const char *name, const std::string &value) : _name(name) { // initialize the zval - ZVAL_STRINGL(&_constant.value, value.c_str(), value.size(), 0); + ZVAL_STRINGL(&_constant.value, value.c_str(), value.size()); } - + /** * Destructor */ @@ -121,85 +121,87 @@ public: // check the zval type switch (Z_TYPE(_constant.value)) { - case IS_NULL: + case IS_NULL: // set a null constant clss.property(_name, nullptr, Php::Const); break; - + case IS_LONG: // set a long constant (cast is necessary because php uses longs, which // have a different size on different platforms) clss.property(_name, (int64_t)Z_LVAL(_constant.value), Php::Const); break; - + case IS_DOUBLE: // set a double constant clss.property(_name, Z_DVAL(_constant.value), Php::Const); break; - - case IS_BOOL: - // set a boolean constant - clss.property(_name, Z_BVAL(_constant.value), Php::Const); + + case IS_FALSE: + // set boolean false + clss.property(_name, false, Php::Const); break; - + + case IS_TRUE: + // set boolean true + clss.property(_name, true, Php::Const); + case IS_STRING: // set a string constant clss.property(_name, std::string(Z_STRVAL(_constant.value), Z_STRLEN(_constant.value)), Php::Const); break; - + default: // this should not happen, the constant can only be constructed as one // of the above types, so it should be impossible to end up here. But // for completeness, we are going to make a copy of the zval, and convert // that to a string zval copy = _constant.value; - + // run the copy constructor to make sure zval is correctly copied zval_copy_ctor(©); - + // convert the copy to a string convert_to_string(©); - + // set as string constant clss.property(_name, std::string(Z_STRVAL(copy), Z_STRLEN(copy)), Php::Const); break; } } - + /** * Initialize the constant * @param prefix Namespace prefix * @param module_number The module number * @param tsrmls Optional parameter when running in multi-threading context */ - void initialize(const std::string &prefix, int module_number TSRMLS_DC) + void initialize(const std::string &prefix, int module_number TSRMLS_DC) { // is there a namespace name involved? - if (prefix.size() > 0) + if (!prefix.empty()) { // size of the name auto namelen = ::strlen(_name); - - // include prefix in the full name (name_len should include '\0') - _constant.name_len = prefix.size() + 1 + namelen + 1; - _constant.name = (char *)emalloc(_constant.name_len); + + // allocate memory for the full name + _constant.name = zend_string_alloc(prefix.size() + 1 + namelen, 1); // copy the entire namespace name, separator and constant name - ::strncpy(_constant.name, prefix.c_str(), prefix.size()); - ::strncpy(_constant.name + prefix.size(), "\\", 1); - ::strncpy(_constant.name + prefix.size() + 1, _name, namelen + 1); + ::strncpy(ZSTR_VAL(_constant.name), prefix.c_str(), prefix.size()); + ::strncpy(ZSTR_VAL(_constant.name) + prefix.size(), "\\", 1); + ::strncpy(ZSTR_VAL(_constant.name) + prefix.size() + 1, _name, namelen + 1); } else { - // no namespace, we simply copy the name (name_len should include '\0') - _constant.name_len = ::strlen(_name) + 1; - _constant.name = zend_strndup(_name, _constant.name_len - 1); + // no namespace, we simply copy the name + _constant.name = zend_string_init(_name, ::strlen(_name), 1); } - + // set all the other constant properties _constant.flags = CONST_CS | CONST_PERSISTENT; _constant.module_number = module_number; - + // register the zval zend_register_constant(&_constant TSRMLS_CC); } @@ -217,7 +219,7 @@ private: */ zend_constant _constant; }; - + /** * End of namespace */ |