Combine ARRAYBUFFER and TYPEDARRAY macros together (#1699)

Change CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN to
CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
Because typedarray depends on arraybuffer and it doesn't make sense to
enable arraybuffer only.

JerryScript-DCO-1.0-Signed-off-by: Zidong Jiang zidong.jiang@intel.com
This commit is contained in:
Zidong Jiang
2017-03-30 21:22:22 +08:00
committed by GitHub
parent 3ff9a7de8a
commit 41c63e08b1
10 changed files with 15 additions and 24 deletions
@@ -24,7 +24,7 @@
#include "jrt.h"
#include "jrt-libc-includes.h"
#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
#define ECMA_BUILTINS_INTERNAL
#include "ecma-builtins-internal.h"
@@ -138,4 +138,4 @@ ecma_builtin_arraybuffer_prototype_object_slice (ecma_value_t this_arg, /**< thi
* @}
*/
#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
#endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
@@ -22,7 +22,7 @@
#include "ecma-try-catch-macro.h"
#include "jrt.h"
#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
#define ECMA_BUILTINS_INTERNAL
#include "ecma-builtins-internal.h"
@@ -100,4 +100,4 @@ ecma_builtin_arraybuffer_dispatch_construct (const ecma_value_t *arguments_list_
* @}
*/
#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
#endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
@@ -147,13 +147,11 @@ OBJECT_VALUE (LIT_MAGIC_STRING_JSON_U,
ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
#endif /* !CONFIG_DISABLE_JSON_BUILTIN */
#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
OBJECT_VALUE (LIT_MAGIC_STRING_ARRAY_BUFFER_UL,
ECMA_BUILTIN_ID_ARRAYBUFFER,
ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
OBJECT_VALUE (LIT_MAGIC_STRING_INT8_ARRAY_UL,
ECMA_BUILTIN_ID_INT8ARRAY,
ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
@@ -192,7 +190,7 @@ OBJECT_VALUE (LIT_MAGIC_STRING_UINT8_CLAMPED_ARRAY_UL,
ECMA_BUILTIN_ID_UINT8CLAMPEDARRAY,
ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
#endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
/* Routine properties:
* (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */
@@ -298,7 +298,7 @@ BUILTIN (ECMA_BUILTIN_ID_TYPE_ERROR_THROWER,
true,
type_error_thrower)
#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
/* The ArrayBuffer.prototype object (ES2015 24.1.4) */
BUILTIN (ECMA_BUILTIN_ID_ARRAYBUFFER_PROTOTYPE,
@@ -315,9 +315,6 @@ BUILTIN (ECMA_BUILTIN_ID_ARRAYBUFFER,
true,
true,
arraybuffer)
#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
/* The %TypedArrayPrototype% object (ES2015 24.2.3) */
BUILTIN (ECMA_BUILTIN_ID_TYPEDARRAY_PROTOTYPE,