Changeset 439 for EcnlProtoTool/trunk/prototool/src/cmdprint.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/cmdprint.c (modified) (3 diffs)

EcnlProtoTool/trunk/prototool/src/cmdprint.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 @@
 dbgcmd_print(mrb_state *mrb, mrdb_state *mrdb)
 {
-        mrb_value expr;
-        mrb_value result;
-        mrb_value s;
-        uint8_t wcnt;
-        int ai;
+  mrb_value expr;
+  mrb_value result;
+  uint8_t wcnt;
+  int ai;
 
-        if (mrdb->wcnt <= 1) {
-                puts("Parameter not specified.");
-                return DBGST_PROMPT;
-        }
+  if (mrdb->wcnt <= 1) {
+    puts("Parameter not specified.");
+    return DBGST_PROMPT;
+  }
 
-        ai = mrb_gc_arena_save(mrb);
+  ai = mrb_gc_arena_save(mrb);
 
-        /* eval expr */
-        expr = mrb_str_new_cstr(mrb, NULL);
-        for (wcnt = 1; wcnt < mrdb->wcnt; wcnt++) {
-                expr = mrb_str_cat_lit(mrb, expr, " ");
-                expr = mrb_str_cat_cstr(mrb, expr, mrdb->words[wcnt]);
-        }
+  /* eval expr */
+  expr = mrb_str_new_cstr(mrb, NULL);
+  for (wcnt=1; wcnt<mrdb->wcnt; wcnt++) {
+    expr = mrb_str_cat_lit(mrb, expr, " ");
+    expr = mrb_str_cat_cstr(mrb, expr, mrdb->words[wcnt]);
+  }
 
-        result = mrb_debug_eval(mrb, mrdb->dbg, RSTRING_PTR(expr), RSTRING_LEN(expr), NULL);
+  result = mrb_debug_eval(mrb, mrdb->dbg, RSTRING_PTR(expr), RSTRING_LEN(expr), NULL, 0);
 
-        /* $print_no = result */
-        s = mrb_str_cat_lit(mrb, result, "\0");
-        printf("$%lu = %s\n", (unsigned long)mrdb->print_no++, RSTRING_PTR(s));
+  /* $print_no = result */
+  printf("$%lu = ", (unsigned long)mrdb->print_no++);
+  fwrite(RSTRING_PTR(result), RSTRING_LEN(result), 1, stdout);
+  putc('\n', stdout);
 
-        if (mrdb->print_no == 0) {
-                mrdb->print_no = 1;
-        }
+  if (mrdb->print_no == 0) {
+    mrdb->print_no = 1;
+  }
 
-        mrb_gc_arena_restore(mrb, ai);
+  mrb_gc_arena_restore(mrb, ai);
 
-        return DBGST_PROMPT;
+  return DBGST_PROMPT;
 }
 
@@ -56 +55 @@
 dbgcmd_eval(mrb_state *mrb, mrdb_state *mrdb)
 {
-        return dbgcmd_print(mrb, mrdb);
+  return dbgcmd_print(mrb, mrdb);
 }
+
+dbgcmd_state
+dbgcmd_info_local(mrb_state *mrb, mrdb_state *mrdb)
+{
+  mrb_value result;
+  mrb_value s;
+  int ai;
+
+  ai = mrb_gc_arena_save(mrb);
+
+  result = mrb_debug_eval(mrb, mrdb->dbg, "local_variables", 0, NULL, 1);
+
+  s = mrb_str_cat_lit(mrb, result, "\0");
+  printf("$%lu = %s\n", (unsigned long)mrdb->print_no++, RSTRING_PTR(s));
+
+  if (mrdb->print_no == 0) {
+    mrdb->print_no = 1;
+  }
+
+  mrb_gc_arena_restore(mrb, ai);
+
+  return DBGST_PROMPT;
+}