archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Unify asserts in jerry-ext (#4488)

Browse Source 
Some components of the jerry-ext library re-declared their own
assert and/or static assert macros. No need to re-invent the wheel
all the time. This patch makes all components use the assert macros
defined in jext-common.h. This also makes maintenance easier.

JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu
This commit is contained in:
Akos Kiss 2021-01-17 15:21:46 +01:00 committed by GitHub
parent 11894a6032
commit 9bc0f2fd3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jerry-ext/arg/arg.c
View File

@ -13,18 +13,14 @@
* limitations under the License. * limitations under the License.
*/ */
#include "arg-internal.h"
#include "jerryscript-ext/arg.h" #include "jerryscript-ext/arg.h"
#include "jerryscript.h" #include "jerryscript.h"
#include "arg-internal.h"
#define JERRYX_STATIC_ASSERT(x, msg) \ #include "jext-common.h"
enum { static_assertion_failed_ ## msg = 1 / (!!(x)) }
JERRYX_STATIC_ASSERT (sizeof (jerryx_arg_int_option_t) <= sizeof (((jerryx_arg_t *) 0)->extra_info), JERRYX_STATIC_ASSERT (sizeof (jerryx_arg_int_option_t) <= sizeof (((jerryx_arg_t *) 0)->extra_info),
jerryx_arg_number_options_t_must_fit_into_extra_info); jerryx_arg_number_options_t_must_fit_into_extra_info);
#undef JERRYX_STATIC_ASSERT
/** /**
* Validate the JS arguments and assign them to the native arguments. * Validate the JS arguments and assign them to the native arguments.
* *

3
jerry-ext/handle-scope/handle-scope-allocator.c
View File

@ -15,6 +15,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "handle-scope-internal.h" #include "handle-scope-internal.h"
#include "jext-common.h"
static jerryx_handle_scope_t jerryx_handle_scope_root = static jerryx_handle_scope_t jerryx_handle_scope_root =
{ {
@ -157,7 +158,7 @@ jerryx_handle_scope_alloc (void)
else else
{ {
jerryx_handle_scope_dynamic_t *dy_scope = malloc (sizeof (jerryx_handle_scope_dynamic_t)); jerryx_handle_scope_dynamic_t *dy_scope = malloc (sizeof (jerryx_handle_scope_dynamic_t));
JERRYX_HANDLE_SCOPE_ASSERT (dy_scope != NULL); JERRYX_ASSERT (dy_scope != NULL);
dy_scope->child = NULL; dy_scope->child = NULL;
if (jerryx_handle_scope_pool.count != JERRYX_SCOPE_PRELIST_SIZE) if (jerryx_handle_scope_pool.count != JERRYX_SCOPE_PRELIST_SIZE)

15
jerry-ext/handle-scope/handle-scope-internal.h
View File

@ -25,21 +25,6 @@ extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
#define JERRYX_HANDLE_SCOPE_ASSERT(x) \
do \
{ \
if (!(x)) \
{ \
jerry_port_log (JERRY_LOG_LEVEL_ERROR, \
"JerryXHandleScope: Assertion '%s' failed at %s(%s):%lu.\n", \
#x, \
__FILE__, \
__func__, \
(unsigned long) __LINE__); \
jerry_port_fatal (ERR_FAILED_INTERNAL_ASSERTION); \
} \
} while (0)
/** MARK: - handle-scope-allocator.c */ /** MARK: - handle-scope-allocator.c */
typedef struct jerryx_handle_scope_pool_s jerryx_handle_scope_pool_t; typedef struct jerryx_handle_scope_pool_s jerryx_handle_scope_pool_t;
/** /**

5
jerry-ext/handle-scope/handle-scope.c
View File

@ -15,6 +15,9 @@
#include <stdlib.h> #include <stdlib.h>
#include "handle-scope-internal.h" #include "handle-scope-internal.h"
#include "jext-common.h"
JERRYX_STATIC_ASSERT (JERRYX_SCOPE_PRELIST_SIZE < 32, JERRYX_SCOPE_PRELIST_SIZE_MUST_BE_LESS_THAN_SIZE_OF_UINT8_T);
/** /**
* Opens a new handle scope and attach it to current global scope as a child scope. * Opens a new handle scope and attach it to current global scope as a child scope.
@ -339,7 +342,7 @@ jerryx_create_handle_in_scope (jerry_value_t jval, jerryx_handle_scope scope)
return jval; return jval;
} }
jerryx_handle_t *handle = malloc (sizeof (jerryx_handle_t)); jerryx_handle_t *handle = malloc (sizeof (jerryx_handle_t));
JERRYX_HANDLE_SCOPE_ASSERT (handle != NULL); JERRYX_ASSERT (handle != NULL);
handle->jval = jval; handle->jval = jval;
handle->sibling = scope->handle_ptr; handle->sibling = scope->handle_ptr;

6
jerry-ext/include/jerryscript-ext/handle-scope.h
View File

@ -31,12 +31,6 @@ extern "C"
#define JERRYX_SCOPE_PRELIST_SIZE 20 #define JERRYX_SCOPE_PRELIST_SIZE 20
#endif #endif
#define STATIC_ASSERT(COND,MSG) typedef char static_assertion_##MSG[(COND)?1:-1]
STATIC_ASSERT (JERRYX_SCOPE_PRELIST_SIZE < 32, JERRYX_SCOPE_PRELIST_SIZE_must_be_less_than_size_of_uint8_t);
#undef STATIC_ASSERT
typedef struct jerryx_handle_t jerryx_handle_t; typedef struct jerryx_handle_t jerryx_handle_t;
/** /**
* Dynamically allocated handle in the scopes. * Dynamically allocated handle in the scopes.