Fine grain header files inclusions and fixed build dependencies.

diff --git a/Makefile b/Makefile
index 5d9645f0478089573cc9c4ffc466f47768f1cd82..68a6bfb41d14f5ec7e87c592fa60cf2ad785c758 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,8 @@ $(NXT_BUILDDIR)/libnjs.a: \
        $(NXT_BUILDDIR)/njs_array.o \
        $(NXT_BUILDDIR)/njs_function.o \
        $(NXT_BUILDDIR)/njs_regexp.o \
-       $(NXT_BUILDDIR)/njs_variable.o \
        $(NXT_BUILDDIR)/njs_extern.o \
+       $(NXT_BUILDDIR)/njs_variable.o \
        $(NXT_BUILDDIR)/njs_shared.o \
        $(NXT_BUILDDIR)/njs_lexer.o \
        $(NXT_BUILDDIR)/njs_lexer_keyword.o \
@@ -44,8 +44,8 @@ $(NXT_BUILDDIR)/libnjs.a: \
                $(NXT_BUILDDIR)/njs_array.o \
                $(NXT_BUILDDIR)/njs_function.o \
                $(NXT_BUILDDIR)/njs_regexp.o \
-               $(NXT_BUILDDIR)/njs_variable.o \
                $(NXT_BUILDDIR)/njs_extern.o \
+               $(NXT_BUILDDIR)/njs_variable.o \
                $(NXT_BUILDDIR)/njs_shared.o \
                $(NXT_BUILDDIR)/njs_lexer.o \
                $(NXT_BUILDDIR)/njs_lexer_keyword.o \
@@ -84,6 +84,9 @@ tarball:
 $(NXT_BUILDDIR)/njscript.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njs_vm.h \
+       njs/njs_string.h \
+       njs/njs_object.h \
+       njs/njs_function.h \
        njs/njs_parser.h \
        njs/njscript.h \
        njs/njscript.c \
@@ -95,9 +98,17 @@ $(NXT_BUILDDIR)/njscript.o: \
 $(NXT_BUILDDIR)/njs_vm.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
-       njs/njs_parser.h \
-       njs/njs_object_hash.h \
        njs/njs_vm.h \
+       njs/njs_number.h \
+       njs/njs_string.h \
+       njs/njs_object.h \
+       njs/njs_object_hash.h \
+       njs/njs_array.h \
+       njs/njs_function.h \
+       njs/njs_regexp.h \
+       njs/njs_extern.h \
+       njs/njs_variable.h \
+       njs/njs_parser.h \
        njs/njs_vm.c \
 
        $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_vm.o $(NXT_CFLAGS) \
@@ -109,6 +120,10 @@ $(NXT_BUILDDIR)/njs_number.o: \
        njs/njscript.h \
        njs/njs_vm.h \
        njs/njs_number.h \
+       njs/njs_string.h \
+       njs/njs_object.h \
+       njs/njs_array.h \
+       njs/njs_function.h \
        njs/njs_number.c \
 
        $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_number.o $(NXT_CFLAGS) \
@@ -119,9 +134,13 @@ $(NXT_BUILDDIR)/njs_string.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
        njs/njs_vm.h \
-       njs/njs_parser.h \
-       njs/njs_object_hash.h \
+       njs/njs_number.h \
        njs/njs_string.h \
+       njs/njs_object.h \
+       njs/njs_object_hash.h \
+       njs/njs_array.h \
+       njs/njs_function.h \
+       njs/njs_parser.h \
        njs/njs_string.c \
 
        $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_string.o $(NXT_CFLAGS) \
@@ -132,8 +151,9 @@ $(NXT_BUILDDIR)/njs_object.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
        njs/njs_vm.h \
-       njs/njs_object_hash.h \
        njs/njs_object.h \
+       njs/njs_object_hash.h \
+       njs/njs_function.h \
        njs/njs_object.c \
 
        $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_object.o $(NXT_CFLAGS) \
@@ -144,8 +164,12 @@ $(NXT_BUILDDIR)/njs_array.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
        njs/njs_vm.h \
+       njs/njs_number.h \
+       njs/njs_string.h \
+       njs/njs_object.h \
        njs/njs_object_hash.h \
        njs/njs_array.h \
+       njs/njs_function.h \
        njs/njs_array.c \
 
        $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_array.o $(NXT_CFLAGS) \
@@ -156,6 +180,8 @@ $(NXT_BUILDDIR)/njs_function.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
        njs/njs_vm.h \
+       njs/njs_object.h \
+       njs/njs_array.h \
        njs/njs_function.h \
        njs/njs_function.c \
 
@@ -167,7 +193,11 @@ $(NXT_BUILDDIR)/njs_regexp.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
        njs/njs_vm.h \
+       njs/njs_string.h \
+       njs/njs_object.h \
        njs/njs_object_hash.h \
+       njs/njs_array.h \
+       njs/njs_function.h \
        njs/njs_regexp.h \
        njs/njs_regexp.c \
 
@@ -175,34 +205,39 @@ $(NXT_BUILDDIR)/njs_regexp.o: \
                -I$(NXT_LIB) -Injs $(NXT_PCRE_CFLAGS) \
                njs/njs_regexp.c
 
-$(NXT_BUILDDIR)/njs_variable.o: \
+$(NXT_BUILDDIR)/njs_extern.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
        njs/njs_vm.h \
        njs/njs_parser.h \
-       njs/njs_variable.h \
-       njs/njs_variable.c \
+       njs/njs_extern.h \
+       njs/njs_extern.c \
 
-       $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_variable.o $(NXT_CFLAGS) \
+       $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_extern.o $(NXT_CFLAGS) \
                -I$(NXT_LIB) -Injs \
-               njs/njs_variable.c
+               njs/njs_extern.c
 
-$(NXT_BUILDDIR)/njs_extern.o: \
+$(NXT_BUILDDIR)/njs_variable.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
        njs/njs_vm.h \
        njs/njs_parser.h \
-       njs/njs_extern.h \
-       njs/njs_extern.c \
+       njs/njs_variable.h \
+       njs/njs_variable.c \
 
-       $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_extern.o $(NXT_CFLAGS) \
+       $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_variable.o $(NXT_CFLAGS) \
                -I$(NXT_LIB) -Injs \
-               njs/njs_extern.c
+               njs/njs_variable.c
 
 $(NXT_BUILDDIR)/njs_shared.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
        njs/njs_vm.h \
+       njs/njs_number.h \
+       njs/njs_string.h \
+       njs/njs_object.h \
+       njs/njs_array.h \
+       njs/njs_function.h \
        njs/njs_parser.h \
        njs/njs_shared.c \
 
@@ -225,6 +260,8 @@ $(NXT_BUILDDIR)/njs_lexer_keyword.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
        njs/njs_vm.h \
+       njs/njs_number.h \
+       njs/njs_object.h \
        njs/njs_parser.h \
        njs/njs_lexer_keyword.c \
 
@@ -236,10 +273,13 @@ $(NXT_BUILDDIR)/njs_nonrecursive_parser.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
        njs/njs_vm.h \
+       njs/njs_number.h \
+       njs/njs_object.h \
        njs/njs_parser.h \
        njs/njs_nonrecursive_parser.c \
 
-       $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_nonrecursive_parser.o $(NXT_CFLAGS) \
+       $(NXT_CC) -c -o $(NXT_BUILDDIR)/njs_nonrecursive_parser.o \
+               $(NXT_CFLAGS) \
                -I$(NXT_LIB) -Injs \
                njs/njs_nonrecursive_parser.c
 
@@ -247,6 +287,9 @@ $(NXT_BUILDDIR)/njs_parser.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
        njs/njs_vm.h \
+       njs/njs_string.h \
+       njs/njs_object.h \
+       njs/njs_function.h \
        njs/njs_parser.h \
        njs/njs_parser.c \
 
@@ -258,6 +301,9 @@ $(NXT_BUILDDIR)/njs_parser_expression.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
        njs/njs_vm.h \
+       njs/njs_number.h \
+       njs/njs_object.h \
+       njs/njs_function.h \
        njs/njs_parser.h \
        njs/njs_parser_expression.c \
 
@@ -269,6 +315,10 @@ $(NXT_BUILDDIR)/njs_generator.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
        njs/njs_vm.h \
+       njs/njs_number.h \
+       njs/njs_string.h \
+       njs/njs_object.h \
+       njs/njs_function.h \
        njs/njs_parser.h \
        njs/njs_generator.c \
 
@@ -280,6 +330,7 @@ $(NXT_BUILDDIR)/njs_disassembler.o: \
        $(NXT_BUILDDIR)/libnxt.a \
        njs/njscript.h \
        njs/njs_vm.h \
+       njs/njs_object.h \
        njs/njs_parser.h \
        njs/njs_disassembler.c \
 

diff --git a/njs/njs_array.c b/njs/njs_array.c
index 2c65bea43214c76e5ae2a71945a2c637e9f4d32b..d336d522da820ee6fba4f68f533b8609a98928fa 100644 (file)
--- a/njs/njs_array.c
+++ b/njs/njs_array.c
@@ -13,6 +13,12 @@
 #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 <string.h>
 
 

diff --git a/njs/njs_disassembler.c b/njs/njs_disassembler.c
index c8764e0b967c7c38f83478d6073ce4bc1ef969f5..e234a6fd89a2e71d87db9ca2cb513d1422e7289c 100644 (file)
--- a/njs/njs_disassembler.c
+++ b/njs/njs_disassembler.c
@@ -12,6 +12,7 @@
 #include <nxt_mem_cache_pool.h>
 #include <njscript.h>
 #include <njs_vm.h>
+#include <njs_object.h>
 #include <njs_regexp.h>
 #include <njs_variable.h>
 #include <njs_parser.h>

diff --git a/njs/njs_extern.c b/njs/njs_extern.c
index ea32fb930b3faf69bef94bc95804b84312e6eb5c..9b060b67e979760bb1b3a3ad005ac3f742f44130 100644 (file)
--- a/njs/njs_extern.c
+++ b/njs/njs_extern.c
@@ -15,6 +15,7 @@
 #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 <string.h>

diff --git a/njs/njs_function.c b/njs/njs_function.c
index 7f6c645c8974685323cd8328b4f19321a561455e..4239499e5761cdab59b6475a76182842986a6746 100644 (file)
--- a/njs/njs_function.c
+++ b/njs/njs_function.c
@@ -12,6 +12,9 @@
 #include <nxt_mem_cache_pool.h>
 #include <njscript.h>
 #include <njs_vm.h>
+#include <njs_object.h>
+#include <njs_array.h>
+#include <njs_function.h>
 #include <string.h>
 
 

diff --git a/njs/njs_function.h b/njs/njs_function.h
index 9c045bec0cac2b7fd636ff02d7c61661800256ed..24453c02fd890457a2890016a499d244d98bc45d 100644 (file)
--- a/njs/njs_function.h
+++ b/njs/njs_function.h
@@ -8,7 +8,7 @@
 #define _NJS_FUNCTION_H_INCLUDED_
 
 
-typedef struct {
+struct njs_function_script_s {
     uint32_t                       nargs;
     uint32_t                       local_size;
     /*
@@ -24,7 +24,7 @@ typedef struct {
         u_char                     *code;
         njs_parser_t               *parser;
     } u;
-} njs_function_script_t;
+};
 
 
 struct njs_function_s {
@@ -82,8 +82,6 @@ struct njs_exception_s {
 };
 
 
-typedef struct njs_native_frame_s  njs_native_frame_t;
-
 struct njs_native_frame_s {
     u_char                         *last;
     njs_native_frame_t             *previous;

diff --git a/njs/njs_generator.c b/njs/njs_generator.c
index 0dd5b657677df87b8789516ebb6fc1dc74310743..73b02e9558d464e5204426631ade37c9d4599682 100644 (file)
--- a/njs/njs_generator.c
+++ b/njs/njs_generator.c
@@ -12,6 +12,10 @@
 #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 <string.h>

diff --git a/njs/njs_lexer_keyword.c b/njs/njs_lexer_keyword.c
index db762fbe55c4cca7ce12038ce3f1f1982c7f1dbf..0c00ae8ab3712f8501323a52d7e55744cf605db6 100644 (file)
--- a/njs/njs_lexer_keyword.c
+++ b/njs/njs_lexer_keyword.c
@@ -13,6 +13,8 @@
 #include <nxt_mem_cache_pool.h>
 #include <njscript.h>
 #include <njs_vm.h>
+#include <njs_number.h>
+#include <njs_object.h>
 #include <njs_regexp.h>
 #include <njs_variable.h>
 #include <njs_parser.h>

diff --git a/njs/njs_nonrecursive_parser.c b/njs/njs_nonrecursive_parser.c
index 2568e7795b449699b1039d38778398fe724a8265..3c4f530c73e21bfb4fabd1725f33ce4d60a19354 100644 (file)
--- a/njs/njs_nonrecursive_parser.c
+++ b/njs/njs_nonrecursive_parser.c
@@ -13,6 +13,8 @@
 #include <nxt_mem_cache_pool.h>
 #include <njscript.h>
 #include <njs_vm.h>
+#include <njs_number.h>
+#include <njs_object.h>
 #include <njs_regexp.h>
 #include <njs_variable.h>
 #include <njs_parser.h>

diff --git a/njs/njs_number.c b/njs/njs_number.c
index 4074625fe556c6b3eb56151fc0d2462264e96073..a12264e6694ab8272eae5f4e9e377125dd863dab 100644 (file)
--- a/njs/njs_number.c
+++ b/njs/njs_number.c
@@ -12,6 +12,10 @@
 #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 <string.h>
 #include <stdio.h>
 

diff --git a/njs/njs_object.c b/njs/njs_object.c
index 14ab44c1f1aeb599b80b62f21b6d58b02a5ce14d..c217de30d5d807c0cb5993d1e5bb5e5a744d0c23 100644 (file)
--- a/njs/njs_object.c
+++ b/njs/njs_object.c
@@ -12,6 +12,10 @@
 #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 <string.h>
 
 

diff --git a/njs/njs_parser.c b/njs/njs_parser.c
index 89688bbe9ad65a7c58b85c06feb1c5ec2f195b15..68c14c2370fb784194976b85a12df6c6773eaf4a 100644 (file)
--- a/njs/njs_parser.c
+++ b/njs/njs_parser.c
@@ -13,6 +13,10 @@
 #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_regexp.h>
 #include <njs_variable.h>
 #include <njs_parser.h>

diff --git a/njs/njs_parser_expression.c b/njs/njs_parser_expression.c
index 6cd5cbb28380bb19c119fe681e2e710f42654abc..137ee377989cfb33f423bf657d9d39e0952101c1 100644 (file)
--- a/njs/njs_parser_expression.c
+++ b/njs/njs_parser_expression.c
@@ -14,6 +14,9 @@
 #include <nxt_mem_cache_pool.h>
 #include <njscript.h>
 #include <njs_vm.h>
+#include <njs_number.h>
+#include <njs_object.h>
+#include <njs_function.h>
 #include <njs_variable.h>
 #include <njs_parser.h>
 #include <string.h>

diff --git a/njs/njs_regexp.c b/njs/njs_regexp.c
index a534c162973967030e26a76857919132dcec3fea..978aac1109b06f98de5c77c07a86e236dec93393 100644 (file)
--- a/njs/njs_regexp.c
+++ b/njs/njs_regexp.c
@@ -17,6 +17,11 @@
 #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_regexp.h>
 #include <njs_regexp_pattern.h>
 #include <njs_variable.h>

diff --git a/njs/njs_shared.c b/njs/njs_shared.c
index 38dcdaa9896cb3d845efa85408e5f637703f54da..01660ce14076f03a95f242b632b6d488f4870be6 100644 (file)
--- a/njs/njs_shared.c
+++ b/njs/njs_shared.c
@@ -12,6 +12,11 @@
 #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_regexp.h>
 #include <string.h>
 

diff --git a/njs/njs_string.c b/njs/njs_string.c
index dd77e23e4f725c3bb1c7ec57640c48c627f14c20..22567b42e085a4f2dddd616e3de964a27344421d 100644 (file)
--- a/njs/njs_string.c
+++ b/njs/njs_string.c
@@ -17,6 +17,12 @@
 #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_regexp.h>
 #include <njs_regexp_pattern.h>
 #include <njs_variable.h>

diff --git a/njs/njs_vm.h b/njs/njs_vm.h
index dc54fc320f82a031affc2aec34c0819e23530d66..c378bf5888ef017ac7f7c626f08bdae7fc1f323c 100644 (file)
--- a/njs/njs_vm.h
+++ b/njs/njs_vm.h
@@ -74,14 +74,16 @@ typedef njs_ret_t (*njs_getter_t) (njs_vm_t *vm, njs_value_t *obj);
 typedef njs_ret_t (*njs_native_t) (njs_vm_t *vm, njs_param_t *param);
 
 
-typedef struct njs_string_s          njs_string_t;
-typedef struct njs_object_s          njs_object_t;
-typedef struct njs_array_s           njs_array_t;
-typedef struct njs_object_value_s    njs_object_value_t;
-typedef struct njs_function_s        njs_function_t;
-typedef struct njs_regexp_s          njs_regexp_t;
-typedef struct njs_regexp_pattern_s  njs_regexp_pattern_t;
-typedef struct njs_extern_s          njs_extern_t;
+typedef struct njs_string_s           njs_string_t;
+typedef struct njs_object_s           njs_object_t;
+typedef struct njs_array_s            njs_array_t;
+typedef struct njs_object_value_s     njs_object_value_t;
+typedef struct njs_function_s         njs_function_t;
+typedef struct njs_function_script_s  njs_function_script_t;
+typedef struct njs_regexp_s           njs_regexp_t;
+typedef struct njs_regexp_pattern_s   njs_regexp_pattern_t;
+typedef struct njs_extern_s           njs_extern_t;
+typedef struct njs_native_frame_s     njs_native_frame_t;
 
 
 union njs_value_s {
@@ -221,15 +223,6 @@ njs_method(_method, _size)                                                    \
     } }
 
 
-#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_extern.h>
-
-
 typedef njs_ret_t (*njs_vmcode_operation_t)(njs_vm_t *vm, njs_value_t *value1,
     njs_value_t *value2);
 

diff --git a/njs/njscript.c b/njs/njscript.c
index ee5d9fffafa17118951046b72979668cb106aa31..3a79e821208d229824662ea400765dbd7a35e63c 100644 (file)
--- a/njs/njscript.c
+++ b/njs/njscript.c
@@ -14,14 +14,10 @@
 #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_regexp.h>
-#include <njs_extern.h>
 #include <njs_variable.h>
 #include <njs_parser.h>
 #include <string.h>