From 89f2408a9e6c160b21d2fd6d84b813eda8ef3e2d Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Wed, 18 Nov 2015 19:21:58 +0300 Subject: [PATCH] Fine grain header files inclusions and fixed build dependencies. --- Makefile | 87 +++++++++++++++++++++++++++-------- njs/njs_array.c | 6 +++ njs/njs_disassembler.c | 1 + njs/njs_extern.c | 1 + njs/njs_function.c | 3 ++ njs/njs_function.h | 6 +-- njs/njs_generator.c | 4 ++ njs/njs_lexer_keyword.c | 2 + njs/njs_nonrecursive_parser.c | 2 + njs/njs_number.c | 4 ++ njs/njs_object.c | 4 ++ njs/njs_parser.c | 4 ++ njs/njs_parser_expression.c | 3 ++ njs/njs_regexp.c | 5 ++ njs/njs_shared.c | 5 ++ njs/njs_string.c | 6 +++ njs/njs_vm.h | 27 ++++------- njs/njscript.c | 4 -- 18 files changed, 131 insertions(+), 43 deletions(-) diff --git a/Makefile b/Makefile index 5d9645f0..68a6bfb4 100644 --- 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 2c65bea4..d336d522 100644 --- a/njs/njs_array.c +++ b/njs/njs_array.c @@ -13,6 +13,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include #include diff --git a/njs/njs_disassembler.c b/njs/njs_disassembler.c index c8764e0b..e234a6fd 100644 --- a/njs/njs_disassembler.c +++ b/njs/njs_disassembler.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include diff --git a/njs/njs_extern.c b/njs/njs_extern.c index ea32fb93..9b060b67 100644 --- a/njs/njs_extern.c +++ b/njs/njs_extern.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include diff --git a/njs/njs_function.c b/njs/njs_function.c index 7f6c645c..4239499e 100644 --- a/njs/njs_function.c +++ b/njs/njs_function.c @@ -12,6 +12,9 @@ #include #include #include +#include +#include +#include #include diff --git a/njs/njs_function.h b/njs/njs_function.h index 9c045bec..24453c02 100644 --- 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 0dd5b657..73b02e95 100644 --- a/njs/njs_generator.c +++ b/njs/njs_generator.c @@ -12,6 +12,10 @@ #include #include #include +#include +#include +#include +#include #include #include #include diff --git a/njs/njs_lexer_keyword.c b/njs/njs_lexer_keyword.c index db762fbe..0c00ae8a 100644 --- a/njs/njs_lexer_keyword.c +++ b/njs/njs_lexer_keyword.c @@ -13,6 +13,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/njs/njs_nonrecursive_parser.c b/njs/njs_nonrecursive_parser.c index 2568e779..3c4f530c 100644 --- a/njs/njs_nonrecursive_parser.c +++ b/njs/njs_nonrecursive_parser.c @@ -13,6 +13,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/njs/njs_number.c b/njs/njs_number.c index 4074625f..a12264e6 100644 --- a/njs/njs_number.c +++ b/njs/njs_number.c @@ -12,6 +12,10 @@ #include #include #include +#include +#include +#include +#include #include #include diff --git a/njs/njs_object.c b/njs/njs_object.c index 14ab44c1..c217de30 100644 --- a/njs/njs_object.c +++ b/njs/njs_object.c @@ -12,6 +12,10 @@ #include #include #include +#include +#include +#include +#include #include diff --git a/njs/njs_parser.c b/njs/njs_parser.c index 89688bbe..68c14c23 100644 --- a/njs/njs_parser.c +++ b/njs/njs_parser.c @@ -13,6 +13,10 @@ #include #include #include +#include +#include +#include +#include #include #include #include diff --git a/njs/njs_parser_expression.c b/njs/njs_parser_expression.c index 6cd5cbb2..137ee377 100644 --- a/njs/njs_parser_expression.c +++ b/njs/njs_parser_expression.c @@ -14,6 +14,9 @@ #include #include #include +#include +#include +#include #include #include #include diff --git a/njs/njs_regexp.c b/njs/njs_regexp.c index a534c162..978aac11 100644 --- a/njs/njs_regexp.c +++ b/njs/njs_regexp.c @@ -17,6 +17,11 @@ #include #include #include +#include +#include +#include +#include +#include #include #include #include diff --git a/njs/njs_shared.c b/njs/njs_shared.c index 38dcdaa9..01660ce1 100644 --- a/njs/njs_shared.c +++ b/njs/njs_shared.c @@ -12,6 +12,11 @@ #include #include #include +#include +#include +#include +#include +#include #include #include diff --git a/njs/njs_string.c b/njs/njs_string.c index dd77e23e..22567b42 100644 --- a/njs/njs_string.c +++ b/njs/njs_string.c @@ -17,6 +17,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/njs/njs_vm.h b/njs/njs_vm.h index dc54fc32..c378bf58 100644 --- 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 -#include -#include -#include -#include -#include -#include - - 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 ee5d9fff..3a79e821 100644 --- a/njs/njscript.c +++ b/njs/njscript.c @@ -14,14 +14,10 @@ #include #include #include -#include #include #include -#include -#include #include #include -#include #include #include #include -- 2.47.3