Merge pull request #1101 from monaka/pr-cleanup-includes

Cleanup includes

include/mrbconf.h

@@ -111,14 +111,6 @@ typedef short mrb_sym;
 #define DISABLE_DEBUG
 #endif
 
-#ifndef FALSE
-# define FALSE 0
-#endif
-
-#ifndef TRUE
-# define TRUE 1
-#endif
-
 #ifdef _MSC_VER
 # include <float.h>
 # define inline __inline
@@ -154,4 +146,12 @@ typedef _Bool mrb_bool;
 # include <stdio.h>
 #endif
 
+#ifndef FALSE
+# define FALSE 0
+#endif
+
+#ifndef TRUE
+# define TRUE 1
+#endif
+
 #endif  /* MRUBYCONF_H */

include/mruby/numeric.h

@@ -11,8 +11,6 @@
 extern "C" {
 #endif
 
-#include <limits.h>
-
 #define POSFIXABLE(f) ((f) <= MRB_INT_MAX)
 #define NEGFIXABLE(f) ((f) >= MRB_INT_MIN)
 #define FIXABLE(f) (POSFIXABLE(f) && NEGFIXABLE(f))

mrbgems/mruby-numeric-ext/src/numeric_ext.c

+#include <limits.h>
 #include "mruby.h"
 #include "mruby/numeric.h"
 

mrbgems/mruby-sprintf/src/sprintf.c

@@ -6,6 +6,7 @@
 
 #include "mruby.h"
 
+#include <limits.h>
 #include <stdio.h>
 #include <string.h>
 #include "mruby/string.h"

src/array.c

@@ -4,18 +4,18 @@
 ** See Copyright Notice in mruby.h
 */
 
+#ifndef SIZE_MAX
+ /* Some versions of VC++
+  * has SIZE_MAX in stdint.h
+  */
+# include <limits.h>
+#endif
 #include "mruby.h"
 #include "mruby/array.h"
-#include <string.h>
-#include "mruby/string.h"
 #include "mruby/class.h"
+#include "mruby/string.h"
 #include "value_array.h"
 
-/* SIZE_MAX is not supported by VC++. */
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t)-1)
-#endif
-
 #define ARY_DEFAULT_LEN   4
 #define ARY_SHRINK_RATIO  5 /* must be larger than 2 */
 #define ARY_C_MAX_SIZE (SIZE_MAX / sizeof(mrb_value))

src/class.c

@@ -7,13 +7,12 @@
 #include "mruby.h"
 #include <stdarg.h>
 #include <ctype.h>
-#include <string.h>
+#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)

src/codegen.c

@@ -4,16 +4,16 @@
 ** See Copyright Notice in mruby.h
 */
 
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
 #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 <string.h>
-#include <stdlib.h>
-#include <ctype.h>
+#include "opcode.h"
 #include "re.h"
 
 typedef mrb_ast_node node;

src/error.c

@@ -4,19 +4,19 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include "mruby.h"
 #include <errno.h>
+#include <setjmp.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <setjmp.h>
 #include <string.h>
-#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)

src/gc.c

@@ -4,21 +4,23 @@
 ** See Copyright Notice in mruby.h
 */
 
+#ifndef SIZE_MAX
+ /* Some versions of VC++
+  * has SIZE_MAX in stdint.h
+  */
+# include <limits.h>
+#endif
+#include <string.h>
 #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 <string.h>
 #include "mruby/proc.h"
-#include "mruby/data.h"
+#include "mruby/range.h"
+#include "mruby/string.h"
 #include "mruby/variable.h"
 
-#ifndef SIZE_MAX
-#include <limits.h> // for SIZE_MAX
-#endif
-
 /*
   = Tri-color Incremental Garbage Collection
 

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"
 

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"
 

src/load.c

@@ -4,13 +4,18 @@
 ** See Copyright Notice in mruby.h
 */
 
+#ifndef SIZE_MAX
+ /* Some versions of VC++
+  * has SIZE_MAX in stdint.h
+  */
+# include <limits.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #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

src/numeric.c

@@ -4,23 +4,22 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include "mruby.h"
-#include "mruby/numeric.h"
-#include "mruby/string.h"
-#include "mruby/array.h"
-
-#include <float.h>
-#include <math.h>
 #include <assert.h>
-#include <stdlib.h>
-
+#include <float.h>
 #if defined(__FreeBSD__) && __FreeBSD__ < 4
-#include <floatingpoint.h>
+# include <floatingpoint.h>
 #endif
-
 #ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>
+# include <ieeefp.h>
 #endif
+#include <limits.h>
+#include <math.h>
+#include <stdlib.h>
+
+#include "mruby.h"
+#include "mruby/array.h"
+#include "mruby/numeric.h"
+#include "mruby/string.h"
 
 #ifdef MRB_USE_FLOAT
 #define floor(f) floorf(f)

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

src/parse.y

@@ -17,16 +17,15 @@
 #define YYFREE(o)      mrb_free(p->mrb, (o))
 #define YYSTACK_USE_ALLOCA 0
 
+#include <ctype.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
 #include "mruby.h"
 #include "mruby/compile.h"
 #include "mruby/proc.h"
 #include "node.h"
 
-#include <errno.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-
 #define YYLEX_PARAM p
 
 typedef mrb_ast_node node;

src/pool.c

@@ -4,9 +4,9 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include "mruby.h"
 #include <stddef.h>
 #include <string.h>
+#include "mruby.h"
 
 /* configuration section */
 /* allocated memory address should be multiple of POOL_ALIGNMENT */

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[] = {

src/state.c

@@ -4,12 +4,12 @@
 ** See Copyright Notice in mruby.h
 */
 
+#include <stdlib.h>
+#include <string.h>
 #include "mruby.h"
+#include "mruby/class.h"
 #include "mruby/irep.h"
 #include "mruby/variable.h"
-#include "mruby/class.h"
-#include <stdlib.h>
-#include <string.h>
 
 void mrb_init_heap(mrb_state*);
 void mrb_init_core(mrb_state*);

src/string.c

@@ -4,19 +4,22 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include "mruby.h"
-
+#include <ctype.h>
+#ifndef SIZE_MAX
+ /* Some versions of VC++
+  * has SIZE_MAX in stdint.h
+  */
+# include <limits.h>
+#endif
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include "mruby/string.h"
-#include "mruby/class.h"
-#include <ctype.h>
-#include <limits.h>
-#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";

src/symbol.c

@@ -4,13 +4,12 @@
 ** See Copyright Notice in mruby.h
 */
 
+#include <ctype.h>
+#include <limits.h>
+#include <string.h>
 #include "mruby.h"
 #include "mruby/khash.h"
-#include <string.h>
-
 #include "mruby/string.h"
-#include <ctype.h>
-#include <limits.h>
 
 /* ------------------------------------------------------ */
 typedef struct symbol_name {

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*);
 

src/vm.c

@@ -4,24 +4,24 @@
 ** See Copyright Notice in mruby.h
 */
 
+#include <string.h>
+#include <setjmp.h>
+#include <stddef.h>
+#include <stdarg.h>
 #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 <string.h>
-#include <setjmp.h>
-#include <stddef.h>
-#include <stdarg.h>
 
 #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)

tools/mrbc/mrbc.c

-#include "mruby.h"
-#include "mruby/proc.h"
-#include "mruby/dump.h"
-#include "mruby/compile.h"
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
+#include "mruby.h"
+#include "mruby/compile.h"
+#include "mruby/dump.h"
+#include "mruby/proc.h"
 
 #define RITEBIN_EXT ".mrb"
 #define C_EXT       ".c"