Revert "Minimize the changes in #5277"

This reverts commit dc51d89ac22acc60b9bfeed87115863565b74085.

1 files changed, 22 insertions, 20 deletions

diff --git a/include/mruby.h b/include/mruby.h
index 57f556e94..aa6d2ab65 100644
--- a/include/mruby.h
+++ b/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_NOTIMP_ERROR              mrb_exc_get_id(mrb, MRB_SYM(NotImplementedError))
+#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_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 */