From 2b5b161f8bac79fe8241e18b78c4ddbb30179699 Mon Sep 17 00:00:00 2001 From: Masaki Muranaka Date: Fri, 29 Mar 2013 10:22:31 +0900 Subject: Sort include files. Some redundant includes are removed. --- src/array.c | 3 +-- src/class.c | 5 ++--- src/codegen.c | 12 ++++++------ src/error.c | 12 ++++++------ src/gc.c | 10 +++++----- src/hash.c | 4 ++-- src/kernel.c | 4 ++-- src/load.c | 5 ++--- src/numeric.c | 24 +++++++++++------------- src/object.c | 2 +- src/parse.y | 9 ++++----- src/pool.c | 2 +- src/proc.c | 2 +- src/state.c | 6 +++--- src/string.c | 12 +++++------- src/symbol.c | 7 +++---- src/variable.c | 6 +++--- src/vm.c | 22 +++++++++++----------- 18 files changed, 69 insertions(+), 78 deletions(-) (limited to 'src') diff --git a/src/array.c b/src/array.c index a20fa6daf..c6f2d8001 100644 --- a/src/array.c +++ b/src/array.c @@ -6,9 +6,8 @@ #include "mruby.h" #include "mruby/array.h" -#include -#include "mruby/string.h" #include "mruby/class.h" +#include "mruby/string.h" #include "value_array.h" /* SIZE_MAX is not supported by VC++. */ diff --git a/src/class.c b/src/class.c index 030d018bc..9dc7b46d6 100644 --- a/src/class.c +++ b/src/class.c @@ -7,13 +7,12 @@ #include "mruby.h" #include #include -#include +#include "mruby/array.h" #include "mruby/class.h" +#include "mruby/numeric.h" #include "mruby/proc.h" #include "mruby/string.h" -#include "mruby/numeric.h" #include "mruby/variable.h" -#include "mruby/array.h" #include "error.h" KHASH_DEFINE(mt, mrb_sym, struct RProc*, 1, kh_int_hash_func, kh_int_hash_equal) diff --git a/src/codegen.c b/src/codegen.c index bbce4aac2..cff3b3ce4 100644 --- a/src/codegen.c +++ b/src/codegen.c @@ -4,16 +4,16 @@ ** See Copyright Notice in mruby.h */ +#include +#include +#include #include "mruby.h" -#include "mruby/string.h" -#include "mruby/irep.h" #include "mruby/compile.h" +#include "mruby/irep.h" #include "mruby/numeric.h" -#include "opcode.h" +#include "mruby/string.h" #include "node.h" -#include -#include -#include +#include "opcode.h" #include "re.h" typedef mrb_ast_node node; diff --git a/src/error.c b/src/error.c index 8b8b8bd35..19d702da2 100644 --- a/src/error.c +++ b/src/error.c @@ -4,19 +4,19 @@ ** See Copyright Notice in mruby.h */ -#include "mruby.h" #include +#include #include #include -#include #include -#include "error.h" -#include "mruby/variable.h" -#include "mruby/string.h" +#include "mruby.h" #include "mruby/array.h" #include "mruby/class.h" -#include "mruby/proc.h" #include "mruby/irep.h" +#include "mruby/proc.h" +#include "mruby/string.h" +#include "mruby/variable.h" +#include "error.h" mrb_value mrb_exc_new(mrb_state *mrb, struct RClass *c, const char *ptr, long len) diff --git a/src/gc.c b/src/gc.c index 1c668bbf3..0877c6c3c 100644 --- a/src/gc.c +++ b/src/gc.c @@ -4,15 +4,15 @@ ** See Copyright Notice in mruby.h */ +#include #include "mruby.h" -#include "mruby/class.h" #include "mruby/array.h" -#include "mruby/string.h" +#include "mruby/class.h" +#include "mruby/data.h" #include "mruby/hash.h" -#include "mruby/range.h" -#include #include "mruby/proc.h" -#include "mruby/data.h" +#include "mruby/range.h" +#include "mruby/string.h" #include "mruby/variable.h" #ifndef SIZE_MAX diff --git a/src/hash.c b/src/hash.c index 8de7b55c8..e32ee73e1 100644 --- a/src/hash.c +++ b/src/hash.c @@ -5,10 +5,10 @@ */ #include "mruby.h" +#include "mruby/array.h" +#include "mruby/class.h" #include "mruby/hash.h" #include "mruby/khash.h" -#include "mruby/class.h" -#include "mruby/array.h" #include "mruby/string.h" #include "mruby/variable.h" diff --git a/src/kernel.c b/src/kernel.c index ec6408701..f14a94b3a 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -5,10 +5,10 @@ */ #include "mruby.h" -#include "mruby/string.h" -#include "mruby/proc.h" #include "mruby/array.h" #include "mruby/class.h" +#include "mruby/proc.h" +#include "mruby/string.h" #include "mruby/variable.h" #include "error.h" diff --git a/src/load.c b/src/load.c index cb36c9914..31c7153d6 100644 --- a/src/load.c +++ b/src/load.c @@ -7,10 +7,9 @@ #include #include #include "mruby/dump.h" - -#include "mruby/string.h" -#include "mruby/proc.h" #include "mruby/irep.h" +#include "mruby/proc.h" +#include "mruby/string.h" #ifdef ENABLE_STDIO typedef struct _RiteFILE diff --git a/src/numeric.c b/src/numeric.c index da09930ff..084243291 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -4,24 +4,22 @@ ** See Copyright Notice in mruby.h */ -#include "mruby.h" -#include "mruby/numeric.h" -#include "mruby/string.h" -#include "mruby/array.h" - -#include -#include #include -#include -#include - +#include #if defined(__FreeBSD__) && __FreeBSD__ < 4 -#include +# include #endif - #ifdef HAVE_IEEEFP_H -#include +# include #endif +#include +#include +#include + +#include "mruby.h" +#include "mruby/array.h" +#include "mruby/numeric.h" +#include "mruby/string.h" #ifdef MRB_USE_FLOAT #define floor(f) floorf(f) diff --git a/src/object.c b/src/object.c index a77903e19..bd88459ae 100644 --- a/src/object.c +++ b/src/object.c @@ -5,9 +5,9 @@ */ #include "mruby.h" -#include "mruby/string.h" #include "mruby/class.h" #include "mruby/numeric.h" +#include "mruby/string.h" #include "error.h" int diff --git a/src/parse.y b/src/parse.y index 4826f4336..e8533e092 100644 --- a/src/parse.y +++ b/src/parse.y @@ -17,16 +17,15 @@ #define YYFREE(o) mrb_free(p->mrb, (o)) #define YYSTACK_USE_ALLOCA 0 +#include +#include +#include +#include #include "mruby.h" #include "mruby/compile.h" #include "mruby/proc.h" #include "node.h" -#include -#include -#include -#include - #define YYLEX_PARAM p typedef mrb_ast_node node; diff --git a/src/pool.c b/src/pool.c index d775669a5..77ac8a69f 100644 --- a/src/pool.c +++ b/src/pool.c @@ -4,9 +4,9 @@ ** See Copyright Notice in mruby.h */ -#include "mruby.h" #include #include +#include "mruby.h" /* configuration section */ /* allocated memory address should be multiple of POOL_ALIGNMENT */ diff --git a/src/proc.c b/src/proc.c index c4d7ec3ea..c32ce9c7a 100644 --- a/src/proc.c +++ b/src/proc.c @@ -5,8 +5,8 @@ */ #include "mruby.h" -#include "mruby/proc.h" #include "mruby/class.h" +#include "mruby/proc.h" #include "opcode.h" static mrb_code call_iseq[] = { diff --git a/src/state.c b/src/state.c index e84674447..adc7da06b 100644 --- a/src/state.c +++ b/src/state.c @@ -4,12 +4,12 @@ ** See Copyright Notice in mruby.h */ +#include +#include #include "mruby.h" +#include "mruby/class.h" #include "mruby/irep.h" #include "mruby/variable.h" -#include "mruby/class.h" -#include -#include void mrb_init_heap(mrb_state*); void mrb_init_core(mrb_state*); diff --git a/src/string.c b/src/string.c index 4f19663d7..e5e03d27c 100644 --- a/src/string.c +++ b/src/string.c @@ -4,19 +4,17 @@ ** See Copyright Notice in mruby.h */ -#include "mruby.h" - +#include +#include #include #include #include -#include "mruby/string.h" -#include "mruby/class.h" -#include -#include -#include "mruby/range.h" +#include "mruby.h" #include "mruby/array.h" #include "mruby/class.h" #include "mruby/numeric.h" +#include "mruby/range.h" +#include "mruby/string.h" #include "re.h" const char mrb_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz"; diff --git a/src/symbol.c b/src/symbol.c index 2612e0d15..55bb4885a 100644 --- a/src/symbol.c +++ b/src/symbol.c @@ -4,13 +4,12 @@ ** See Copyright Notice in mruby.h */ +#include +#include +#include #include "mruby.h" #include "mruby/khash.h" -#include - #include "mruby/string.h" -#include -#include /* ------------------------------------------------------ */ typedef struct symbol_name { diff --git a/src/variable.c b/src/variable.c index 3f9aacc0a..941aaf83e 100644 --- a/src/variable.c +++ b/src/variable.c @@ -5,12 +5,12 @@ */ #include "mruby.h" +#include "mruby/array.h" #include "mruby/class.h" +#include "mruby/proc.h" +#include "mruby/string.h" #include "mruby/variable.h" #include "error.h" -#include "mruby/array.h" -#include "mruby/string.h" -#include "mruby/proc.h" typedef int (iv_foreach_func)(mrb_state*,mrb_sym,mrb_value,void*); diff --git a/src/vm.c b/src/vm.c index 336d6476c..596e34961 100644 --- a/src/vm.c +++ b/src/vm.c @@ -4,24 +4,24 @@ ** See Copyright Notice in mruby.h */ +#include +#include +#include +#include #include "mruby.h" -#include "opcode.h" -#include "mruby/irep.h" -#include "mruby/variable.h" -#include "mruby/proc.h" #include "mruby/array.h" -#include "mruby/string.h" -#include "mruby/hash.h" -#include "mruby/range.h" #include "mruby/class.h" +#include "mruby/hash.h" +#include "mruby/irep.h" #include "mruby/numeric.h" +#include "mruby/proc.h" +#include "mruby/range.h" +#include "mruby/string.h" +#include "mruby/variable.h" #include "error.h" +#include "opcode.h" #include "value_array.h" -#include -#include -#include -#include #define SET_TRUE_VALUE(r) MRB_SET_VALUE(r, MRB_TT_TRUE, value.i, 1) #define SET_FALSE_VALUE(r) MRB_SET_VALUE(r, MRB_TT_FALSE, value.i, 1) -- cgit v1.2.3