Andrei Alexandrescu
2baabea1ae
I'm committing my work on HphpArray in bite-sized pieces for easier review. This piece replaces calls to NEW with a factory method. There are many problems with operator new, starting with the fact that the allocator cannot communicate properly with the constructor. The newly introduced factory method should return ArrayData but that causes many issues right now, so I left that step to a future diff.
61 linhas
2.0 KiB
C++
61 linhas
2.0 KiB
C++
/*
|
|
+----------------------------------------------------------------------+
|
|
| HipHop for PHP |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 2010- Facebook, Inc. (http://www.facebook.com) |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
#include "hphp/runtime/base/array/array_init.h"
|
|
#include "hphp/runtime/base/array/policy_array.h"
|
|
#include "hphp/runtime/base/array/hphp_array.h"
|
|
#include "hphp/runtime/base/runtime_option.h"
|
|
|
|
namespace HPHP {
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// ArrayInit
|
|
|
|
HOT_FUNC
|
|
ArrayInit::ArrayInit(ssize_t n) {
|
|
if (!n) {
|
|
m_data = HphpArray::GetStaticEmptyArray();
|
|
} else if (false) {
|
|
// Force compilation of ArrayShell
|
|
m_data = NEW(ArrayShell)(n);
|
|
} else {
|
|
m_data = ArrayData::Make(n);
|
|
}
|
|
}
|
|
|
|
HOT_FUNC
|
|
ArrayData *ArrayInit::CreateVector(ssize_t n) {
|
|
return ArrayData::Make(n);
|
|
}
|
|
|
|
HOT_FUNC
|
|
ArrayData *ArrayInit::CreateMap(ssize_t n) {
|
|
return ArrayData::Make(n);
|
|
}
|
|
|
|
ArrayData *ArrayInit::CreateParams(int count, ...) {
|
|
va_list ap;
|
|
va_start(ap, count);
|
|
ArrayInit ai(count);
|
|
for (int i = 0; i < count; i++) {
|
|
ai.setRef(*va_arg(ap, const Variant *));
|
|
}
|
|
va_end(ap);
|
|
return ai.create();
|
|
}
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
}
|