Introduce jerry_get_resource_name API function (#3236)
This new API function adds possibility to query the resource name of the currently executed script (including modules) or a function object. This patch closes #2170. JerryScript-DCO-1.0-Signed-off-by: Robert Fancsik frobert@inf.u-szeged.hu
This commit is contained in:
committed by
Dániel Bátyai
parent
55423ab82a
commit
525c35f148
@@ -7556,6 +7556,105 @@ main (void)
|
|||||||
- [jerry_create_external_function](#jerry_create_external_function)
|
- [jerry_create_external_function](#jerry_create_external_function)
|
||||||
|
|
||||||
|
|
||||||
|
## jerry_get_resurce_name
|
||||||
|
|
||||||
|
**Summary**
|
||||||
|
|
||||||
|
Get the resource name (usually a file name) of the currently executed script or the given function object.
|
||||||
|
|
||||||
|
This function is typically called from native callbacks.
|
||||||
|
|
||||||
|
*Notes*:
|
||||||
|
- Returned value must be freed with [jerry_release_value](#jerry_release_value) when it
|
||||||
|
is no longer needed.
|
||||||
|
- This feature depends on build option (`JERRY_LINE_INFO`) and can be checked
|
||||||
|
in runtime with the `JERRY_FEATURE_LINE_INFO` feature enum value,
|
||||||
|
see: [jerry_is_feature_enabled](#jerry_is_feature_enabled).
|
||||||
|
|
||||||
|
**Prototype**
|
||||||
|
|
||||||
|
```c
|
||||||
|
jerry_value_t
|
||||||
|
jerry_get_resurce_name (void);
|
||||||
|
```
|
||||||
|
|
||||||
|
- return string value constructed from
|
||||||
|
- the currently executed function object's resource name, if the given value is undefined
|
||||||
|
- resource name of the function object, if the given value is a function object
|
||||||
|
- "<anonymous>", otherwise
|
||||||
|
|
||||||
|
**Example**
|
||||||
|
|
||||||
|
[doctest]: # (name="02.API-REFERENCE-jsresourcename.c")
|
||||||
|
|
||||||
|
```c
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include "jerryscript.h"
|
||||||
|
|
||||||
|
static jerry_value_t
|
||||||
|
resource_name_handler (const jerry_value_t function_obj,
|
||||||
|
const jerry_value_t this_val,
|
||||||
|
const jerry_value_t args_p[],
|
||||||
|
const jerry_length_t args_count)
|
||||||
|
{
|
||||||
|
jerry_value_t undefined_value = jerry_create_undefined ();
|
||||||
|
jerry_value_t resource_name = jerry_get_resource_name (args_count > 0 ? args_p[0] : undefined_value);
|
||||||
|
jerry_release_value (undefined_value);
|
||||||
|
|
||||||
|
return resource_name;
|
||||||
|
} /* resource_name_handler */
|
||||||
|
|
||||||
|
int
|
||||||
|
main (void)
|
||||||
|
{
|
||||||
|
jerry_init (JERRY_INIT_EMPTY);
|
||||||
|
|
||||||
|
jerry_value_t global = jerry_get_global_object ();
|
||||||
|
|
||||||
|
/* Register the "resourceName" method. */
|
||||||
|
{
|
||||||
|
jerry_value_t func = jerry_create_external_function (resource_name_handler);
|
||||||
|
jerry_value_t name = jerry_create_string ((const jerry_char_t *) "resourceName");
|
||||||
|
jerry_value_t result = jerry_set_property (global, name, func);
|
||||||
|
jerry_release_value (result);
|
||||||
|
jerry_release_value (name);
|
||||||
|
jerry_release_value (func);
|
||||||
|
}
|
||||||
|
|
||||||
|
jerry_release_value (global);
|
||||||
|
|
||||||
|
const jerry_char_t source[] = "function myFunction() { return resourceName() }; myFunction()";
|
||||||
|
const jerry_char_t resource[] = "demo.js";
|
||||||
|
|
||||||
|
jerry_value_t program = jerry_parse (resource,
|
||||||
|
sizeof (resource) - 1,
|
||||||
|
source,
|
||||||
|
sizeof (source) - 1,
|
||||||
|
JERRY_PARSE_NO_OPTS);
|
||||||
|
|
||||||
|
if (!jerry_value_is_error (program))
|
||||||
|
{
|
||||||
|
/* `run_result` contains "demo.js" */
|
||||||
|
jerry_value_t run_result = jerry_run (program);
|
||||||
|
|
||||||
|
/* usage of `run_result` */
|
||||||
|
|
||||||
|
jerry_release_value (run_result);
|
||||||
|
}
|
||||||
|
|
||||||
|
jerry_release_value (program);
|
||||||
|
jerry_cleanup ();
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**See also**
|
||||||
|
|
||||||
|
- [jerry_create_external_function](#jerry_create_external_function)
|
||||||
|
|
||||||
|
|
||||||
# ArrayBuffer and TypedArray functions
|
# ArrayBuffer and TypedArray functions
|
||||||
|
|
||||||
These APIs all depend on the ES2015-subset profile.
|
These APIs all depend on the ES2015-subset profile.
|
||||||
|
|||||||
@@ -3354,6 +3354,49 @@ jerry_get_backtrace (uint32_t max_depth) /**< depth limit of the backtrace */
|
|||||||
return vm_get_backtrace (max_depth);
|
return vm_get_backtrace (max_depth);
|
||||||
} /* jerry_get_backtrace */
|
} /* jerry_get_backtrace */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the resource name (usually a file name) of the currently executed script or the given function object
|
||||||
|
*
|
||||||
|
* Note: returned value must be freed with jerry_release_value, when it is no longer needed
|
||||||
|
*
|
||||||
|
* @return JS string constructed from
|
||||||
|
* - the currently executed function object's resource name, if the given value is undefined
|
||||||
|
* - resource name of the function object, if the given value is a function object
|
||||||
|
* - "<anonymous>", otherwise
|
||||||
|
*/
|
||||||
|
jerry_value_t
|
||||||
|
jerry_get_resource_name (const jerry_value_t value) /**< jerry api value */
|
||||||
|
{
|
||||||
|
#if ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM)
|
||||||
|
if (ecma_is_value_undefined (value))
|
||||||
|
{
|
||||||
|
if (JERRY_CONTEXT (vm_top_context_p) != NULL)
|
||||||
|
{
|
||||||
|
return ecma_copy_value (JERRY_CONTEXT (vm_top_context_p)->resource_name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif /* ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM) */
|
||||||
|
#if ENABLED (JERRY_LINE_INFO)
|
||||||
|
else if (ecma_is_value_object (value))
|
||||||
|
{
|
||||||
|
ecma_object_t *obj_p = ecma_get_object_from_value (value);
|
||||||
|
|
||||||
|
if (ecma_get_object_type (obj_p) == ECMA_OBJECT_TYPE_FUNCTION
|
||||||
|
&& !ecma_get_object_is_builtin (obj_p))
|
||||||
|
{
|
||||||
|
ecma_extended_object_t *ext_func_p = (ecma_extended_object_t *) obj_p;
|
||||||
|
|
||||||
|
const ecma_compiled_code_t *bytecode_data_p = ecma_op_function_get_compiled_code (ext_func_p);
|
||||||
|
|
||||||
|
return ecma_copy_value (ecma_op_resource_name (bytecode_data_p));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif /* ENABLED (JERRY_LINE_INFO) */
|
||||||
|
|
||||||
|
JERRY_UNUSED (value);
|
||||||
|
return ecma_make_magic_string_value (LIT_MAGIC_STRING_RESOURCE_ANON);
|
||||||
|
} /* jerry_get_resource_name */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if the given value is an ArrayBuffer object.
|
* Check if the given value is an ArrayBuffer object.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -34,6 +34,45 @@
|
|||||||
* @{
|
* @{
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#if ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM)
|
||||||
|
/**
|
||||||
|
* Get the resource name from the compiled code header
|
||||||
|
*
|
||||||
|
* @return resource name as ecma-string
|
||||||
|
*/
|
||||||
|
ecma_value_t
|
||||||
|
ecma_op_resource_name (const ecma_compiled_code_t *bytecode_header_p)
|
||||||
|
{
|
||||||
|
JERRY_ASSERT (bytecode_header_p != NULL);
|
||||||
|
|
||||||
|
ecma_length_t formal_params_number = 0;
|
||||||
|
|
||||||
|
if (CBC_NON_STRICT_ARGUMENTS_NEEDED (bytecode_header_p))
|
||||||
|
{
|
||||||
|
if (bytecode_header_p->status_flags & CBC_CODE_FLAGS_UINT16_ARGUMENTS)
|
||||||
|
{
|
||||||
|
cbc_uint16_arguments_t *args_p = (cbc_uint16_arguments_t *) bytecode_header_p;
|
||||||
|
|
||||||
|
formal_params_number = args_p->argument_end;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
cbc_uint8_arguments_t *args_p = (cbc_uint8_arguments_t *) bytecode_header_p;
|
||||||
|
|
||||||
|
formal_params_number = args_p->argument_end;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t *byte_p = (uint8_t *) bytecode_header_p;
|
||||||
|
byte_p += ((size_t) bytecode_header_p->size) << JMEM_ALIGNMENT_LOG;
|
||||||
|
|
||||||
|
ecma_value_t *resource_name_p = (ecma_value_t *) byte_p;
|
||||||
|
resource_name_p -= formal_params_number;
|
||||||
|
|
||||||
|
return resource_name_p[-1];
|
||||||
|
} /* ecma_op_resource_name */
|
||||||
|
#endif /* ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM) */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks whether the type is a normal or arrow function.
|
* Checks whether the type is a normal or arrow function.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -28,6 +28,10 @@
|
|||||||
|
|
||||||
bool ecma_is_normal_or_arrow_function (ecma_object_type_t type);
|
bool ecma_is_normal_or_arrow_function (ecma_object_type_t type);
|
||||||
|
|
||||||
|
#if ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM)
|
||||||
|
ecma_value_t ecma_op_resource_name (const ecma_compiled_code_t *bytecode_header_p);
|
||||||
|
#endif /* ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM) */
|
||||||
|
|
||||||
bool ecma_op_is_callable (ecma_value_t value);
|
bool ecma_op_is_callable (ecma_value_t value);
|
||||||
bool ecma_op_object_is_callable (ecma_object_t *obj_p);
|
bool ecma_op_object_is_callable (ecma_object_t *obj_p);
|
||||||
bool ecma_is_constructor (ecma_value_t value);
|
bool ecma_is_constructor (ecma_value_t value);
|
||||||
|
|||||||
@@ -605,6 +605,7 @@ jerry_context_t *jerry_create_context (uint32_t heap_size, jerry_context_alloc_t
|
|||||||
*/
|
*/
|
||||||
void jerry_set_vm_exec_stop_callback (jerry_vm_exec_stop_callback_t stop_cb, void *user_p, uint32_t frequency);
|
void jerry_set_vm_exec_stop_callback (jerry_vm_exec_stop_callback_t stop_cb, void *user_p, uint32_t frequency);
|
||||||
jerry_value_t jerry_get_backtrace (uint32_t max_depth);
|
jerry_value_t jerry_get_backtrace (uint32_t max_depth);
|
||||||
|
jerry_value_t jerry_get_resource_name (const jerry_value_t value);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Array buffer components.
|
* Array buffer components.
|
||||||
|
|||||||
@@ -602,9 +602,7 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_SET_UTC_DATE_UL, "setUTCDate")
|
|||||||
#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ES2015_BUILTIN)
|
#if ENABLED (JERRY_BUILTIN_STRING) && ENABLED (JERRY_ES2015_BUILTIN)
|
||||||
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_STARTS_WITH, "startsWith")
|
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_STARTS_WITH, "startsWith")
|
||||||
#endif
|
#endif
|
||||||
#if ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ERROR_MESSAGES) || ENABLED (JERRY_ES2015_MODULE_SYSTEM)
|
|
||||||
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RESOURCE_ANON, "<anonymous>")
|
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_RESOURCE_ANON, "<anonymous>")
|
||||||
#endif
|
|
||||||
#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) \
|
#if ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) \
|
||||||
|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY)
|
|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY)
|
||||||
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ARRAY_BUFFER_UL, "ArrayBuffer")
|
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ARRAY_BUFFER_UL, "ArrayBuffer")
|
||||||
@@ -837,18 +835,7 @@ LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (10, LIT_MAGIC_STRING_COPY_WITHIN)
|
|||||||
#else
|
#else
|
||||||
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (10, LIT_MAGIC_STRING_ENUMERABLE)
|
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (10, LIT_MAGIC_STRING_ENUMERABLE)
|
||||||
#endif
|
#endif
|
||||||
#if ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ERROR_MESSAGES) || ENABLED (JERRY_ES2015_MODULE_SYSTEM)
|
|
||||||
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (11, LIT_MAGIC_STRING_RESOURCE_ANON)
|
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (11, LIT_MAGIC_STRING_RESOURCE_ANON)
|
||||||
#elif ENABLED (JERRY_ES2015_BUILTIN_DATAVIEW) \
|
|
||||||
|| ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY)
|
|
||||||
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (11, LIT_MAGIC_STRING_ARRAY_BUFFER_UL)
|
|
||||||
#elif ENABLED (JERRY_BUILTIN_ERRORS)
|
|
||||||
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (11, LIT_MAGIC_STRING_SYNTAX_ERROR_UL)
|
|
||||||
#elif ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY)
|
|
||||||
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (11, LIT_MAGIC_STRING_UINT16_ARRAY_UL)
|
|
||||||
#else
|
|
||||||
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (11, LIT_MAGIC_STRING_CONSTRUCTOR)
|
|
||||||
#endif
|
|
||||||
#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY)
|
#if ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY)
|
||||||
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_FLOAT32_ARRAY_UL)
|
LIT_MAGIC_STRING_FIRST_STRING_WITH_SIZE (12, LIT_MAGIC_STRING_FLOAT32_ARRAY_UL)
|
||||||
#elif ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) && ENABLED (JERRY_NUMBER_TYPE_FLOAT64)
|
#elif ENABLED (JERRY_ES2015_BUILTIN_TYPEDARRAY) && ENABLED (JERRY_NUMBER_TYPE_FLOAT64)
|
||||||
|
|||||||
@@ -2312,12 +2312,14 @@ parser_parse_statements (parser_context_t *context_p) /**< context */
|
|||||||
}
|
}
|
||||||
#endif /* ENABLED (JERRY_DEBUGGER) */
|
#endif /* ENABLED (JERRY_DEBUGGER) */
|
||||||
|
|
||||||
#if ENABLED (JERRY_LINE_INFO)
|
#if ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM)
|
||||||
if (JERRY_CONTEXT (resource_name) != ECMA_VALUE_UNDEFINED)
|
if (JERRY_CONTEXT (resource_name) != ECMA_VALUE_UNDEFINED)
|
||||||
{
|
{
|
||||||
parser_emit_cbc_ext (context_p, CBC_EXT_RESOURCE_NAME);
|
parser_emit_cbc_ext (context_p, CBC_EXT_RESOURCE_NAME);
|
||||||
parser_flush_cbc (context_p);
|
parser_flush_cbc (context_p);
|
||||||
}
|
}
|
||||||
|
#endif /* ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM) */
|
||||||
|
#if ENABLED (JERRY_LINE_INFO)
|
||||||
context_p->last_line_info_line = 0;
|
context_p->last_line_info_line = 0;
|
||||||
#endif /* ENABLED (JERRY_LINE_INFO) */
|
#endif /* ENABLED (JERRY_LINE_INFO) */
|
||||||
|
|
||||||
|
|||||||
@@ -1160,12 +1160,12 @@ parser_post_processing (parser_context_t *context_p) /**< context */
|
|||||||
total_size += context_p->argument_count * sizeof (ecma_value_t);
|
total_size += context_p->argument_count * sizeof (ecma_value_t);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if ENABLED (JERRY_LINE_INFO)
|
#if ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM)
|
||||||
if (JERRY_CONTEXT (resource_name) != ECMA_VALUE_UNDEFINED)
|
if (JERRY_CONTEXT (resource_name) != ECMA_VALUE_UNDEFINED)
|
||||||
{
|
{
|
||||||
total_size += sizeof (ecma_value_t);
|
total_size += sizeof (ecma_value_t);
|
||||||
}
|
}
|
||||||
#endif /* ENABLED (JERRY_LINE_INFO) */
|
#endif /* ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM) */
|
||||||
|
|
||||||
#if ENABLED (JERRY_SNAPSHOT_SAVE)
|
#if ENABLED (JERRY_SNAPSHOT_SAVE)
|
||||||
total_size_used = total_size;
|
total_size_used = total_size;
|
||||||
@@ -1558,7 +1558,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if ENABLED (JERRY_LINE_INFO)
|
#if ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM)
|
||||||
if (JERRY_CONTEXT (resource_name) != ECMA_VALUE_UNDEFINED)
|
if (JERRY_CONTEXT (resource_name) != ECMA_VALUE_UNDEFINED)
|
||||||
{
|
{
|
||||||
ecma_value_t *resource_name_p = (ecma_value_t *) (((uint8_t *) compiled_code_p) + total_size);
|
ecma_value_t *resource_name_p = (ecma_value_t *) (((uint8_t *) compiled_code_p) + total_size);
|
||||||
@@ -1571,7 +1571,7 @@ parser_post_processing (parser_context_t *context_p) /**< context */
|
|||||||
|
|
||||||
resource_name_p[-1] = JERRY_CONTEXT (resource_name);
|
resource_name_p[-1] = JERRY_CONTEXT (resource_name);
|
||||||
}
|
}
|
||||||
#endif /* ENABLED (JERRY_LINE_INFO) */
|
#endif /* ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM) */
|
||||||
|
|
||||||
#if ENABLED (JERRY_DEBUGGER)
|
#if ENABLED (JERRY_DEBUGGER)
|
||||||
if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED)
|
if (JERRY_CONTEXT (debugger_flags) & JERRY_DEBUGGER_CONNECTED)
|
||||||
|
|||||||
@@ -52,8 +52,10 @@ typedef struct vm_frame_ctx_t
|
|||||||
#endif /* defined (JERRY_DEBUGGER) || ENABLED (JERRY_LINE_INFO) */
|
#endif /* defined (JERRY_DEBUGGER) || ENABLED (JERRY_LINE_INFO) */
|
||||||
ecma_value_t this_binding; /**< this binding */
|
ecma_value_t this_binding; /**< this binding */
|
||||||
ecma_value_t block_result; /**< block result */
|
ecma_value_t block_result; /**< block result */
|
||||||
#if ENABLED (JERRY_LINE_INFO)
|
#if ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM)
|
||||||
ecma_value_t resource_name; /**< current resource name (usually a file name) */
|
ecma_value_t resource_name; /**< current resource name (usually a file name) */
|
||||||
|
#endif /* ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM) */
|
||||||
|
#if ENABLED (JERRY_LINE_INFO)
|
||||||
uint32_t current_line; /**< currently executed line */
|
uint32_t current_line; /**< currently executed line */
|
||||||
#endif /* ENABLED (JERRY_LINE_INFO) */
|
#endif /* ENABLED (JERRY_LINE_INFO) */
|
||||||
uint16_t context_depth; /**< current context depth */
|
uint16_t context_depth; /**< current context depth */
|
||||||
|
|||||||
+7
-27
@@ -3384,36 +3384,14 @@ vm_loop (vm_frame_ctx_t *frame_ctx_p) /**< frame context */
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
#endif /* ENABLED (JERRY_DEBUGGER) */
|
#endif /* ENABLED (JERRY_DEBUGGER) */
|
||||||
#if ENABLED (JERRY_LINE_INFO)
|
#if ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM)
|
||||||
case VM_OC_RESOURCE_NAME:
|
case VM_OC_RESOURCE_NAME:
|
||||||
{
|
{
|
||||||
ecma_length_t formal_params_number = 0;
|
frame_ctx_p->resource_name = ecma_op_resource_name (bytecode_header_p);
|
||||||
|
|
||||||
if (CBC_NON_STRICT_ARGUMENTS_NEEDED (bytecode_header_p))
|
|
||||||
{
|
|
||||||
if (bytecode_header_p->status_flags & CBC_CODE_FLAGS_UINT16_ARGUMENTS)
|
|
||||||
{
|
|
||||||
cbc_uint16_arguments_t *args_p = (cbc_uint16_arguments_t *) bytecode_header_p;
|
|
||||||
|
|
||||||
formal_params_number = args_p->argument_end;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
cbc_uint8_arguments_t *args_p = (cbc_uint8_arguments_t *) bytecode_header_p;
|
|
||||||
|
|
||||||
formal_params_number = args_p->argument_end;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t *byte_p = (uint8_t *) bytecode_header_p;
|
|
||||||
byte_p += ((size_t) bytecode_header_p->size) << JMEM_ALIGNMENT_LOG;
|
|
||||||
|
|
||||||
ecma_value_t *resource_name_p = (ecma_value_t *) byte_p;
|
|
||||||
resource_name_p -= formal_params_number;
|
|
||||||
|
|
||||||
frame_ctx_p->resource_name = resource_name_p[-1];
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
#endif /* ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM) */
|
||||||
|
#if ENABLED (JERRY_LINE_INFO)
|
||||||
case VM_OC_LINE:
|
case VM_OC_LINE:
|
||||||
{
|
{
|
||||||
uint32_t value = 0;
|
uint32_t value = 0;
|
||||||
@@ -3840,8 +3818,10 @@ vm_run (const ecma_compiled_code_t *bytecode_header_p, /**< byte-code data heade
|
|||||||
#endif /* defined (JERRY_DEBUGGER) || ENABLED (JERRY_LINE_INFO) */
|
#endif /* defined (JERRY_DEBUGGER) || ENABLED (JERRY_LINE_INFO) */
|
||||||
frame_ctx.this_binding = this_binding_value;
|
frame_ctx.this_binding = this_binding_value;
|
||||||
frame_ctx.block_result = ECMA_VALUE_UNDEFINED;
|
frame_ctx.block_result = ECMA_VALUE_UNDEFINED;
|
||||||
#if ENABLED (JERRY_LINE_INFO)
|
#if ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM)
|
||||||
frame_ctx.resource_name = ECMA_VALUE_UNDEFINED;
|
frame_ctx.resource_name = ECMA_VALUE_UNDEFINED;
|
||||||
|
#endif /* ENABLED (JERRY_LINE_INFO) || ENABLED (JERRY_ES2015_MODULE_SYSTEM) */
|
||||||
|
#if ENABLED (JERRY_LINE_INFO)
|
||||||
frame_ctx.current_line = 0;
|
frame_ctx.current_line = 0;
|
||||||
#endif /* ENABLED (JERRY_LINE_INFO) */
|
#endif /* ENABLED (JERRY_LINE_INFO) */
|
||||||
frame_ctx.context_depth = 0;
|
frame_ctx.context_depth = 0;
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
/* Copyright JS Foundation and other contributors, http://js.foundation
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "jerryscript-ext/handler.h"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the resource name (usually a file name) of the currently executed script or the given function object
|
||||||
|
*
|
||||||
|
* Note: returned value must be freed with jerry_release_value, when it is no longer needed
|
||||||
|
*
|
||||||
|
* @return JS string constructed from
|
||||||
|
* - the currently executed function object's resource name, if the given value is undefined
|
||||||
|
* - resource name of the function object, if the given value is a function object
|
||||||
|
* - "<anonymous>", otherwise
|
||||||
|
*/
|
||||||
|
jerry_value_t
|
||||||
|
jerryx_handler_resource_name (const jerry_value_t func_obj_val, /**< function object */
|
||||||
|
const jerry_value_t this_p, /**< this arg */
|
||||||
|
const jerry_value_t args_p[], /**< function arguments */
|
||||||
|
const jerry_length_t args_cnt) /**< number of function arguments */
|
||||||
|
{
|
||||||
|
(void) func_obj_val; /* unused */
|
||||||
|
(void) this_p; /* unused */
|
||||||
|
|
||||||
|
jerry_value_t undefined_value = jerry_create_undefined ();
|
||||||
|
jerry_value_t resource_name = jerry_get_resource_name (args_cnt > 0 ? args_p[0] : undefined_value);
|
||||||
|
jerry_release_value (undefined_value);
|
||||||
|
|
||||||
|
return resource_name;
|
||||||
|
} /* jerryx_handler_resource_name */
|
||||||
@@ -44,6 +44,8 @@ jerry_value_t jerryx_handler_gc (const jerry_value_t func_obj_val, const jerry_v
|
|||||||
const jerry_value_t args_p[], const jerry_length_t args_cnt);
|
const jerry_value_t args_p[], const jerry_length_t args_cnt);
|
||||||
jerry_value_t jerryx_handler_print (const jerry_value_t func_obj_val, const jerry_value_t this_p,
|
jerry_value_t jerryx_handler_print (const jerry_value_t func_obj_val, const jerry_value_t this_p,
|
||||||
const jerry_value_t args_p[], const jerry_length_t args_cnt);
|
const jerry_value_t args_p[], const jerry_length_t args_cnt);
|
||||||
|
jerry_value_t jerryx_handler_resource_name (const jerry_value_t func_obj_val, const jerry_value_t this_p,
|
||||||
|
const jerry_value_t args_p[], const jerry_length_t args_cnt);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Struct used by the `jerryx_set_functions` method to
|
* Struct used by the `jerryx_set_functions` method to
|
||||||
|
|||||||
@@ -459,6 +459,7 @@ init_engine (jerry_init_flag_t flags, /**< initialized flags for the engine */
|
|||||||
register_js_function ("assert", jerryx_handler_assert);
|
register_js_function ("assert", jerryx_handler_assert);
|
||||||
register_js_function ("gc", jerryx_handler_gc);
|
register_js_function ("gc", jerryx_handler_gc);
|
||||||
register_js_function ("print", jerryx_handler_print);
|
register_js_function ("print", jerryx_handler_print);
|
||||||
|
register_js_function ("resourceName", jerryx_handler_resource_name);
|
||||||
} /* init_engine */
|
} /* init_engine */
|
||||||
|
|
||||||
int
|
int
|
||||||
|
|||||||
@@ -4,25 +4,27 @@ Stopped at tests/debugger/do_variables.js:15
|
|||||||
level | type
|
level | type
|
||||||
0 | global
|
0 | global
|
||||||
(jerry-debugger) variables
|
(jerry-debugger) variables
|
||||||
name | type | value
|
name | type | value
|
||||||
f | Function |
|
f | Function |
|
||||||
addX | Function |
|
addX | Function |
|
||||||
z | undefined | undefined
|
z | undefined | undefined
|
||||||
c | undefined | undefined
|
c | undefined | undefined
|
||||||
print | Function |
|
resourceName | Function |
|
||||||
gc | Function |
|
print | Function |
|
||||||
assert | Function |
|
gc | Function |
|
||||||
|
assert | Function |
|
||||||
(jerry-debugger) variables 1
|
(jerry-debugger) variables 1
|
||||||
name | type | value
|
name | type | value
|
||||||
(jerry-debugger) variables 0
|
(jerry-debugger) variables 0
|
||||||
name | type | value
|
name | type | value
|
||||||
f | Function |
|
f | Function |
|
||||||
addX | Function |
|
addX | Function |
|
||||||
z | undefined | undefined
|
z | undefined | undefined
|
||||||
c | undefined | undefined
|
c | undefined | undefined
|
||||||
print | Function |
|
resourceName | Function |
|
||||||
gc | Function |
|
print | Function |
|
||||||
assert | Function |
|
gc | Function |
|
||||||
|
assert | Function |
|
||||||
(jerry-debugger) b tests/debugger/do_variables.js:20
|
(jerry-debugger) b tests/debugger/do_variables.js:20
|
||||||
Breakpoint 1 at tests/debugger/do_variables.js:20 (in function() at line:19, col:10)
|
Breakpoint 1 at tests/debugger/do_variables.js:20 (in function() at line:19, col:10)
|
||||||
(jerry-debugger) c
|
(jerry-debugger) c
|
||||||
@@ -40,15 +42,16 @@ n | Number | 9
|
|||||||
name | type | value
|
name | type | value
|
||||||
x | Number | 3
|
x | Number | 3
|
||||||
(jerry-debugger) variables 2
|
(jerry-debugger) variables 2
|
||||||
name | type | value
|
name | type | value
|
||||||
addThree | Function |
|
addThree | Function |
|
||||||
f | Function |
|
f | Function |
|
||||||
addX | Function |
|
addX | Function |
|
||||||
z | Number | 5
|
z | Number | 5
|
||||||
c | Number | 4
|
c | Number | 4
|
||||||
print | Function |
|
resourceName | Function |
|
||||||
gc | Function |
|
print | Function |
|
||||||
assert | Function |
|
gc | Function |
|
||||||
|
assert | Function |
|
||||||
(jerry-debugger) b tests/debugger/do_variables.js:30
|
(jerry-debugger) b tests/debugger/do_variables.js:30
|
||||||
Breakpoint 2 at tests/debugger/do_variables.js:30 (in f() at line:28, col:1)
|
Breakpoint 2 at tests/debugger/do_variables.js:30 (in f() at line:28, col:1)
|
||||||
(jerry-debugger) c
|
(jerry-debugger) c
|
||||||
@@ -58,16 +61,17 @@ level | type
|
|||||||
0 | local
|
0 | local
|
||||||
1 | global
|
1 | global
|
||||||
(jerry-debugger) variables 1
|
(jerry-debugger) variables 1
|
||||||
name | type | value
|
name | type | value
|
||||||
d | Number | 12
|
d | Number | 12
|
||||||
addThree | Function |
|
addThree | Function |
|
||||||
f | Function |
|
f | Function |
|
||||||
addX | Function |
|
addX | Function |
|
||||||
z | Number | 5
|
z | Number | 5
|
||||||
c | Number | 4
|
c | Number | 4
|
||||||
print | Function |
|
resourceName | Function |
|
||||||
gc | Function |
|
print | Function |
|
||||||
assert | Function |
|
gc | Function |
|
||||||
|
assert | Function |
|
||||||
(jerry-debugger) variables 0
|
(jerry-debugger) variables 0
|
||||||
name | type | value
|
name | type | value
|
||||||
b | undefined | undefined
|
b | undefined | undefined
|
||||||
|
|||||||
@@ -51,4 +51,4 @@ try {
|
|||||||
/* Check properties of a */
|
/* Check properties of a */
|
||||||
assert(Object.keys(a) == "one,two");
|
assert(Object.keys(a) == "one,two");
|
||||||
/* Check properties of global object */
|
/* Check properties of global object */
|
||||||
assert(Object.keys(this) == "assert,gc,print,a,fail,fail_two");
|
assert(Object.keys(this) == "assert,gc,print,resourceName,a,fail,fail_two");
|
||||||
|
|||||||
@@ -0,0 +1,127 @@
|
|||||||
|
/* Copyright JS Foundation and other contributors, http://js.foundation
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
#include "jerryscript.h"
|
||||||
|
#include "test-common.h"
|
||||||
|
|
||||||
|
static jerry_value_t
|
||||||
|
resource_name_handler (const jerry_value_t function_obj, /**< function object */
|
||||||
|
const jerry_value_t this_val, /**< this value */
|
||||||
|
const jerry_value_t args_p[], /**< argument list */
|
||||||
|
const jerry_length_t args_count) /**< argument count */
|
||||||
|
{
|
||||||
|
(void) function_obj;
|
||||||
|
(void) this_val;
|
||||||
|
|
||||||
|
jerry_value_t undefined_value = jerry_create_undefined ();
|
||||||
|
jerry_value_t resource_name = jerry_get_resource_name (args_count > 0 ? args_p[0] : undefined_value);
|
||||||
|
jerry_release_value (undefined_value);
|
||||||
|
|
||||||
|
return resource_name;
|
||||||
|
} /* resource_name_handler */
|
||||||
|
|
||||||
|
int
|
||||||
|
main (void)
|
||||||
|
{
|
||||||
|
TEST_INIT ();
|
||||||
|
|
||||||
|
if (!jerry_is_feature_enabled (JERRY_FEATURE_LINE_INFO))
|
||||||
|
{
|
||||||
|
jerry_port_log (JERRY_LOG_LEVEL_ERROR, "Line info support is disabled!\n");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
jerry_init (JERRY_INIT_EMPTY);
|
||||||
|
|
||||||
|
jerry_value_t global = jerry_get_global_object ();
|
||||||
|
|
||||||
|
/* Register the "resourceName" method. */
|
||||||
|
{
|
||||||
|
jerry_value_t func = jerry_create_external_function (resource_name_handler);
|
||||||
|
jerry_value_t name = jerry_create_string ((const jerry_char_t *) "resourceName");
|
||||||
|
jerry_value_t result = jerry_set_property (global, name, func);
|
||||||
|
jerry_release_value (result);
|
||||||
|
jerry_release_value (name);
|
||||||
|
jerry_release_value (func);
|
||||||
|
}
|
||||||
|
|
||||||
|
jerry_release_value (global);
|
||||||
|
|
||||||
|
const char *source_1 = ("function f1 () {\n"
|
||||||
|
" if (resourceName() !== 'demo1.js') return false; \n"
|
||||||
|
" if (resourceName(f1) !== 'demo1.js') return false; \n"
|
||||||
|
" if (resourceName(5) !== '<anonymous>') return false; \n"
|
||||||
|
" return f1; \n"
|
||||||
|
"} \n"
|
||||||
|
"f1();");
|
||||||
|
const char *resource_1 = "demo1.js";
|
||||||
|
|
||||||
|
jerry_value_t program = jerry_parse ((const jerry_char_t *) resource_1,
|
||||||
|
strlen (resource_1),
|
||||||
|
(const jerry_char_t *) source_1,
|
||||||
|
strlen (source_1),
|
||||||
|
JERRY_PARSE_NO_OPTS);
|
||||||
|
TEST_ASSERT (!jerry_value_is_error (program));
|
||||||
|
|
||||||
|
jerry_value_t run_result = jerry_run (program);
|
||||||
|
TEST_ASSERT (!jerry_value_is_error (run_result));
|
||||||
|
TEST_ASSERT (jerry_value_is_object (run_result));
|
||||||
|
|
||||||
|
jerry_value_t resource_value = jerry_get_resource_name (run_result);
|
||||||
|
jerry_value_t resource1_name_value = jerry_create_string ((const jerry_char_t *) resource_1);
|
||||||
|
TEST_ASSERT (jerry_binary_operation (JERRY_BIN_OP_STRICT_EQUAL, resource_value, resource1_name_value));
|
||||||
|
jerry_release_value (resource1_name_value);
|
||||||
|
jerry_release_value (resource_value);
|
||||||
|
|
||||||
|
jerry_release_value (run_result);
|
||||||
|
jerry_release_value (program);
|
||||||
|
|
||||||
|
const char *source_2 = ("function f2 () { \n"
|
||||||
|
" if (resourceName() !== 'demo2.js') return false; \n"
|
||||||
|
" if (resourceName(f2) !== 'demo2.js') return false; \n"
|
||||||
|
" if (resourceName(f1) !== 'demo1.js') return false; \n"
|
||||||
|
" if (resourceName(Object.prototype) !== '<anonymous>') return false; \n"
|
||||||
|
" if (resourceName(Function) !== '<anonymous>') return false; \n"
|
||||||
|
" return f2; \n"
|
||||||
|
"} \n"
|
||||||
|
"f2(); \n");
|
||||||
|
const char *resource_2 = "demo2.js";
|
||||||
|
|
||||||
|
|
||||||
|
program = jerry_parse ((const jerry_char_t *) resource_2,
|
||||||
|
strlen (resource_2),
|
||||||
|
(const jerry_char_t *) source_2,
|
||||||
|
strlen (source_2),
|
||||||
|
JERRY_PARSE_NO_OPTS);
|
||||||
|
TEST_ASSERT (!jerry_value_is_error (program));
|
||||||
|
|
||||||
|
run_result = jerry_run (program);
|
||||||
|
TEST_ASSERT (!jerry_value_is_error (run_result));
|
||||||
|
TEST_ASSERT (jerry_value_is_object (run_result));
|
||||||
|
|
||||||
|
resource_value = jerry_get_resource_name (run_result);
|
||||||
|
jerry_value_t resource2_name_value = jerry_create_string ((const jerry_char_t *) resource_2);
|
||||||
|
TEST_ASSERT (jerry_binary_operation (JERRY_BIN_OP_STRICT_EQUAL, resource_value, resource2_name_value));
|
||||||
|
jerry_release_value (resource2_name_value);
|
||||||
|
jerry_release_value (resource_value);
|
||||||
|
|
||||||
|
jerry_release_value (run_result);
|
||||||
|
jerry_release_value (program);
|
||||||
|
|
||||||
|
jerry_cleanup ();
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
} /* main */
|
||||||
Reference in New Issue
Block a user