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
@@ -23,7 +23,7 @@
#include "ecma-helpers.h"
#include "jmem.h"
#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
/** \addtogroup ecma ECMA
* @{
@@ -186,4 +186,4 @@ ecma_arraybuffer_get_buffer (ecma_object_t *object_p) /**< pointer to the ArrayB
* @}
* @}
*/
#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
#endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
@@ -16,7 +16,7 @@
#ifndef ECMA_ARRAYBUFFER_OBJECT_H
#define ECMA_ARRAYBUFFER_OBJECT_H
#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
#include "ecma-globals.h"
/** \addtogroup ecma ECMA
@@ -48,5 +48,5 @@ ecma_is_arraybuffer (ecma_value_t val);
* @}
*/
#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
#endif /* !CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN */
#endif /* !ECMA_ARRAYBUFFER_OBJECT_H */
+1 -3
View File
@@ -1682,10 +1682,8 @@ ecma_object_check_class_name_is_object (ecma_object_t *obj_p) /**< object */
{
#ifndef JERRY_NDEBUG
return (ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_GLOBAL)
#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
|| ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_ARRAYBUFFER_PROTOTYPE)
#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
|| ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_ARRAYBUFFER_PROTOTYPE)
|| ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_TYPEDARRAY_PROTOTYPE)
|| ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_INT8ARRAY_PROTOTYPE)
|| ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_UINT8ARRAY_PROTOTYPE)