Remove the built-in print and the jerry_port_console port API functions (#1749)
The built-in `print` is removed from jerry-core, but an external `print` implementation is added to jerry-main. From now on, all embedders of the engine have to implement their own `print` if they need such a functionality. For printing results in REPL mode of jerry-main, the external `print` handler is called directly instead of looking up the `print` function registered into the global object. (The two are the same, but the indirection is not needed anymore.) Because jerry-core does not contain `print` anymore, `jerry_port_console` is removed from the port API. The default port is updated, i.e., the implementation of `jerry_port_console` is removed. Additionally, all references to `jerry_port_console` in jerry-main are replaced by `printf`. Speculatively, `jerry_port_console` is also removed from all non-default targets. Most targets implemented it for the sake of the engine only; in those targets the removal was trivial. Where the function was called from the embedder application as well, the calls were replaced with equivalents (e.g., `printf`, `printk`). NOTE 1: This is a breaking change! NOTE 2: This patch still leaves several targets without a JS `print` implementation. JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu
This commit is contained in:
@@ -47,95 +47,6 @@
|
||||
* @{
|
||||
*/
|
||||
|
||||
/**
|
||||
* The implementation-defined Global object's 'print' routine
|
||||
*
|
||||
* The routine converts all of its arguments to strings and outputs them using 'jerry_port_console'.
|
||||
*
|
||||
* Code points, with except of NUL character, that are representable with one utf8-byte
|
||||
* are outputted as is, using "%c" format argument, and other code points are outputted as "\uhhll",
|
||||
* where hh and ll are values of code point's high and low bytes, correspondingly.
|
||||
*
|
||||
* @return ecma value
|
||||
* Returned value must be freed with ecma_free_value.
|
||||
*/
|
||||
static ecma_value_t
|
||||
ecma_builtin_global_object_print (ecma_value_t this_arg, /**< this argument */
|
||||
const ecma_value_t args[], /**< arguments list */
|
||||
ecma_length_t args_number) /**< number of arguments */
|
||||
{
|
||||
JERRY_UNUSED (this_arg);
|
||||
ecma_value_t ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_EMPTY);
|
||||
|
||||
for (ecma_length_t arg_index = 0;
|
||||
ecma_is_value_empty (ret_value) && arg_index < args_number;
|
||||
arg_index++)
|
||||
{
|
||||
ECMA_TRY_CATCH (str_value,
|
||||
ecma_op_to_string (args[arg_index]),
|
||||
ret_value);
|
||||
|
||||
ecma_string_t *str_p = ecma_get_string_from_value (str_value);
|
||||
|
||||
lit_utf8_size_t utf8_str_size = ecma_string_get_size (str_p);
|
||||
|
||||
JMEM_DEFINE_LOCAL_ARRAY (utf8_str_p,
|
||||
utf8_str_size,
|
||||
lit_utf8_byte_t);
|
||||
|
||||
ecma_string_to_utf8_bytes (str_p, utf8_str_p, utf8_str_size);
|
||||
|
||||
const lit_utf8_byte_t *utf8_str_curr_p = utf8_str_p;
|
||||
const lit_utf8_byte_t *utf8_str_end_p = utf8_str_p + utf8_str_size;
|
||||
|
||||
while (utf8_str_curr_p < utf8_str_end_p)
|
||||
{
|
||||
ecma_char_t code_unit = lit_utf8_read_next (&utf8_str_curr_p);
|
||||
|
||||
if (code_unit == LIT_CHAR_NULL)
|
||||
{
|
||||
jerry_port_console ("\\u0000");
|
||||
}
|
||||
else if (code_unit <= LIT_UTF8_1_BYTE_CODE_POINT_MAX)
|
||||
{
|
||||
jerry_port_console ("%c", (char) code_unit);
|
||||
}
|
||||
else
|
||||
{
|
||||
JERRY_STATIC_ASSERT (sizeof (code_unit) == 2,
|
||||
size_of_code_point_must_be_equal_to_2_bytes);
|
||||
|
||||
uint32_t byte_high = (uint32_t) JRT_EXTRACT_BIT_FIELD (ecma_char_t, code_unit,
|
||||
JERRY_BITSINBYTE,
|
||||
JERRY_BITSINBYTE);
|
||||
uint32_t byte_low = (uint32_t) JRT_EXTRACT_BIT_FIELD (ecma_char_t, code_unit,
|
||||
0,
|
||||
JERRY_BITSINBYTE);
|
||||
|
||||
jerry_port_console ("\\u%02x%02x", (unsigned int) byte_high, (unsigned int) byte_low);
|
||||
}
|
||||
}
|
||||
|
||||
if (arg_index < args_number - 1)
|
||||
{
|
||||
jerry_port_console (" ");
|
||||
}
|
||||
|
||||
JMEM_FINALIZE_LOCAL_ARRAY (utf8_str_p);
|
||||
|
||||
ECMA_FINALIZE (str_value);
|
||||
}
|
||||
|
||||
jerry_port_console ("\n");
|
||||
|
||||
if (ecma_is_value_empty (ret_value))
|
||||
{
|
||||
ret_value = ecma_make_simple_value (ECMA_SIMPLE_VALUE_UNDEFINED);
|
||||
}
|
||||
|
||||
return ret_value;
|
||||
} /* ecma_builtin_global_object_print */
|
||||
|
||||
/**
|
||||
* The Global object's 'eval' routine
|
||||
*
|
||||
|
||||
@@ -200,9 +200,6 @@ OBJECT_VALUE (LIT_MAGIC_STRING_PROMISE_UL,
|
||||
/* Routine properties:
|
||||
* (property name, C routine name, arguments number or NON_FIXED, value of the routine's length property) */
|
||||
|
||||
/* Implementation-defined 'print' routine */
|
||||
ROUTINE (LIT_MAGIC_STRING_PRINT, ecma_builtin_global_object_print, NON_FIXED, 1)
|
||||
|
||||
ROUTINE (LIT_MAGIC_STRING_EVAL, ecma_builtin_global_object_eval, 1, 1)
|
||||
ROUTINE (LIT_MAGIC_STRING_PARSE_FLOAT, ecma_builtin_global_object_parse_float, 1, 1)
|
||||
ROUTINE (LIT_MAGIC_STRING_IS_NAN, ecma_builtin_global_object_is_nan, 1, 1)
|
||||
|
||||
@@ -68,20 +68,6 @@ void jerry_port_fatal (jerry_fatal_code_t code);
|
||||
* I/O Port API
|
||||
*/
|
||||
|
||||
/**
|
||||
* Print a string to the console. The function should implement a printf-like
|
||||
* interface, where the first argument specifies a format string on how to
|
||||
* stringify the rest of the parameter list.
|
||||
*
|
||||
* This function is only called with strings coming from the executed ECMAScript
|
||||
* wanting to print something as the result of its normal operation.
|
||||
*
|
||||
* It should be the port that decides what a "console" is.
|
||||
*
|
||||
* Example: a libc-based port may implement this with vprintf().
|
||||
*/
|
||||
void jerry_port_console (const char *format, ...) __attribute__ ((format (printf, 1, 2)));
|
||||
|
||||
/**
|
||||
* Jerry log levels. The levels are in severity order
|
||||
* where the most serious levels come first.
|
||||
|
||||
@@ -192,7 +192,6 @@ LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_MATCH, "match")
|
||||
|| !defined (CONFIG_DISABLE_JSON_BUILTIN)
|
||||
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PARSE, "parse")
|
||||
#endif
|
||||
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_PRINT, "print")
|
||||
#if !defined (CONFIG_DISABLE_MATH_BUILTIN)
|
||||
LIT_MAGIC_STRING_DEF (LIT_MAGIC_STRING_ROUND, "round")
|
||||
#endif
|
||||
|
||||
@@ -105,7 +105,6 @@ LIT_MAGIC_STRING_INPUT = "input"
|
||||
LIT_MAGIC_STRING_IS_NAN = "isNaN"
|
||||
LIT_MAGIC_STRING_MATCH = "match"
|
||||
LIT_MAGIC_STRING_PARSE = "parse"
|
||||
LIT_MAGIC_STRING_PRINT = "print"
|
||||
LIT_MAGIC_STRING_ROUND = "round"
|
||||
LIT_MAGIC_STRING_SHIFT = "shift"
|
||||
LIT_MAGIC_STRING_SLICE = "slice"
|
||||
|
||||
Reference in New Issue
Block a user