diff options
| author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-03-20 16:52:25 +0100 |
|---|---|---|
| committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-03-20 16:52:25 +0100 |
| commit | 4bd9e7af0ab86adc09d449603158c8bc43d7103c (patch) | |
| tree | 0c050b642466f8ef029a07a5b325cf3159e12232 /src/value.cpp | |
| parent | b1f91277a29ddac92479106543ecfd62ff99d152 (diff) | |
moved implementation for hashiterator to header file, introduced invaliditerator class, valueiterator now uses the hashiterator class internally
Diffstat (limited to 'src/value.cpp')
| -rw-r--r-- | src/value.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/value.cpp b/src/value.cpp index 356df4a..96f7321 100644 --- a/src/value.cpp +++ b/src/value.cpp @@ -1550,13 +1550,13 @@ std::map<std::string,Php::Value> Value::mapValue() const ValueIterator Value::begin() const { // check type - if (isArray()) return ValueIterator(Z_ARRVAL_P(_val), true); + if (isArray()) return ValueIterator(new HashIterator(Z_ARRVAL_P(_val), true)); // get access to the hast table - if (isObject()) return ValueIterator(Z_OBJ_HT_P(_val)->get_properties(_val), true); + if (isObject()) return ValueIterator(new HashIterator(Z_OBJ_HT_P(_val)->get_properties(_val), true)); // invalid - return ValueIterator(nullptr,true); + return ValueIterator(new InvalidIterator()); } /** @@ -1567,13 +1567,13 @@ ValueIterator Value::begin() const ValueIterator Value::end() const { // check type - if (isArray()) return ValueIterator(Z_ARRVAL_P(_val), false); + if (isArray()) return ValueIterator(new HashIterator(Z_ARRVAL_P(_val), false)); // get access to the hast table - if (isObject()) return ValueIterator(Z_OBJ_HT_P(_val)->get_properties(_val), false); + if (isObject()) return ValueIterator(new HashIterator(Z_OBJ_HT_P(_val)->get_properties(_val), false)); // invalid - return ValueIterator(nullptr, false); + return ValueIterator(new InvalidIterator()); } /** |