[njs] Added "lineNumber" and "fileName" to SyntaxError.
Dmitry Volyntsev
xeioex at nginx.com
Tue Apr 14 12:41:32 UTC 2020
details: https://hg.nginx.org/njs/rev/a46c221089c0
branches:
changeset: 1370:a46c221089c0
user: Dmitry Volyntsev <xeioex at nginx.com>
date: Sun Apr 12 12:56:25 2020 +0000
description:
Added "lineNumber" and "fileName" to SyntaxError.
diffstat:
src/njs_parser.c | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diffs (42 lines):
diff -r 089a13ecbe83 -r a46c221089c0 src/njs_parser.c
--- a/src/njs_parser.c Sun Apr 12 10:01:40 2020 +0000
+++ b/src/njs_parser.c Sun Apr 12 12:56:25 2020 +0000
@@ -2320,10 +2320,15 @@ static void
njs_parser_scope_error(njs_vm_t *vm, njs_parser_scope_t *scope,
njs_object_type_t type, uint32_t line, const char *fmt, va_list args)
{
- size_t width;
- u_char msg[NJS_MAX_ERROR_STR];
- u_char *p, *end;
- njs_str_t *file;
+ size_t width;
+ u_char msg[NJS_MAX_ERROR_STR];
+ u_char *p, *end;
+ njs_str_t *file;
+ njs_int_t ret;
+ njs_value_t value;
+
+ static const njs_value_t file_name = njs_string("fileName");
+ static const njs_value_t line_number = njs_string("lineNumber");
file = &scope->file;
@@ -2346,6 +2351,18 @@ njs_parser_scope_error(njs_vm_t *vm, njs
}
njs_error_new(vm, &vm->retval, type, msg, p - msg);
+
+ njs_set_number(&value, line);
+ njs_value_property_set(vm, &vm->retval, njs_value_arg(&line_number),
+ &value);
+
+ if (file->length != 0) {
+ ret = njs_string_set(vm, &value, file->start, file->length);
+ if (ret == NJS_OK) {
+ njs_value_property_set(vm, &vm->retval, njs_value_arg(&file_name),
+ &value);
+ }
+ }
}
More information about the nginx-devel
mailing list