Revert "Minimize the changes in #5277"

This reverts commit dc51d89ac2.

include/mruby.h

@@ -1298,33 +1298,31 @@ MRB_API void mrb_print_error(mrb_state *mrb);
 /* function for `raisef` formatting */
 MRB_API mrb_value mrb_vformat(mrb_state *mrb, const char *format, va_list ap);
 
-#include <mruby/presym.h>
-
 /* macros to get typical exception objects
    note:
    + those E_* macros requires mrb_state* variable named mrb.
    + exception objects obtained from those macros are local to mrb
 */
-#define E_RUNTIME_ERROR             mrb_exc_get_id(mrb, MRB_SYM(RuntimeError))
-#define E_TYPE_ERROR                mrb_exc_get_id(mrb, MRB_SYM(TypeError))
-#define E_ZERODIV_ERROR             mrb_exc_get_id(mrb, MRB_SYM(ZeroDivisionError))
-#define E_ARGUMENT_ERROR            mrb_exc_get_id(mrb, MRB_SYM(ArgumentError))
-#define E_INDEX_ERROR               mrb_exc_get_id(mrb, MRB_SYM(IndexError))
-#define E_RANGE_ERROR               mrb_exc_get_id(mrb, MRB_SYM(RangeError))
-#define E_NAME_ERROR                mrb_exc_get_id(mrb, MRB_SYM(NameError))
-#define E_NOMETHOD_ERROR            mrb_exc_get_id(mrb, MRB_SYM(NoMethodError))
-#define E_SCRIPT_ERROR              mrb_exc_get_id(mrb, MRB_SYM(ScriptError))
-#define E_SYNTAX_ERROR              mrb_exc_get_id(mrb, MRB_SYM(SyntaxError))
-#define E_LOCALJUMP_ERROR           mrb_exc_get_id(mrb, MRB_SYM(LocalJumpError))
-#define E_REGEXP_ERROR              mrb_exc_get_id(mrb, MRB_SYM(RegexpError))
-#define E_FROZEN_ERROR              mrb_exc_get_id(mrb, MRB_SYM(FrozenError))
+#define E_RUNTIME_ERROR      mrb_exc_get_id(mrb, mrb_intern_lit(mrb, "RuntimeError"))
+#define E_TYPE_ERROR         mrb_exc_get_id(mrb, mrb_intern_lit(mrb, "TypeError"))
+#define E_ZERODIV_ERROR      mrb_exc_get_id(mrb, mrb_intern_lit(mrb, "ZeroDivisionError"))
+#define E_ARGUMENT_ERROR     mrb_exc_get_id(mrb, mrb_intern_lit(mrb, "ArgumentError"))
+#define E_INDEX_ERROR        mrb_exc_get_id(mrb, mrb_intern_lit(mrb, "IndexError"))
+#define E_RANGE_ERROR        mrb_exc_get_id(mrb, mrb_intern_lit(mrb, "RangeError"))
+#define E_NAME_ERROR         mrb_exc_get_id(mrb, mrb_intern_lit(mrb, "NameError"))
+#define E_NOMETHOD_ERROR     mrb_exc_get_id(mrb, mrb_intern_lit(mrb, "NoMethodError"))
+#define E_SCRIPT_ERROR       mrb_exc_get_id(mrb, mrb_intern_lit(mrb, "ScriptError"))
+#define E_SYNTAX_ERROR       mrb_exc_get_id(mrb, mrb_intern_lit(mrb, "SyntaxError"))
+#define E_LOCALJUMP_ERROR    mrb_exc_get_id(mrb, mrb_intern_lit(mrb, "LocalJumpError"))
+#define E_REGEXP_ERROR       mrb_exc_get_id(mrb, mrb_intern_lit(mrb, "RegexpError"))
+#define E_FROZEN_ERROR       mrb_exc_get_id(mrb, mrb_intern_lit(mrb, "FrozenError"))
 
-#define E_NOTIMP_ERROR              mrb_exc_get_id(mrb, MRB_SYM(NotImplementedError))
+#define E_NOTIMP_ERROR       mrb_exc_get_id(mrb, mrb_intern_lit(mrb, "NotImplementedError"))
 #ifndef MRB_NO_FLOAT
-#define E_FLOATDOMAIN_ERROR         mrb_exc_get_id(mrb, MRB_SYM(FloatDomainError))
+#define E_FLOATDOMAIN_ERROR  mrb_exc_get_id(mrb, mrb_intern_lit(mrb, "FloatDomainError"))
 #endif
 
-#define E_KEY_ERROR                 mrb_exc_get_id(mrb, MRB_SYM(KeyError))
+#define E_KEY_ERROR          mrb_exc_get_id(mrb, mrb_intern_lit(mrb, "KeyError"))
 
 MRB_API mrb_value mrb_yield(mrb_state *mrb, mrb_value b, mrb_value arg);
 MRB_API mrb_value mrb_yield_argv(mrb_state *mrb, mrb_value b, mrb_int argc, const mrb_value *argv);
@@ -1391,7 +1389,7 @@ MRB_API mrb_value mrb_fiber_alive_p(mrb_state *mrb, mrb_value fib);
  *
  * Implemented in mruby-fiber
  */
-#define E_FIBER_ERROR (mrb_exc_get_id(mrb, MRB_SYM(FiberError)))
+#define E_FIBER_ERROR mrb_exc_get_id(mrb, mrb_intern_lit(mrb, "FiberError"))
 MRB_API void mrb_stack_extend(mrb_state*, mrb_int);
 
 /* memory pool implementation */
@@ -1411,6 +1409,10 @@ MRB_API void mrb_show_copyright(mrb_state *mrb);
 
 MRB_API mrb_value mrb_format(mrb_state *mrb, const char *format, ...);
 
+#ifdef MRB_PRESYM_SCANNING
+# include <mruby/presym/scanning.h>
+#endif
+
 #if 0
 /* memcpy and memset does not work with gdb reverse-next on my box */
 /* use naive memcpy and memset instead */

include/mruby/presym.h

@@ -9,9 +9,7 @@
 
 #if defined(MRB_NO_PRESYM)
 # include <mruby/presym/disable.h>
-#elif defined(MRB_PRESYM_SCANNING)
-# include <mruby/presym/scanning.h>
-#else
+#elif !defined(MRB_PRESYM_SCANNING)
 # include <mruby/presym/enable.h>
 #endif
 

include/mruby/presym.inc

@@ -1,12 +0,0 @@
-/**
-** @file mruby/presym.inc - Fallback file for Preallocated Symbols
-**
-** See Copyright Notice in mruby.h
-*/
-
-/*
- * Reading this file means you failed to specify `-I<build-dir>/include`
- * in the configuration. I will not use `PRESYM*` macros for compilation.
- */
-
-#define MRB_NO_PRESYM

include/mruby/presym/enable.h

@@ -8,20 +8,6 @@
 #define MRUBY_PRESYM_ENABLE_H
 
 #undef MRB_PRESYM_MAX
-#define MRB_PRESYM_NAMED(lit, num, type, name)
-#define MRB_PRESYM_UNNAMED(lit, num)
-/* test for proper -I `<build-dir>/include` */
-/* fallback `presym.inc` defines `MRB_NO_PRESYM` */
-# include <mruby/presym.inc>
-
-#undef MRB_PRESYM_MAX
-#undef MRB_PRESYM_NAMED
-#undef MRB_PRESYM_UNNAMED
-
-#if defined(MRB_NO_PRESYM)
-# include <mruby/presym/disable.h>
-#else
-
 #define MRB_PRESYM_NAMED(lit, num, type, name) MRB_##type##__##name = (num),
 #define MRB_PRESYM_UNNAMED(lit, num)
 
@@ -52,6 +38,4 @@ enum mruby_presym {
   static const mrb_sym name[] = {__VA_ARGS__};                                \
   static void init_##name(mrb_state *mrb) {}
 
-#endif  /* !MRUBY_NO_PRESYM */
-
 #endif  /* MRUBY_PRESYM_ENABLE_H */

mrbgems/mruby-array-ext/src/array.c

@@ -3,6 +3,7 @@
 #include <mruby/array.h>
 #include <mruby/range.h>
 #include <mruby/hash.h>
+#include <mruby/presym.h>
 
 /*
  *  call-seq:

mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.c

@@ -11,6 +11,7 @@
 #include <mruby/error.h>
 #include <mruby/numeric.h>
 #include <mruby/string.h>
+#include <mruby/presym.h>
 #include "apiprint.h"
 
 static void

mrbgems/mruby-bin-mirb/tools/mirb/mirb.c

@@ -18,6 +18,7 @@
 #include <mruby/dump.h>
 #include <mruby/string.h>
 #include <mruby/variable.h>
+#include <mruby/presym.h>
 
 #include <stdlib.h>
 #include <string.h>

mrbgems/mruby-compiler/core/codegen.c

@@ -15,6 +15,7 @@
 #include <mruby/numeric.h>
 #include <mruby/string.h>
 #include <mruby/debug.h>
+#include <mruby/presym.h>
 #include "node.h"
 #include <mruby/opcode.h>
 #include <mruby/re.h>

mrbgems/mruby-compiler/core/parse.y

@@ -22,6 +22,7 @@
 #include <mruby/throw.h>
 #include <mruby/string.h>
 #include <mruby/dump.h>
+#include <mruby/presym.h>
 #include "node.h"
 
 #define YYLEX_PARAM p

mrbgems/mruby-complex/src/complex.c

@@ -1,6 +1,7 @@
 #include <mruby.h>
 #include <mruby/class.h>
 #include <mruby/numeric.h>
+#include <mruby/presym.h>
 #include <math.h>
 
 #ifdef MRB_NO_FLOAT

mrbgems/mruby-eval/src/eval.c

@@ -5,6 +5,7 @@
 #include <mruby/proc.h>
 #include <mruby/opcode.h>
 #include <mruby/error.h>
+#include <mruby/presym.h>
 
 struct REnv *mrb_env_new(mrb_state *mrb, struct mrb_context *c, mrb_callinfo *ci, int nstacks, mrb_value *stack, struct RClass *tc);
 mrb_value mrb_exec_irep(mrb_state *mrb, mrb_value self, struct RProc *p);

mrbgems/mruby-io/src/file.c

@@ -8,6 +8,7 @@
 #include "mruby/string.h"
 #include "mruby/ext/io.h"
 #include "mruby/error.h"
+#include "mruby/presym.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>

mrbgems/mruby-io/src/io.c

@@ -11,6 +11,7 @@
 #include "mruby/variable.h"
 #include "mruby/ext/io.h"
 #include "mruby/error.h"
+#include "mruby/presym.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>

mrbgems/mruby-kernel-ext/src/kernel.c

@@ -3,6 +3,7 @@
 #include <mruby/array.h>
 #include <mruby/hash.h>
 #include <mruby/range.h>
+#include <mruby/presym.h>
 
 static mrb_value
 mrb_f_caller(mrb_state *mrb, mrb_value self)

mrbgems/mruby-math/src/math.c

@@ -11,6 +11,7 @@
 #endif
 
 #include <mruby/array.h>
+#include <mruby/presym.h>
 #include <math.h>
 
 static void

mrbgems/mruby-metaprog/src/metaprog.c

@@ -5,6 +5,7 @@
 #include "mruby/proc.h"
 #include "mruby/class.h"
 #include "mruby/string.h"
+#include "mruby/presym.h"
 
 typedef enum {
   NOEX_PUBLIC    = 0x00,

mrbgems/mruby-method/src/method.c

@@ -4,6 +4,7 @@
 #include "mruby/variable.h"
 #include "mruby/proc.h"
 #include "mruby/string.h"
+#include "mruby/presym.h"
 
 static struct RObject *
 method_object_alloc(mrb_state *mrb, struct RClass *mclass)

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

@@ -1,6 +1,7 @@
 #include <limits.h>
 #include <mruby.h>
 #include <mruby/numeric.h>
+#include <mruby/presym.h>
 
 /*
  *  call-seq:

mrbgems/mruby-object-ext/src/object.c

@@ -3,6 +3,7 @@
 #include <mruby/class.h>
 #include <mruby/hash.h>
 #include <mruby/proc.h>
+#include <mruby/presym.h>
 
 /*
  *  call-seq:

mrbgems/mruby-objectspace/src/mruby_objectspace.c

@@ -10,6 +10,7 @@
 #include <mruby/proc.h>
 #include <mruby/value.h>
 #include <mruby/range.h>
+#include <mruby/presym.h>
 
 struct os_count_struct {
   mrb_int total;

mrbgems/mruby-proc-ext/src/proc.c

@@ -4,6 +4,7 @@
 #include <mruby/array.h>
 #include <mruby/string.h>
 #include <mruby/debug.h>
+#include <mruby/presym.h>
 
 static mrb_value
 mrb_proc_lambda_p(mrb_state *mrb, mrb_value self)

mrbgems/mruby-random/src/random.c

@@ -10,6 +10,7 @@
 #include <mruby/data.h>
 #include <mruby/array.h>
 #include <mruby/istruct.h>
+#include <mruby/presym.h>
 
 #include <time.h>
 

mrbgems/mruby-rational/src/rational.c

@@ -2,6 +2,7 @@
 #include <mruby/class.h>
 #include <mruby/string.h>
 #include <mruby/numeric.h>
+#include <mruby/presym.h>
 
 struct mrb_rational {
   mrb_int numerator;

mrbgems/mruby-socket/src/socket.c

@@ -42,6 +42,7 @@
 #include "mruby/string.h"
 #include "mruby/variable.h"
 #include "mruby/error.h"
+#include "mruby/presym.h"
 
 #include "mruby/ext/io.h"
 

mrbgems/mruby-sprintf/src/sprintf.c

@@ -10,6 +10,7 @@
 #include <mruby/string.h>
 #include <mruby/hash.h>
 #include <mruby/numeric.h>
+#include <mruby/presym.h>
 #ifndef MRB_NO_FLOAT
 #include <math.h>
 #endif

mrbgems/mruby-struct/src/struct.c

@@ -13,6 +13,7 @@
 #include <mruby/hash.h>
 #include <mruby/range.h>
 #include <mruby/proc.h>
+#include <mruby/presym.h>
 
 #define RSTRUCT_LEN(st) RARRAY_LEN(st)
 #define RSTRUCT_PTR(st) RARRAY_PTR(st)

mrbgems/mruby-time/src/time.c

@@ -14,6 +14,7 @@
 #include <mruby/numeric.h>
 #include <mruby/time.h>
 #include <mruby/string.h>
+#include <mruby/presym.h>
 
 #ifdef MRB_NO_STDIO
 #include <string.h>

src/backtrace.c

@@ -14,6 +14,7 @@
 #include <mruby/error.h>
 #include <mruby/numeric.h>
 #include <mruby/data.h>
+#include <mruby/presym.h>
 
 struct backtrace_location {
   int32_t lineno;

src/class.c

@@ -17,6 +17,7 @@
 #include <mruby/data.h>
 #include <mruby/istruct.h>
 #include <mruby/opcode.h>
+#include <mruby/presym.h>
 
 union mt_ptr {
   struct RProc *proc;

src/dump.c

@@ -1216,7 +1216,10 @@ mrb_dump_irep_cstruct(mrb_state *mrb, const mrb_irep *irep, uint8_t flags, FILE
   if (fp == NULL || initname == NULL || initname[0] == '\0') {
     return MRB_DUMP_INVALID_ARGUMENT;
   }
-  if (fprintf(fp, "#include <mruby.h>\n" "#include <mruby/proc.h>\n\n") < 0) {
+  if (fprintf(fp, "#include <mruby.h>\n"
+                  "#include <mruby/proc.h>\n"
+                  "#include <mruby/presym.h>\n"
+                  "\n") < 0) {
     return MRB_DUMP_WRITE_FAULT;
   }
   fputs("#define mrb_BRACED(...) {__VA_ARGS__}\n", fp);

src/error.c

@@ -16,6 +16,7 @@
 #include <mruby/error.h>
 #include <mruby/class.h>
 #include <mruby/throw.h>
+#include <mruby/presym.h>
 
 MRB_API mrb_value
 mrb_exc_new(mrb_state *mrb, struct RClass *c, const char *ptr, size_t len)

src/gc.c

@@ -22,6 +22,7 @@
 #include <mruby/gc.h>
 #include <mruby/error.h>
 #include <mruby/throw.h>
+#include <mruby/presym.h>
 
 /*
   = Tri-color Incremental Garbage Collection

src/hash.c

@@ -11,6 +11,7 @@
 #include <mruby/hash.h>
 #include <mruby/string.h>
 #include <mruby/variable.h>
+#include <mruby/presym.h>
 
 /*
  * === Glossary

src/kernel.c

@@ -13,6 +13,7 @@
 #include <mruby/variable.h>
 #include <mruby/error.h>
 #include <mruby/istruct.h>
+#include <mruby/presym.h>
 
 MRB_API mrb_bool
 mrb_func_basic_p(mrb_state *mrb, mrb_value obj, mrb_sym mid, mrb_func_t func)

src/numeric.c

@@ -17,6 +17,7 @@
 #include <mruby/numeric.h>
 #include <mruby/string.h>
 #include <mruby/class.h>
+#include <mruby/presym.h>
 
 #ifndef MRB_NO_FLOAT
 #ifdef MRB_USE_FLOAT32

src/object.c

@@ -9,6 +9,7 @@
 #include <mruby/numeric.h>
 #include <mruby/string.h>
 #include <mruby/class.h>
+#include <mruby/presym.h>
 
 MRB_API mrb_bool
 mrb_obj_eq(mrb_state *mrb, mrb_value v1, mrb_value v2)

src/print.c

@@ -8,6 +8,7 @@
 #include <mruby/string.h>
 #include <mruby/variable.h>
 #include <mruby/error.h>
+#include <mruby/presym.h>
 #include <string.h>
 
 #ifndef MRB_NO_STDIO

src/proc.c

@@ -9,6 +9,7 @@
 #include <mruby/proc.h>
 #include <mruby/opcode.h>
 #include <mruby/data.h>
+#include <mruby/presym.h>
 
 static const mrb_code call_iseq[] = {
   OP_CALL,

src/range.c

@@ -9,6 +9,7 @@
 #include <mruby/range.h>
 #include <mruby/string.h>
 #include <mruby/array.h>
+#include <mruby/presym.h>
 
 #define RANGE_INITIALIZED_MASK 1
 #define RANGE_INITIALIZED(p) ((p)->flags |= RANGE_INITIALIZED_MASK)

src/string.c

@@ -22,6 +22,7 @@
 #include <mruby/range.h>
 #include <mruby/string.h>
 #include <mruby/numeric.h>
+#include <mruby/presym.h>
 
 typedef struct mrb_shared_string {
   int refcnt;

src/symbol.c

@@ -11,6 +11,7 @@
 #include <mruby/string.h>
 #include <mruby/dump.h>
 #include <mruby/class.h>
+#include <mruby/presym.h>
 
 #ifndef MRB_NO_PRESYM
 

src/variable.c

@@ -10,6 +10,7 @@
 #include <mruby/proc.h>
 #include <mruby/string.h>
 #include <mruby/variable.h>
+#include <mruby/presym.h>
 
 struct iv_elem {
   mrb_sym key;

src/vm.c

@@ -24,6 +24,7 @@
 #include "value_array.h"
 #include <mruby/throw.h>
 #include <mruby/dump.h>
+#include <mruby/presym.h>
 
 #ifdef MRB_NO_STDIO
 #if defined(__cplusplus)

tasks/presym.rake

@@ -13,8 +13,8 @@ MRuby.each_target do |build|
   presym = build.presym
 
   include_dir = "#{build.build_dir}/include"
-  build.compilers.each{|c| c.include_paths.unshift include_dir}
-  build.gems.each{|gem| gem.compilers.each{|c| c.include_paths.unshift include_dir}}
+  build.compilers.each{|c| c.include_paths << include_dir}
+  build.gems.each{|gem| gem.compilers.each{|c| c.include_paths << include_dir}}
 
   prereqs = {}
   pps = []