Skip to content

Remove the built-in print function #1749

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions docs/03.API-EXAMPLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,38 +173,38 @@ created by API functions has the error flag set.
The following example function will output a JavaScript value:

```c
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#include "jerryscript.h"
#include "jerryscript-port.h"

static void
print_value (const jerry_value_t value)
{
if (jerry_value_is_undefined (value))
{
jerry_port_console ("undefined");
printf ("undefined");
}
else if (jerry_value_is_null (value))
{
jerry_port_console ("null");
printf ("null");
}
else if (jerry_value_is_boolean (value))
{
if (jerry_get_boolean_value (value))
{
jerry_port_console ("true");
printf ("true");
}
else
{
jerry_port_console ("false");
printf ("false");
}
}
/* Float value */
else if (jerry_value_is_number (value))
{
jerry_port_console ("number");
printf ("number");
}
/* String value */
else if (jerry_value_is_string (value))
Expand All @@ -216,15 +216,15 @@ print_value (const jerry_value_t value)
jerry_string_to_char_buffer (value, str_buf_p, req_sz);
str_buf_p[req_sz] = '\0';

jerry_port_console ("%s", (const char *) str_buf_p);
printf ("%s", (const char *) str_buf_p);
}
/* Object reference */
else if (jerry_value_is_object (value))
{
jerry_port_console ("[JS object]");
printf ("[JS object]");
}

jerry_port_console ("\n");
printf ("\n");
}
```

Expand All @@ -243,11 +243,11 @@ Shell operation can be described with the following loop:
- loop.

```c
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#include "jerryscript.h"
#include "jerryscript-port.h"

static void print_value (const jerry_value_t);

Expand All @@ -265,7 +265,7 @@ main (int argc, char *argv[])
char *cmd_tail = cmd;
size_t len = 0;

jerry_port_console ("> ");
printf ("> ");

/* Read next command */
while (true)
Expand Down Expand Up @@ -302,7 +302,7 @@ main (int argc, char *argv[])
{
/* Evaluated JS code thrown an exception
* and didn't handle it with try-catch-finally */
jerry_port_console ("Unhandled JS exception occured: ");
printf ("Unhandled JS exception occured: ");
}

print_value (ret_val);
Expand Down
27 changes: 0 additions & 27 deletions docs/05.PORT-API.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,6 @@ typedef enum
These are the only I/O functions jerry calls.

```c
/**
* 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 *fmt, ...);

/**
* Jerry log levels. The levels are in severity order
* where the most serious levels come first.
Expand Down Expand Up @@ -133,19 +119,6 @@ void jerry_port_fatal (jerry_fatal_code_t code)
#include <stdarg.h>
#include "jerryscript-port.h"

/**
* Provide console message implementation for the engine.
*/
void
jerry_port_console (const char *format, /**< format string */
...) /**< parameters */
{
va_list args;
va_start (args, format);
vfprintf (stdout, format, args);
va_end (args);
} /* jerry_port_console */

/**
* Provide log message implementation for the engine.
*
Expand Down
89 changes: 0 additions & 89 deletions jerry-core/ecma/builtin-objects/ecma-builtin-global.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down
3 changes: 0 additions & 3 deletions jerry-core/ecma/builtin-objects/ecma-builtin-global.inc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
14 changes: 0 additions & 14 deletions jerry-core/jerryscript-port.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion jerry-core/lit/lit-magic-strings.inc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion jerry-core/lit/lit-magic-strings.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions jerry-main/main-unix-minimal.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ read_file (const char *file_name,
static void
print_help (char *name)
{
jerry_port_console ("Usage: %s [OPTION]... [FILE]...\n"
"\n"
"Options:\n"
" -h, --help\n"
"\n",
name);
printf ("Usage: %s [OPTION]... [FILE]...\n"
"\n"
"Options:\n"
" -h, --help\n"
"\n",
name);
} /* print_help */

int
Expand Down
Loading