Added njs_core.h

diff --git a/Makefile b/Makefile
index c984e04a427d32f8657d748da7e7eb8d470bd28a..8946813f8a8b2395de454e88c1ac82dc7064e93c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -125,6 +125,8 @@ $(NXT_LIB)/nxt_auto_config.h:
 
 $(NXT_BUILDDIR)/njscript.o: \
        $(NXT_BUILDDIR)/libnxt.a \
+       njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_string.h \
        njs/njs_object.h \
@@ -140,6 +142,7 @@ $(NXT_BUILDDIR)/njscript.o: \
 $(NXT_BUILDDIR)/njs_vm.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_number.h \
        njs/njs_string.h \
@@ -173,6 +176,7 @@ $(NXT_BUILDDIR)/njs_boolean.o: \
 $(NXT_BUILDDIR)/njs_number.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_number.h \
        njs/njs_string.h \
@@ -188,6 +192,7 @@ $(NXT_BUILDDIR)/njs_number.o: \
 $(NXT_BUILDDIR)/njs_string.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_number.h \
        njs/njs_string.h \
@@ -206,6 +211,7 @@ $(NXT_BUILDDIR)/njs_string.o: \
 $(NXT_BUILDDIR)/njs_object.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_object.h \
        njs/njs_object_hash.h \
@@ -219,6 +225,7 @@ $(NXT_BUILDDIR)/njs_object.o: \
 $(NXT_BUILDDIR)/njs_array.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_number.h \
        njs/njs_string.h \
@@ -235,6 +242,7 @@ $(NXT_BUILDDIR)/njs_array.o: \
 $(NXT_BUILDDIR)/njs_json.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_object.h \
        njs/njs_json.c \
@@ -247,6 +255,7 @@ $(NXT_BUILDDIR)/njs_json.o: \
 $(NXT_BUILDDIR)/njs_function.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_object.h \
        njs/njs_array.h \
@@ -260,6 +269,7 @@ $(NXT_BUILDDIR)/njs_function.o: \
 $(NXT_BUILDDIR)/njs_regexp.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_string.h \
        njs/njs_object.h \
@@ -276,6 +286,7 @@ $(NXT_BUILDDIR)/njs_regexp.o: \
 $(NXT_BUILDDIR)/njs_date.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_string.h \
        njs/njs_object.h \
@@ -290,6 +301,7 @@ $(NXT_BUILDDIR)/njs_date.o: \
 $(NXT_BUILDDIR)/njs_error.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_string.h \
        njs/njs_object.h \
@@ -304,6 +316,7 @@ $(NXT_BUILDDIR)/njs_error.o: \
 $(NXT_BUILDDIR)/njs_math.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_object.h \
        njs/njs_math.h \
@@ -316,6 +329,7 @@ $(NXT_BUILDDIR)/njs_math.o: \
 $(NXT_BUILDDIR)/njs_time.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_object.h \
        njs/njs_time.h \
@@ -328,6 +342,7 @@ $(NXT_BUILDDIR)/njs_time.o: \
 $(NXT_BUILDDIR)/njs_module.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_module.h \
        njs/njs_module.c \
@@ -339,6 +354,7 @@ $(NXT_BUILDDIR)/njs_module.o: \
 $(NXT_BUILDDIR)/njs_event.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_event.h \
        njs/njs_event.c \
@@ -361,6 +377,7 @@ $(NXT_BUILDDIR)/njs_fs.o: \
 $(NXT_BUILDDIR)/njs_crypto.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_crypto.h \
        njs/njs_crypto.c \
@@ -372,6 +389,7 @@ $(NXT_BUILDDIR)/njs_crypto.o: \
 $(NXT_BUILDDIR)/njs_extern.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_parser.h \
        njs/njs_extern.h \
@@ -384,6 +402,7 @@ $(NXT_BUILDDIR)/njs_extern.o: \
 $(NXT_BUILDDIR)/njs_variable.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_parser.h \
        njs/njs_variable.h \
@@ -396,6 +415,7 @@ $(NXT_BUILDDIR)/njs_variable.o: \
 $(NXT_BUILDDIR)/njs_builtin.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_boolean.h \
        njs/njs_number.h \
@@ -415,6 +435,7 @@ $(NXT_BUILDDIR)/njs_builtin.o: \
 $(NXT_BUILDDIR)/njs_lexer.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_parser.h \
        njs/njs_lexer.c \
@@ -439,6 +460,7 @@ $(NXT_BUILDDIR)/njs_lexer_keyword.o: \
 $(NXT_BUILDDIR)/njs_parser.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_string.h \
        njs/njs_object.h \
@@ -454,6 +476,7 @@ $(NXT_BUILDDIR)/njs_parser.o: \
 $(NXT_BUILDDIR)/njs_parser_expression.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_number.h \
        njs/njs_object.h \
@@ -469,6 +492,7 @@ $(NXT_BUILDDIR)/njs_parser_expression.o: \
 $(NXT_BUILDDIR)/njs_generator.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_number.h \
        njs/njs_string.h \
@@ -485,6 +509,7 @@ $(NXT_BUILDDIR)/njs_generator.o: \
 $(NXT_BUILDDIR)/njs_disassembler.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
+       njs/njs_core.h \
        njs/njs_vm.h \
        njs/njs_object.h \
        njs/njs_parser.h \

diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c
index fa7a03d66f18cba2cc66d01c1102ca03b1a2469d..3dc12d46ea60fb88a5642f3403e075b2b24c5ea0 100644 (file)
--- a/nginx/ngx_http_js_module.c
+++ b/nginx/ngx_http_js_module.c
@@ -9,13 +9,6 @@
 #include <ngx_core.h>
 #include <ngx_http.h>
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-
 #include <njscript.h>
 
 

diff --git a/nginx/ngx_stream_js_module.c b/nginx/ngx_stream_js_module.c
index 97d5f1452979b0a46990388e58a1adbd07afe9b7..05b9b77d7bff78c5990395b859d09fa249b25dc9 100644 (file)
--- a/nginx/ngx_stream_js_module.c
+++ b/nginx/ngx_stream_js_module.c
@@ -9,13 +9,6 @@
 #include <ngx_core.h>
 #include <ngx_stream.h>
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-
 #include <njscript.h>
 
 

diff --git a/njs/njs.c b/njs/njs.c
index 4ce9e093ddb204c60b558665d583e51cb647ed26..c83b1098d7630e870de8c85880d5c16ccafa5584 100644 (file)
--- a/njs/njs.c
+++ b/njs/njs.c
@@ -4,6 +4,9 @@
  * Copyright (C) NGINX, Inc.
  */
 
+
+#include <njs_core.h>
+#include <njs_builtin.h>
 #include <time.h>
 #include <errno.h>
 #include <string.h>
@@ -13,24 +16,6 @@
 #include <sys/stat.h>
 #include <locale.h>
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_malloc.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_djb_hash.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_object.h>
-#include <njs_builtin.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
-
 #include <readline.h>
 
 

diff --git a/njs/njs_array.c b/njs/njs_array.c
index 4532e8ba9f07bd43eb2f7f9875d8f2355d3006fb..37491f7da3bbf1e1754c9f733456e2deb08a68b2 100644 (file)
--- a/njs/njs_array.c
+++ b/njs/njs_array.c
@@ -4,26 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_array.h>
-#include <njs_function.h>
-#include <njs_error.h>
+#include <njs_core.h>
 #include <string.h>
 
 

diff --git a/njs/njs_boolean.c b/njs/njs_boolean.c
index 745dd4a3da8e24848fc02b02a6487f09e26ab11c..aa704bebc9d002fb70886edd4e2b377970a5492b 100644 (file)
--- a/njs/njs_boolean.c
+++ b/njs/njs_boolean.c
@@ -4,21 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_boolean.h>
-#include <njs_object.h>
-#include <njs_function.h>
-#include <njs_error.h>
+#include <njs_core.h>
 
 
 njs_ret_t

diff --git a/njs/njs_builtin.c b/njs/njs_builtin.c
index 31a97eb521d9243d52715a86b7cd89f7c9f09106..5074b22d4b3414a5b0127992a1e410613025b5b2 100644 (file)
--- a/njs/njs_builtin.c
+++ b/njs/njs_builtin.c
@@ -4,33 +4,12 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_djb_hash.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_boolean.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_array.h>
-#include <njs_json.h>
-#include <njs_function.h>
-#include <njs_variable.h>
-#include <njs_extern.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <njs_regexp.h>
 #include <njs_date.h>
-#include <njs_error.h>
-#include <njs_math.h>
 #include <njs_time.h>
+#include <njs_math.h>
+#include <njs_json.h>
 #include <njs_module.h>
 #include <njs_fs.h>
 #include <njs_crypto.h>

diff --git a/njs/njs_core.h b/njs/njs_core.h
new file mode 100644 (file)
index 0000000..82e3369
--- /dev/null
+++ b/njs/njs_core.h
@@ -0,0 +1,45 @@
+
+/*
+ * Copyright (C) Dmitry Volyntsev
+ * Copyright (C) NGINX, Inc.
+ */
+
+#ifndef _NJS_CORE_H_INCLUDED_
+#define _NJS_CORE_H_INCLUDED_
+
+#include <nxt_auto_config.h>
+
+#include <nxt_types.h>
+#include <nxt_clang.h>
+#include <nxt_alignment.h>
+#include <nxt_string.h>
+#include <nxt_stub.h>
+#include <nxt_utf8.h>
+#include <nxt_djb_hash.h>
+#include <nxt_trace.h>
+#include <nxt_array.h>
+#include <nxt_queue.h>
+#include <nxt_lvlhsh.h>
+#include <nxt_random.h>
+#include <nxt_time.h>
+#include <nxt_malloc.h>
+#include <nxt_mem_cache_pool.h>
+
+#include <njscript.h>
+#include <njs_vm.h>
+#include <njs_variable.h>
+#include <njs_parser.h>
+#include <njs_function.h>
+#include <njs_boolean.h>
+#include <njs_number.h>
+#include <njs_string.h>
+#include <njs_object.h>
+#include <njs_object_hash.h>
+#include <njs_array.h>
+#include <njs_error.h>
+
+#include <njs_event.h>
+
+#include <njs_extern.h>
+
+#endif /* _NJS_CORE_H_INCLUDED_ */

diff --git a/njs/njs_crypto.c b/njs/njs_crypto.c
index c00e29829f2b28b8a0afc2b836af9c62ac2172ba..984f9d3c1a1b36e88d80c9e29f4abb2d6f46a62f 100644 (file)
--- a/njs/njs_crypto.c
+++ b/njs/njs_crypto.c
@@ -4,27 +4,11 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
+#include <njs_core.h>
 #include <nxt_md5.h>
 #include <nxt_sha1.h>
 #include <nxt_sha2.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
 #include <njs_crypto.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_string.h>
-#include <njs_function.h>
-#include <njs_error.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>

diff --git a/njs/njs_date.c b/njs/njs_date.c
index 7977e097c891faf2ca6b5cdbbb463e1ab0eb8567..d43dc967ef491feffadc9746d33f4ee8a0228003 100644 (file)
--- a/njs/njs_date.c
+++ b/njs/njs_date.c
@@ -4,28 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_time.h>
-#include <nxt_malloc.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_function.h>
+#include <njs_core.h>
 #include <njs_date.h>
-#include <njs_error.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>

diff --git a/njs/njs_disassembler.c b/njs/njs_disassembler.c
index 3a406c29c0201f6dc7f8725fb34f38caeed97a2e..8dd466a239f178b02e0f10dc4c0183a28bcba8af 100644 (file)
--- a/njs/njs_disassembler.c
+++ b/njs/njs_disassembler.c
@@ -4,20 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_object.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <stdio.h>
 
 

diff --git a/njs/njs_error.c b/njs/njs_error.c
index a0f3044933a0e181a30527387a9b0e32332330b4..34fe97d8597c181a4e4ce77401bc4e592cef9a4d 100644 (file)
--- a/njs/njs_error.c
+++ b/njs/njs_error.c
@@ -4,23 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_error.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_string.h>
-#include <njs_function.h>
+#include <njs_core.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>

diff --git a/njs/njs_event.c b/njs/njs_event.c
index 5cc0f3d1c2aaf9c01e4bdbb500ad14f7854f948a..d2d4a57ed16cde99877cb6fe7749a9cf93a51808 100644 (file)
--- a/njs/njs_event.c
+++ b/njs/njs_event.c
@@ -4,26 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_djb_hash.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_array.h>
-#include <njs_function.h>
-#include <njs_error.h>
-#include <njs_event.h>
-#include <njs_time.h>
+#include <njs_core.h>
 #include <string.h>
 #include <stdio.h>
 

diff --git a/njs/njs_extern.c b/njs/njs_extern.c
index 21602645e6eb86e50a4f4fc72d444c2f972c8e83..8144bcf6457f3b60a15b1dfd87a4c4206f3ee2f6 100644 (file)
--- a/njs/njs_extern.c
+++ b/njs/njs_extern.c
@@ -4,23 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_utf8.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_extern.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <string.h>
 #include <stdio.h>
 

diff --git a/njs/njs_fs.c b/njs/njs_fs.c
index 9281c5772c8ca84d1e1ea5747a0c979ded8aa887..d1a1db33a651cd142a67a8e74af2da4c05292801 100644 (file)
--- a/njs/njs_fs.c
+++ b/njs/njs_fs.c
@@ -4,24 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_alignment.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_function.h>
-#include <njs_error.h>
+#include <njs_core.h>
 #include <njs_fs.h>
 #include <string.h>
 #include <fcntl.h>

diff --git a/njs/njs_function.c b/njs/njs_function.c
index d3b55794c5eb1013d5cf8d316c7dd068161d43f2..67a491b5f75b7d080a8ffd756781eff67ee81965 100644 (file)
--- a/njs/njs_function.c
+++ b/njs/njs_function.c
@@ -4,23 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_array.h>
-#include <njs_function.h>
-#include <njs_error.h>
+#include <njs_core.h>
 #include <string.h>
 
 

diff --git a/njs/njs_generator.c b/njs/njs_generator.c
index cc3ee547bb8b83ff8a3480b09acbeb5d9310e8d4..689900c519f0c66eafb18e63e799b814789f683b 100644 (file)
--- a/njs/njs_generator.c
+++ b/njs/njs_generator.c
@@ -4,24 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_function.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
-#include <njs_error.h>
+#include <njs_core.h>
 #include <string.h>
 
 

diff --git a/njs/njs_json.c b/njs/njs_json.c
index 24d585ba5d342234ff66fb75a0338031c433647e..173e5105bba703709261268145f7053888bf0a13 100644 (file)
--- a/njs/njs_json.c
+++ b/njs/njs_json.c
@@ -4,26 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_string.h>
-#include <njs_number.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_array.h>
-#include <njs_function.h>
-#include <njs_error.h>
+#include <njs_core.h>
 #include <stdio.h>
 #include <string.h>
 

diff --git a/njs/njs_lexer.c b/njs/njs_lexer.c
index e2cf369aaff80893e80b4152ff94c7f55998d09d..73a009c237a51b11f383c1c24fd425702b0161dc 100644 (file)
--- a/njs/njs_lexer.c
+++ b/njs/njs_lexer.c
@@ -4,21 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <string.h>
 
 

diff --git a/njs/njs_lexer_keyword.c b/njs/njs_lexer_keyword.c
index 939bde297012e6fd5729e70cbde105ee516d2cc4..6933af9364dced35c901cecca725ea1347b43ab7 100644 (file)
--- a/njs/njs_lexer_keyword.c
+++ b/njs/njs_lexer_keyword.c
@@ -4,22 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_object.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <string.h>
 
 

diff --git a/njs/njs_math.c b/njs/njs_math.c
index e2e98396abe481308723cb1b1dc1c2aa14c9f2b6..ea428ca11aa3ddfbea8852590ded3424089a3d96 100644 (file)
--- a/njs/njs_math.c
+++ b/njs/njs_math.c
@@ -4,20 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_mem_cache_pool.h>
-#include <nxt_random.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_object.h>
-#include <njs_function.h>
+#include <njs_core.h>
 #include <math.h>
 
 

diff --git a/njs/njs_module.c b/njs/njs_module.c
index d3dd0f2a54111c3c9e67c87bf179de278f9b900f..0c7f902525b557a2836572e800d9841968efc571 100644 (file)
--- a/njs/njs_module.c
+++ b/njs/njs_module.c
@@ -4,23 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_function.h>
-#include <njs_error.h>
+#include <njs_core.h>
 #include <njs_module.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/njs/njs_number.c b/njs/njs_number.c
index 161c50973e6cd04df74448fa023f5a19fbce0d8f..69622baf6b66ad4764913c7c35945ef21a8718ea 100644 (file)
--- a/njs/njs_number.c
+++ b/njs/njs_number.c
@@ -4,23 +4,8 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_array.h>
-#include <njs_function.h>
-#include <njs_error.h>
+#include <njs_core.h>
+#include <math.h>
 #include <string.h>
 #include <stdio.h>
 #include <float.h>

diff --git a/njs/njs_object.c b/njs/njs_object.c
index 1309bf34c396a3ea1d2b36107ff25c9b7e9de72e..88ad39332df2ef6d8d1dc1e88e769893e0021edb 100644 (file)
--- a/njs/njs_object.c
+++ b/njs/njs_object.c
@@ -4,26 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_number.h>
-#include <njs_array.h>
-#include <njs_extern.h>
-#include <njs_function.h>
-#include <njs_error.h>
+#include <njs_core.h>
 #include <stdio.h>
 #include <string.h>
 

diff --git a/njs/njs_parser.c b/njs/njs_parser.c
index c4c5601cfa93468f31a9860b211fd23163c0f5bc..eba4a00260746ba43da7a277919e9182f571734a 100644 (file)
--- a/njs/njs_parser.c
+++ b/njs/njs_parser.c
@@ -4,27 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_utf8.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <nxt_djb_hash.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_extern.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_function.h>
-#include <njs_error.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <njs_regexp.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/njs/njs_parser_expression.c b/njs/njs_parser_expression.c
index fbe6cb331e584aa24b2c3077991cd86e1dd82001..1b55ee727d676468f3cf1a340f48fb5b20ee6b20 100644 (file)
--- a/njs/njs_parser_expression.c
+++ b/njs/njs_parser_expression.c
@@ -4,25 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_utf8.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_function.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <string.h>
 
 

diff --git a/njs/njs_regexp.c b/njs/njs_regexp.c
index 9b298f18b6b923291017293c9289ca3ba571130a..9295458596975c9db13879dadbdc015562a15b02 100644 (file)
--- a/njs/njs_regexp.c
+++ b/njs/njs_regexp.c
@@ -4,32 +4,10 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_utf8.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_pcre.h>
-#include <nxt_malloc.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_array.h>
-#include <njs_function.h>
-#include <njs_error.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <njs_regexp.h>
 #include <njs_regexp_pattern.h>
+
 #include <string.h>
 #include <stdio.h>
 

diff --git a/njs/njs_regexp_pattern.h b/njs/njs_regexp_pattern.h
index e05ae3c1e22c4349d1b6ed86b955663890245f4d..e14fa5c4703e9c69d7726ca15bba525d56e20f5c 100644 (file)
--- a/njs/njs_regexp_pattern.h
+++ b/njs/njs_regexp_pattern.h
@@ -7,7 +7,8 @@
 #ifndef _NJS_REGEXP_PATTERN_H_INCLUDED_
 #define _NJS_REGEXP_PATTERN_H_INCLUDED_
 
-#include <pcre.h>
+#include <nxt_pcre.h>
+#include <nxt_regex.h>
 
 
 typedef enum {

diff --git a/njs/njs_string.c b/njs/njs_string.c
index 68c433d334fc7150cab6795793c9af931031fead..b438f586fa5261459948ba828035ce6a3714854e 100644 (file)
--- a/njs/njs_string.c
+++ b/njs/njs_string.c
@@ -4,32 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_utf8.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_pcre.h>
-#include <nxt_malloc.h>
-#include <nxt_string.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_array.h>
-#include <njs_function.h>
-#include <njs_error.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <njs_regexp.h>
 #include <njs_regexp_pattern.h>
 #include <string.h>

diff --git a/njs/njs_time.c b/njs/njs_time.c
index d97c80baa9b58e8594dcb319401b868bb9922609..23b5e73ae98d0891bd4554a64929f104f51d8ef5 100644 (file)
--- a/njs/njs_time.c
+++ b/njs/njs_time.c
@@ -4,25 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_djb_hash.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_array.h>
-#include <njs_function.h>
-#include <njs_error.h>
-#include <njs_event.h>
+#include <njs_core.h>
 #include <njs_time.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/njs/njs_variable.c b/njs/njs_variable.c
index 9207c3bd612f0195801316350f89c850f801ff90..022ab8587ff1b3c2be3896587f0b881112aafc07 100644 (file)
--- a/njs/njs_variable.c
+++ b/njs/njs_variable.c
@@ -4,23 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_utf8.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
-#include <njs_error.h>
+#include <njs_core.h>
 #include <string.h>
 
 

diff --git a/njs/njs_vm.c b/njs/njs_vm.c
index 206ea661d2233211977ab0080309c1db97c98302..0119ec534aaa8c871c02d09fbc6576e894e59650 100644 (file)
--- a/njs/njs_vm.c
+++ b/njs/njs_vm.c
@@ -4,30 +4,7 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_utf8.h>
-#include <nxt_djb_hash.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_number.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_object_hash.h>
-#include <njs_array.h>
-#include <njs_function.h>
-#include <njs_error.h>
-#include <njs_extern.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <njs_regexp.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/njs/njs_vm.h b/njs/njs_vm.h
index beb8aba65920acb7ecad3d4a42aacaae34245ced..d160407126127dc15ec82041dec1ca63f90449ab 100644 (file)
--- a/njs/njs_vm.h
+++ b/njs/njs_vm.h
@@ -12,6 +12,8 @@
 #include <nxt_queue.h>
 #include <nxt_regex.h>
 #include <nxt_random.h>
+#include <nxt_djb_hash.h>
+#include <nxt_mem_cache_pool.h>
 
 
 #define NJS_MAX_STACK_SIZE       (16 * 1024 * 1024)

diff --git a/njs/njscript.c b/njs/njscript.c
index 19e407305bde95d84bc28e72c2e426cf43248dc2..ff1ebb3d366853b6b32d5395d08e97606a46b837 100644 (file)
--- a/njs/njscript.c
+++ b/njs/njscript.c
@@ -4,29 +4,9 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_alignment.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_random.h>
-#include <nxt_malloc.h>
-#include <nxt_djb_hash.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
-#include <njs_string.h>
-#include <njs_object.h>
-#include <njs_function.h>
-#include <njs_error.h>
-#include <njs_variable.h>
-#include <njs_parser.h>
+#include <njs_core.h>
 #include <njs_regexp.h>
-#include <njs_event.h>
-#include <njs_time.h>
+
 #include <string.h>
 
 

diff --git a/njs/njscript.h b/njs/njscript.h
index d6fa7b50aee384c24bd3d0d3f2456fbd58823be5..b5ed023ab9dda6d5ff10e8a024155e3805d7ce2f 100644 (file)
--- a/njs/njscript.h
+++ b/njs/njscript.h
@@ -9,9 +9,19 @@
 #ifndef _NJSCRIPT_H_INCLUDED_
 #define _NJSCRIPT_H_INCLUDED_
 
+#include <nxt_auto_config.h>
+
 #define NJS_VERSION                 "0.2.1"
 
 
+#include <nxt_types.h>
+#include <nxt_clang.h>
+#include <nxt_string.h>
+#include <nxt_stub.h>
+#include <nxt_array.h>
+#include <nxt_lvlhsh.h>
+
+
 typedef intptr_t                    njs_ret_t;
 typedef uintptr_t                   njs_index_t;
 typedef struct njs_vm_s             njs_vm_t;

diff --git a/njs/test/njs_benchmark.c b/njs/test/njs_benchmark.c
index efbf46572398b19af75e3f5e90a1456f1515fb8c..4aed05672ebc497e96521814e9f2c8d0bfa1bfa7 100644 (file)
--- a/njs/test/njs_benchmark.c
+++ b/njs/test/njs_benchmark.c
@@ -4,15 +4,9 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_malloc.h>
-#include <nxt_array.h>
 #include <njscript.h>
 #include <string.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <sys/resource.h>
 #include <time.h>

diff --git a/njs/test/njs_interactive_test.c b/njs/test/njs_interactive_test.c
index a477706c41b1adf62e4d7de7b47103d4a5cdac34..3b3e1dfe3c0c2c2d7f38940b463c37f60eb41ef3 100644 (file)
--- a/njs/test/njs_interactive_test.c
+++ b/njs/test/njs_interactive_test.c
@@ -4,13 +4,6 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_malloc.h>
-#include <nxt_array.h>
 #include <njscript.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/njs/test/njs_unit_test.c b/njs/test/njs_unit_test.c
index 3864772ba9bc6e73eef90d0ed98c7246f50aa839..d32c76b40d9d2fd491accae704e0b697e20a5900 100644 (file)
--- a/njs/test/njs_unit_test.c
+++ b/njs/test/njs_unit_test.c
@@ -4,18 +4,9 @@
  * Copyright (C) NGINX, Inc.
  */
 
-#include <nxt_auto_config.h>
-#include <nxt_types.h>
-#include <nxt_clang.h>
-#include <nxt_string.h>
-#include <nxt_stub.h>
-#include <nxt_malloc.h>
-#include <nxt_array.h>
-#include <nxt_lvlhsh.h>
-#include <nxt_mem_cache_pool.h>
-#include <njscript.h>
-#include <njs_vm.h>
+#include <njs_core.h>
 #include <string.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <sys/resource.h>
 #include <time.h>