Changeset 439 for EcnlProtoTool/trunk/prototool/src/apiprint.c

Timestamp:

Jul 9, 2020, 8:51:43 AM (4 years ago)

Author:

coas-nagasima

Message:

mrubyを2.1.1に更新

File:

• EcnlProtoTool/trunk/prototool/src/apiprint.c (modified) (2 diffs)

EcnlProtoTool/trunk/prototool/src/apiprint.c

@@ -4 +4 @@
 */
 
-#include <stdlib.h>
-
+#include <string.h>
 #include "mrdb.h"
-#include "mruby/value.h"
-#include "mruby/class.h"
-#include "mruby/compile.h"
-#include "mruby/error.h"
-#include "mruby/numeric.h"
-#include "mruby/string.h"
+#include <mruby/value.h>
+#include <mruby/class.h>
+#include <mruby/compile.h>
+#include <mruby/error.h>
+#include <mruby/numeric.h>
+#include <mruby/string.h>
 #include "apiprint.h"
 
@@ -18 +17 @@
 mrdb_check_syntax(mrb_state *mrb, mrb_debug_context *dbg, const char *expr, size_t len)
 {
-        mrbc_context *c;
+  mrbc_context *c;
 
-        c = mrbc_context_new(mrb);
-        c->no_exec = TRUE;
-        c->capture_errors = TRUE;
-        c->filename = (char*)dbg->prvfile;
-        c->lineno = dbg->prvline;
+  c = mrbc_context_new(mrb);
+  c->no_exec = TRUE;
+  c->capture_errors = TRUE;
+  mrbc_filename(mrb, c, (const char*)dbg->prvfile);
+  c->lineno = dbg->prvline;
 
-        /* Load program */
-        mrb_load_nstring_cxt(mrb, expr, len, c);
+  /* Load program */
+  mrb_load_nstring_cxt(mrb, expr, len, c);
 
-        mrbc_context_free(mrb, c);
+  mrbc_context_free(mrb, c);
 }
 
 mrb_value
-mrb_debug_eval(mrb_state *mrb, mrb_debug_context *dbg, const char *expr, size_t len, mrb_bool *exc)
+mrb_debug_eval(mrb_state *mrb, mrb_debug_context *dbg, const char *expr, size_t len, mrb_bool *exc, int direct_eval)
 {
-        void(*tmp)(struct mrb_state *, struct mrb_irep *, mrb_code *, mrb_value *);
-        mrb_value ruby_code;
-        mrb_value s;
-        mrb_value v;
-        mrb_value recv;
+  void (*tmp)(struct mrb_state *, struct mrb_irep *, const mrb_code *, mrb_value *);
+  mrb_value ruby_code;
+  mrb_value s;
+  mrb_value v;
+  mrb_value recv;
 
-        /* disable code_fetch_hook */
-        tmp = mrb->code_fetch_hook;
-        mrb->code_fetch_hook = NULL;
+  /* disable code_fetch_hook */
+  tmp = mrb->code_fetch_hook;
+  mrb->code_fetch_hook = NULL;
 
-        mrdb_check_syntax(mrb, dbg, expr, len);
-        if (mrb->exc) {
-                v = mrb_obj_value(mrb->exc);
-                mrb->exc = 0;
-        }
-        else {
-                /*
-                 * begin
-                 *   expr
-                 * rescue => e
-                 *   e
-                 * end
-                 */
-                ruby_code = mrb_str_new_lit(mrb, "begin\n");
-                ruby_code = mrb_str_cat(mrb, ruby_code, expr, len);
-                ruby_code = mrb_str_cat_lit(mrb, ruby_code, "\nrescue => e\ne\nend");
+  mrdb_check_syntax(mrb, dbg, expr, len);
+  if (mrb->exc) {
+    v = mrb_obj_value(mrb->exc);
+    mrb->exc = 0;
+  }
+  else if (direct_eval) {
+    recv = dbg->regs[0];
 
-                recv = dbg->regs[0];
+    v = mrb_funcall(mrb, recv, expr, 0);
+  }
+  else {
+    /*
+     * begin
+     *   expr
+     * rescue => e
+     *   e
+     * end
+     */
+    ruby_code = mrb_str_new_lit(mrb, "begin\n");
+    ruby_code = mrb_str_cat(mrb, ruby_code, expr, len);
+    ruby_code = mrb_str_cat_lit(mrb, ruby_code, "\nrescue => e\ne\nend");
 
-                v = mrb_funcall(mrb, recv, "instance_eval", 1, ruby_code);
-        }
+    recv = dbg->regs[0];
 
-        if (exc) {
-                *exc = mrb_obj_is_kind_of(mrb, v, mrb->eException_class);
-        }
+    v =  mrb_funcall(mrb, recv, "instance_eval", 1, ruby_code);
+  }
 
-        s = mrb_funcall(mrb, v, "inspect", 0);
+  if (exc) {
+    *exc = mrb_obj_is_kind_of(mrb, v, mrb->eException_class);
+  }
 
-        /* enable code_fetch_hook */
-        mrb->code_fetch_hook = tmp;
+  s = mrb_inspect(mrb, v);
 
-        return s;
+  /* enable code_fetch_hook */
+  mrb->code_fetch_hook = tmp;
+
+  return s;
 }