From 8b367098ac493cc458f731cc780070ffb103f2f4 Mon Sep 17 00:00:00 2001 From: Yukihiro Matsumoto Date: Tue, 24 Apr 2012 17:41:28 +0900 Subject: [PATCH] move header files {irep,dump,cdump,ritehash}.h to /include/mruby --- {src => include/mruby}/cdump.h | 0 {src => include/mruby}/dump.h | 0 {src => include/mruby}/irep.h | 0 src/ritehash.h => include/mruby/khash.h | 0 mrblib/init_mrblib.c | 4 ++-- src/cdump.c | 6 +++--- src/class.c | 2 +- src/codegen.c | 2 +- src/dump.c | 4 ++-- src/error.c | 2 +- src/gc.c | 2 +- src/hash.c | 2 +- src/kernel.c | 2 +- src/load.c | 4 ++-- src/re.c | 2 +- src/state.c | 2 +- src/symbol.c | 2 +- src/variable.c | 2 +- src/vm.c | 2 +- tools/mrbc/mrbc.c | 10 +++++----- tools/mruby/mruby.c | 6 +++--- 21 files changed, 28 insertions(+), 28 deletions(-) rename {src => include/mruby}/cdump.h (100%) rename {src => include/mruby}/dump.h (100%) rename {src => include/mruby}/irep.h (100%) rename src/ritehash.h => include/mruby/khash.h (100%) diff --git a/src/cdump.h b/include/mruby/cdump.h similarity index 100% rename from src/cdump.h rename to include/mruby/cdump.h diff --git a/src/dump.h b/include/mruby/dump.h similarity index 100% rename from src/dump.h rename to include/mruby/dump.h diff --git a/src/irep.h b/include/mruby/irep.h similarity index 100% rename from src/irep.h rename to include/mruby/irep.h diff --git a/src/ritehash.h b/include/mruby/khash.h similarity index 100% rename from src/ritehash.h rename to include/mruby/khash.h diff --git a/mrblib/init_mrblib.c b/mrblib/init_mrblib.c index c44d28f94..a845489f5 100644 --- a/mrblib/init_mrblib.c +++ b/mrblib/init_mrblib.c @@ -1,6 +1,6 @@ #include "mruby.h" -#include "irep.h" -#include "dump.h" +#include "mruby/irep.h" +#include "mruby/dump.h" #include "mruby/string.h" #include "mruby/proc.h" diff --git a/src/cdump.c b/src/cdump.c index 131a9891a..47c89300c 100644 --- a/src/cdump.c +++ b/src/cdump.c @@ -4,11 +4,11 @@ ** See Copyright Notice in mruby.h */ -#include "cdump.h" +#include "mruby/cdump.h" #include -#include "irep.h" +#include "mruby/irep.h" #include "mruby/string.h" #include "re.h" @@ -169,7 +169,7 @@ mrb_cdump_irep(mrb_state *mrb, int n, FILE *f,const char *initname) irep_num = mrb->irep_len - n; SOURCE_CODE0("#include \"mruby.h\""); - SOURCE_CODE0("#include \"irep.h\""); + SOURCE_CODE0("#include \"mruby/irep.h\""); SOURCE_CODE0("#include \"mruby/string.h\""); SOURCE_CODE0("#include \"mruby/proc.h\""); SOURCE_CODE0(""); diff --git a/src/class.c b/src/class.c index 51926b019..f884f91ba 100644 --- a/src/class.c +++ b/src/class.c @@ -15,7 +15,7 @@ #include "mruby/array.h" #include "error.h" -#include "ritehash.h" +#include "mruby/khash.h" #ifdef INCLUDE_REGEXP #define mrb_usascii_str_new2 mrb_usascii_str_new_cstr diff --git a/src/codegen.c b/src/codegen.c index 582008a69..5eca94ad0 100644 --- a/src/codegen.c +++ b/src/codegen.c @@ -8,7 +8,7 @@ #define CODEGEN_DUMP #include "mruby.h" -#include "irep.h" +#include "mruby/irep.h" #include "compile.h" #include "mruby/proc.h" #include "opcode.h" diff --git a/src/dump.c b/src/dump.c index a6ba1350a..61297eb10 100644 --- a/src/dump.c +++ b/src/dump.c @@ -5,13 +5,13 @@ */ #include -#include "dump.h" +#include "mruby/dump.h" #include "mruby/string.h" #ifdef INCLUDE_REGEXP #include "re.h" #endif -#include "irep.h" +#include "mruby/irep.h" static const unsigned char def_rite_binary_header[] = RITE_FILE_IDENFIFIER diff --git a/src/error.c b/src/error.c index e80a24e45..2dbfe0ac2 100644 --- a/src/error.c +++ b/src/error.c @@ -11,7 +11,7 @@ #include #include "error.h" #include "opcode.h" -#include "irep.h" +#include "mruby/irep.h" #include "mruby/proc.h" #include "mruby/numeric.h" #include "mruby/variable.h" diff --git a/src/gc.c b/src/gc.c index 1677dd325..3b7a6fa7d 100644 --- a/src/gc.c +++ b/src/gc.c @@ -11,7 +11,7 @@ #include "mruby/string.h" #include "mruby/hash.h" #include "mruby/range.h" -#include "ritehash.h" +#include "mruby/khash.h" #include #include #include "mruby/struct.h" diff --git a/src/hash.c b/src/hash.c index e96c2e210..bb530ff96 100644 --- a/src/hash.c +++ b/src/hash.c @@ -6,7 +6,7 @@ #include "mruby.h" #include "mruby/hash.h" -#include "ritehash.h" +#include "mruby/khash.h" #include "mruby/class.h" #include "mruby/array.h" #include "error.h" diff --git a/src/kernel.c b/src/kernel.c index 0aaa49d95..dce9e249b 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -17,7 +17,7 @@ #include "mruby/class.h" #include "mruby/struct.h" #include "mruby/variable.h" -#include "ritehash.h" +#include "mruby/khash.h" #include "error.h" #include "method.h" diff --git a/src/load.c b/src/load.c index 7a8178621..dfad68622 100644 --- a/src/load.c +++ b/src/load.c @@ -5,13 +5,13 @@ */ #include -#include "dump.h" +#include "mruby/dump.h" #include "mruby/string.h" #ifdef INCLUDE_REGEXP #include "re.h" #endif -#include "irep.h" +#include "mruby/irep.h" #ifndef FALSE #define FALSE 0 diff --git a/src/re.c b/src/re.c index 76c10cab9..c72f22146 100644 --- a/src/re.c +++ b/src/re.c @@ -7,7 +7,7 @@ #include "mruby.h" #include #include "mruby/string.h" -#include "ritehash.h" +#include "mruby/khash.h" #include "encoding.h" #include "re.h" #include "mruby/numeric.h" diff --git a/src/state.c b/src/state.c index 913c186e4..f705060e8 100644 --- a/src/state.c +++ b/src/state.c @@ -5,7 +5,7 @@ */ #include "mruby.h" -#include "irep.h" +#include "mruby/irep.h" #include void mrb_init_heap(mrb_state*); diff --git a/src/symbol.c b/src/symbol.c index 679b3c35a..14721e0a2 100644 --- a/src/symbol.c +++ b/src/symbol.c @@ -5,7 +5,7 @@ */ #include "mruby.h" -#include "ritehash.h" +#include "mruby/khash.h" #include #include diff --git a/src/variable.c b/src/variable.c index f5506d779..a9f04538b 100644 --- a/src/variable.c +++ b/src/variable.c @@ -7,7 +7,7 @@ #include #include "mruby.h" #include "mruby/class.h" -#include "ritehash.h" +#include "mruby/khash.h" #include "mruby/variable.h" #include "mruby/string.h" #include "mruby/range.h" diff --git a/src/vm.c b/src/vm.c index 76bc26b38..036d20287 100644 --- a/src/vm.c +++ b/src/vm.c @@ -6,7 +6,7 @@ #include "mruby.h" #include "opcode.h" -#include "irep.h" +#include "mruby/irep.h" #include "mruby/variable.h" #include "mruby/proc.h" #include "mruby/array.h" diff --git a/tools/mrbc/mrbc.c b/tools/mrbc/mrbc.c index 1e54edbdf..cf73ef1d5 100644 --- a/tools/mrbc/mrbc.c +++ b/tools/mrbc/mrbc.c @@ -1,11 +1,11 @@ #include "mruby.h" #include "mruby/proc.h" +#include "mruby/dump.h" +#include "mruby/cdump.h" #include "compile.h" -#include "dump.h" -#include "cdump.h" -#include "stdio.h" -#include "memory.h" -#include "stdlib.h" +#include +#include +#include #define RITEBIN_EXT ".mrb" #define C_EXT ".c" diff --git a/tools/mruby/mruby.c b/tools/mruby/mruby.c index 769746530..aea2a7cd6 100644 --- a/tools/mruby/mruby.c +++ b/tools/mruby/mruby.c @@ -1,9 +1,9 @@ #include "mruby.h" #include "mruby/proc.h" #include "compile.h" -#include "dump.h" -#include "stdio.h" -#include "string.h" +#include "mruby/dump.h" +#include +#include void ruby_show_version(mrb_state *); void ruby_show_copyright(mrb_state *);