Skip to content

Rename 'CONFIG_DISABLE_ARRAYBUFFER_BUILTIN' to 'CONFIG_DISABLE_ES2015… #1687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 24, 2017
Merged

Rename 'CONFIG_DISABLE_ARRAYBUFFER_BUILTIN' to 'CONFIG_DISABLE_ES2015… #1687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions jerry-core/ecma/base/ecma-gc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include "vm-defines.h"
#include "vm-stack.h"

#ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
#include "ecma-typedarray-object.h"
#endif

Expand Down Expand Up @@ -487,15 +487,15 @@ ecma_gc_sweep (ecma_object_t *object_p) /**< object to free */
}
break;
}
#ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
case LIT_MAGIC_STRING_ARRAY_BUFFER_UL:
{
ecma_length_t arraybuffer_length = ext_object_p->u.class_prop.u.length;
size_t size = sizeof (ecma_extended_object_t) + arraybuffer_length;
ecma_dealloc_extended_object ((ecma_extended_object_t *) object_p, size);
return;
}
#endif /* CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
default:
{
JERRY_UNREACHABLE ();
Expand Down
4 changes: 2 additions & 2 deletions jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "jrt.h"
#include "jrt-libc-includes.h"

#ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN

#define ECMA_BUILTINS_INTERNAL
#include "ecma-builtins-internal.h"
Expand Down Expand Up @@ -138,4 +138,4 @@ ecma_builtin_arraybuffer_prototype_object_slice (ecma_value_t this_arg, /**< thi
* @}
*/

#endif /* !CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
4 changes: 2 additions & 2 deletions jerry-core/ecma/builtin-objects/ecma-builtin-arraybuffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "ecma-try-catch-macro.h"
#include "jrt.h"

#ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN

#define ECMA_BUILTINS_INTERNAL
#include "ecma-builtins-internal.h"
Expand Down Expand Up @@ -100,4 +100,4 @@ ecma_builtin_arraybuffer_dispatch_construct (const ecma_value_t *arguments_list_
* @}
*/

#endif /* !CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
6 changes: 3 additions & 3 deletions jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,11 @@ OBJECT_VALUE (LIT_MAGIC_STRING_JSON_U,
ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
#endif /* !CONFIG_DISABLE_JSON_BUILTIN */

#ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
OBJECT_VALUE (LIT_MAGIC_STRING_ARRAY_BUFFER_UL,
ECMA_BUILTIN_ID_ARRAYBUFFER,
ECMA_PROPERTY_CONFIGURABLE_WRITABLE)
#endif /* !CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */

#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
OBJECT_VALUE (LIT_MAGIC_STRING_INT8_ARRAY_UL,
Expand Down Expand Up @@ -192,7 +192,7 @@ OBJECT_VALUE (LIT_MAGIC_STRING_UINT8_CLAMPED_ARRAY_UL,
ECMA_BUILTIN_ID_UINT8CLAMPEDARRAY,
ECMA_PROPERTY_CONFIGURABLE_WRITABLE)

#endif /* !CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
/* Routine properties:
* (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */

Expand Down
4 changes: 2 additions & 2 deletions jerry-core/ecma/builtin-objects/ecma-builtins.inc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ BUILTIN (ECMA_BUILTIN_ID_TYPE_ERROR_THROWER,
true,
type_error_thrower)

#ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN

/* The ArrayBuffer.prototype object (ES2015 24.1.4) */
BUILTIN (ECMA_BUILTIN_ID_ARRAYBUFFER_PROTOTYPE,
Expand All @@ -315,7 +315,7 @@ BUILTIN (ECMA_BUILTIN_ID_ARRAYBUFFER,
true,
true,
arraybuffer)
#endif /* !CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */

#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN

Expand Down
4 changes: 2 additions & 2 deletions jerry-core/ecma/operations/ecma-arraybuffer-object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "ecma-helpers.h"
#include "jmem.h"

#ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN

/** \addtogroup ecma ECMA
* @{
Expand Down Expand Up @@ -186,4 +186,4 @@ ecma_arraybuffer_get_buffer (ecma_object_t *object_p) /**< pointer to the ArrayB
* @}
* @}
*/
#endif /* !CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
4 changes: 2 additions & 2 deletions jerry-core/ecma/operations/ecma-arraybuffer-object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#ifndef ECMA_ARRAYBUFFER_OBJECT_H
#define ECMA_ARRAYBUFFER_OBJECT_H

#ifndef CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
#include "ecma-globals.h"

/** \addtogroup ecma ECMA
Expand Down Expand Up @@ -48,5 +48,5 @@ ecma_is_arraybuffer (ecma_value_t val);
* @}
*/

#endif /* !CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
#endif /* !ECMA_ARRAYBUFFER_OBJECT_H */
4 changes: 2 additions & 2 deletions jerry-core/ecma/operations/ecma-objects.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1682,9 +1682,9 @@ 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_ARRAYBUFFER_BUILTIN
#ifndef CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
|| ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_ARRAYBUFFER_PROTOTYPE)
#endif /* !CONFIG_DISABLE_ARRAYBUFFER_BUILTIN */
#endif /* !CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN */
#ifndef CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
|| ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_TYPEDARRAY_PROTOTYPE)
|| ecma_builtin_is (obj_p, ECMA_BUILTIN_ID_INT8ARRAY_PROTOTYPE)
Expand Down
2 changes: 1 addition & 1 deletion jerry-core/profiles/es5.1.profile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
CONFIG_DISABLE_ES2015_BUILTIN
CONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN
2 changes: 1 addition & 1 deletion jerry-core/profiles/minimal.profile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CONFIG_DISABLE_ARRAYBUFFER_BUILTIN
CONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN
CONFIG_DISABLE_ANNEXB_BUILTIN
CONFIG_DISABLE_ARRAY_BUILTIN
CONFIG_DISABLE_BOOLEAN_BUILTIN
Expand Down
2 changes: 1 addition & 1 deletion targets/curie_bsp/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def build_jerry_data(jerry_path):
'-DCONFIG_DISABLE_DATE_BUILTIN',
'-DCONFIG_DISABLE_REGEXP_BUILTIN',
'-DCONFIG_DISABLE_ANNEXB_BUILTIN',
'-DCONFIG_DISABLE_ARRAYBUFFER_BUILTIN',
'-DCONFIG_DISABLE_ES2015_ARRAYBUFFER_BUILTIN',
'-DCONFIG_DISABLE_ES2015_TYPEDARRAY_BUILTIN',
'-DCONFIG_ECMA_LCACHE_DISABLE',
'-DCONFIG_ECMA_PROPERTY_HASHMAP_DISABLE',
Expand Down