Part I: Implement ES2015 module system. (#2599)
JerryScript-DCO-1.0-Signed-off-by: Daniel Vince vinced@inf.u-szeged.hu
This commit is contained in:
Daniel Vince
committed by
László Langó
László Langó
parent
3d3e6fdf58
commit
4123f35a3b
@@ -61,6 +61,10 @@ ecma_finalize (void)
|
||||
{
|
||||
jmem_unregister_free_unused_memory_callback (ecma_free_unused_memory);
|
||||
|
||||
#ifndef CONFIG_DISABLE_ES2015_MODULE_SYSTEM
|
||||
ecma_module_finalize_lex_envs ();
|
||||
#endif /* !CONFIG_DISABLE_ES2015_MODULE_SYSTEM */
|
||||
|
||||
ecma_finalize_global_lex_env ();
|
||||
ecma_finalize_builtins ();
|
||||
ecma_gc_run (JMEM_FREE_UNUSED_MEMORY_SEVERITY_LOW);
|
||||
|
||||
@@ -0,0 +1,258 @@
|
||||
/* 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.h"
|
||||
#include "jcontext.h"
|
||||
|
||||
#include "ecma-helpers.h"
|
||||
#include "ecma-function-object.h"
|
||||
#include "ecma-literal-storage.h"
|
||||
#include "ecma-lex-env.h"
|
||||
#include "ecma-gc.h"
|
||||
#include "ecma-module.h"
|
||||
#include "vm.h"
|
||||
|
||||
#ifndef CONFIG_DISABLE_ES2015_MODULE_SYSTEM
|
||||
|
||||
/**
|
||||
* Check if property is exported from the script.
|
||||
* @returns the export name - if the given property is exported
|
||||
* NULL - otherwise
|
||||
*/
|
||||
static parser_module_names_t *
|
||||
ecma_parser_module_is_property_exported (ecma_string_t *property_name_p, /**< property name */
|
||||
parser_module_node_t *export_node_p) /**< export node */
|
||||
{
|
||||
parser_module_names_t *current_p = export_node_p->module_names_p;
|
||||
|
||||
if (current_p == NULL)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
for (uint16_t i = 0; i < export_node_p->module_request_count; i++)
|
||||
{
|
||||
parser_module_names_t *next_p = current_p->next_p;
|
||||
|
||||
bool found = ecma_compare_ecma_strings (current_p->local_name_p, property_name_p);
|
||||
|
||||
if (found)
|
||||
{
|
||||
return current_p;
|
||||
}
|
||||
current_p = next_p;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
} /* ecma_parser_module_is_property_exported */
|
||||
|
||||
/**
|
||||
* Compare property name with imports.
|
||||
* @return the export name - if the exported property is imported
|
||||
* NULL - otherwise
|
||||
*/
|
||||
static parser_module_names_t *
|
||||
ecma_parser_module_compare_property_name_with_import (parser_module_node_t *module_node_p, /**< module node */
|
||||
parser_module_names_t *export_names_p) /**< export names */
|
||||
{
|
||||
parser_module_names_t *current_p = module_node_p->module_names_p;
|
||||
|
||||
if (current_p == NULL)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
for (uint16_t i = 0; i < module_node_p->module_request_count; i++)
|
||||
{
|
||||
parser_module_names_t *next_p = current_p->next_p;
|
||||
|
||||
if (ecma_compare_ecma_strings (current_p->local_name_p, export_names_p->import_name_p))
|
||||
{
|
||||
return current_p;
|
||||
}
|
||||
|
||||
current_p = next_p;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
} /* ecma_parser_module_compare_property_name_with_import */
|
||||
|
||||
/**
|
||||
* Connect the imported script's properties to the main script.
|
||||
*/
|
||||
static void
|
||||
ecma_module_connect_properties (ecma_object_t *scope_p) /** scope_p */
|
||||
{
|
||||
JERRY_ASSERT (ecma_is_lexical_environment (scope_p));
|
||||
JERRY_ASSERT (ecma_get_lex_env_type (scope_p) == ECMA_LEXICAL_ENVIRONMENT_DECLARATIVE);
|
||||
|
||||
parser_module_context_t *module_context_p = JERRY_CONTEXT (module_top_context_p);
|
||||
|
||||
if (module_context_p == NULL || module_context_p->exports_p == NULL || module_context_p->imports_p == NULL)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
ecma_object_t *global_obj_p = ecma_builtin_get (ECMA_BUILTIN_ID_GLOBAL);
|
||||
ecma_property_header_t *module_properties_p = ecma_get_property_list (scope_p);
|
||||
|
||||
while (module_properties_p != NULL)
|
||||
{
|
||||
ecma_property_pair_t *prop_pair_p = (ecma_property_pair_t *) module_properties_p;
|
||||
|
||||
for (int i = 0; i < ECMA_PROPERTY_PAIR_ITEM_COUNT; i++)
|
||||
{
|
||||
ecma_property_t *property_p = (ecma_property_t *) (module_properties_p->types + i);
|
||||
|
||||
if (ECMA_PROPERTY_GET_NAME_TYPE (*property_p) == ECMA_DIRECT_STRING_MAGIC
|
||||
&& prop_pair_p->names_cp[i] >= LIT_NON_INTERNAL_MAGIC_STRING__COUNT)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
ecma_string_t *prop_name_p = ecma_string_from_property_name (*property_p, prop_pair_p->names_cp[i]);
|
||||
|
||||
parser_module_names_t *exported_name_p = ecma_parser_module_is_property_exported (prop_name_p,
|
||||
module_context_p->exports_p);
|
||||
|
||||
if (exported_name_p == NULL)
|
||||
{
|
||||
ecma_deref_ecma_string (prop_name_p);
|
||||
continue;
|
||||
}
|
||||
|
||||
parser_module_names_t *new_name_p =
|
||||
ecma_parser_module_compare_property_name_with_import (module_context_p->imports_p,
|
||||
exported_name_p);
|
||||
|
||||
if (new_name_p != NULL)
|
||||
{
|
||||
ecma_property_t *new_property_p;
|
||||
ecma_create_named_data_property (global_obj_p,
|
||||
new_name_p->import_name_p,
|
||||
ECMA_PROPERTY_NOT_WRITABLE,
|
||||
&new_property_p);
|
||||
|
||||
ecma_named_data_property_assign_value (global_obj_p,
|
||||
ECMA_PROPERTY_VALUE_PTR (new_property_p),
|
||||
prop_pair_p->values[i].value);
|
||||
|
||||
}
|
||||
ecma_deref_ecma_string (prop_name_p);
|
||||
}
|
||||
|
||||
module_properties_p = ECMA_GET_POINTER (ecma_property_header_t,
|
||||
module_properties_p->next_property_cp);
|
||||
}
|
||||
|
||||
ecma_module_add_lex_env (scope_p);
|
||||
parser_module_free_saved_names (module_context_p->exports_p);
|
||||
} /* ecma_module_connect_properties */
|
||||
|
||||
/**
|
||||
* Run an EcmaScript module loaded by ecma_module_load_modules.
|
||||
*/
|
||||
static parser_error_t
|
||||
ecma_parser_module_run (const char *file_path_p, /**< file path */
|
||||
size_t path_size, /**< length of the path */
|
||||
const char *source_p, /**< module source */
|
||||
size_t source_size, /**< length of the source */
|
||||
parser_module_node_t *module_node_p) /**< module node */
|
||||
{
|
||||
parser_module_node_t export_node;
|
||||
memset (&export_node, 0, sizeof (parser_module_node_t));
|
||||
|
||||
parser_module_context_t module_context;
|
||||
module_context.imports_p = module_node_p;
|
||||
module_context.exports_p = &export_node;
|
||||
|
||||
parser_module_context_t *prev_module_context_p = JERRY_CONTEXT (module_top_context_p);
|
||||
JERRY_CONTEXT (module_top_context_p) = &module_context;
|
||||
|
||||
jerry_value_t ret_value = jerry_parse ((jerry_char_t *) file_path_p,
|
||||
path_size,
|
||||
(jerry_char_t *) source_p,
|
||||
source_size,
|
||||
JERRY_PARSE_STRICT_MODE);
|
||||
|
||||
|
||||
if (jerry_value_is_error (ret_value))
|
||||
{
|
||||
jerry_release_value (ret_value);
|
||||
return PARSER_ERR_MODULE_REQUEST_NOT_FOUND;
|
||||
}
|
||||
|
||||
parser_error_t error = PARSER_ERR_NO_ERROR;
|
||||
|
||||
jerry_value_t func_val = ret_value;
|
||||
ecma_object_t *func_obj_p = ecma_get_object_from_value (func_val);
|
||||
|
||||
JERRY_ASSERT (ecma_get_object_type (func_obj_p) == ECMA_OBJECT_TYPE_FUNCTION);
|
||||
|
||||
ecma_object_t *scope_p = ecma_create_decl_lex_env (ecma_get_global_environment ());
|
||||
ret_value = vm_run_module (ecma_op_function_get_compiled_code ((ecma_extended_object_t *) func_obj_p), scope_p);
|
||||
|
||||
if (jerry_value_is_error (ret_value))
|
||||
{
|
||||
jerry_release_value (ret_value);
|
||||
error = PARSER_ERR_MODULE_REQUEST_NOT_FOUND;
|
||||
}
|
||||
|
||||
ecma_module_connect_properties (scope_p);
|
||||
jerry_release_value (func_val);
|
||||
|
||||
JERRY_CONTEXT (module_top_context_p) = prev_module_context_p;
|
||||
return error;
|
||||
} /* ecma_parser_module_run */
|
||||
|
||||
/**
|
||||
* Load imported modules.
|
||||
*/
|
||||
void
|
||||
ecma_module_load_modules (parser_context_t *context_p) /**< parser context */
|
||||
{
|
||||
parser_module_node_t *current_p = context_p->module_context_p->imports_p;
|
||||
|
||||
while (current_p != NULL)
|
||||
{
|
||||
uint8_t *script_path_p = current_p->script_path.value_p;
|
||||
prop_length_t path_length = current_p->script_path.length;
|
||||
|
||||
size_t size = 0;
|
||||
uint8_t *buffer_p = jerry_port_read_source ((const char *) script_path_p, &size);
|
||||
|
||||
if (buffer_p == NULL)
|
||||
{
|
||||
parser_raise_error (context_p, PARSER_ERR_FILE_NOT_FOUND);
|
||||
}
|
||||
|
||||
parser_error_t error = ecma_parser_module_run ((const char *) script_path_p,
|
||||
path_length,
|
||||
(const char *) buffer_p,
|
||||
size,
|
||||
current_p);
|
||||
|
||||
jerry_port_release_source (buffer_p);
|
||||
|
||||
if (error != PARSER_ERR_NO_ERROR)
|
||||
{
|
||||
parser_raise_error (context_p, error);
|
||||
}
|
||||
|
||||
current_p = current_p->next_p;
|
||||
}
|
||||
} /* ecma_module_load_modules */
|
||||
|
||||
#endif /* !CONFIG_DISABLE_ES2015_MODULE_SYSTEM */
|
||||
@@ -0,0 +1,27 @@
|
||||
/* 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.
|
||||
*/
|
||||
|
||||
#ifndef ECMA_MODULE_H
|
||||
#define ECMA_MODULE_H
|
||||
|
||||
#include "js-parser-internal.h"
|
||||
|
||||
#ifndef CONFIG_DISABLE_ES2015_MODULE_SYSTEM
|
||||
|
||||
void ecma_module_load_modules (parser_context_t *context_p);
|
||||
|
||||
#endif /* !CONFIG_DISABLE_ES2015_MODULE_SYSTEM */
|
||||
|
||||
#endif /* !ECMA_MODULE_H */
|
||||
Reference in New Issue
Block a user