From: hongzhidao Date: Mon, 20 May 2019 08:05:58 +0000 (+0800) Subject: Style. X-Git-Tag: 0.3.2~1 X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=b80bbe348599e250241d4de7c48c66bfeb8c066f;p=njs.git Style. --- diff --git a/njs/njs_builtin.c b/njs/njs_builtin.c index d40c7378..14e03d1c 100644 --- a/njs/njs_builtin.c +++ b/njs/njs_builtin.c @@ -30,11 +30,11 @@ static nxt_array_t *njs_vm_expression_completions(njs_vm_t *vm, static nxt_array_t *njs_object_completions(njs_vm_t *vm, njs_object_t *object); -const njs_object_init_t njs_njs_object_init; -const njs_object_init_t njs_global_this_init; +const njs_object_init_t njs_njs_object_init; +const njs_object_init_t njs_global_this_init; -const njs_object_init_t *njs_object_init[] = { +const njs_object_init_t *njs_object_init[] = { &njs_global_this_init, /* global this */ &njs_njs_object_init, /* global njs object */ &njs_math_object_init, /* Math */ @@ -43,9 +43,9 @@ const njs_object_init_t *njs_object_init[] = { }; -const njs_object_init_t *njs_module_init[] = { - &njs_fs_object_init, /* fs */ - &njs_crypto_object_init, /* crypto */ +const njs_object_init_t *njs_module_init[] = { + &njs_fs_object_init, /* fs */ + &njs_crypto_object_init, /* crypto */ NULL }; @@ -73,7 +73,7 @@ const njs_object_init_t *njs_prototype_init[] = { }; -const njs_object_init_t *njs_constructor_init[] = { +const njs_object_init_t *njs_constructor_init[] = { &njs_object_constructor_init, &njs_array_constructor_init, &njs_boolean_constructor_init, @@ -97,7 +97,7 @@ const njs_object_init_t *njs_constructor_init[] = { }; -const njs_object_init_t *njs_function_init[] = { +const njs_object_init_t *njs_function_init[] = { &njs_eval_function_init, &njs_to_string_function_init, &njs_is_nan_function_init, @@ -165,6 +165,7 @@ const njs_function_init_t njs_native_constructors[] = { { njs_memory_error_constructor, { NJS_SKIP_ARG, NJS_STRING_ARG } }, }; + const njs_object_prototype_t njs_prototype_values[] = { /* * GCC 4 complains about uninitialized .shared field, diff --git a/njs/njs_builtin.h b/njs/njs_builtin.h index a5169b3d..8c169f22 100644 --- a/njs/njs_builtin.h +++ b/njs/njs_builtin.h @@ -13,4 +13,5 @@ extern const njs_object_init_t *njs_module_init[]; extern const njs_object_init_t *njs_prototype_init[]; extern const njs_object_init_t *njs_constructor_init[]; + #endif /* _NJS_BUILTIN_H_INCLUDED_ */ diff --git a/njs/njs_parser_terminal.c b/njs/njs_parser_terminal.c index 72226c0e..8e975097 100644 --- a/njs/njs_parser_terminal.c +++ b/njs/njs_parser_terminal.c @@ -805,7 +805,7 @@ njs_parser_template_expression(njs_vm_t *vm, njs_parser_t *parser) if (token != NJS_TOKEN_CLOSE_BRACE) { njs_parser_syntax_error(vm, parser, - "Missing \"}\" in template expression"); + "Missing \"}\" in template expression"); return NXT_ERROR; } diff --git a/njs/njs_vm.h b/njs/njs_vm.h index 342d7beb..e1e18353 100644 --- a/njs/njs_vm.h +++ b/njs/njs_vm.h @@ -894,6 +894,7 @@ typedef enum { #define njs_is_callee_argument_index(index) \ (((index) & NJS_SCOPE_CALLEE_ARGUMENTS) == NJS_SCOPE_CALLEE_ARGUMENTS) + enum njs_prototypes_e { NJS_PROTOTYPE_OBJECT = 0, NJS_PROTOTYPE_ARRAY,