Commit: 20f69555e2fe5dbad78dc10af80a7503b617278a - mruby_brightv_hello (git)

超漢字上で、mrubyを使ってhello worldを表示させる。

Commit MetaInfo

• Révision: 20f69555e2fe5dbad78dc10af80a7503b617278a (tree)
• l'heure: 2017-06-05 23:18:29
• Auteur: ornse01 <ornse01@user...>
• Commiter: ornse01

Message de Log

fix for B-right/V environment.

Change Summary

• modified: src/mrbgems_port/mruby-test/driver.c
• modified: src/mrbgems_port/mruby-test/init_mrbtest.c
• modified: src/mrbgems_port/mruby-test/mrbgem.rake

Modification

--- a/src/mrbgems_port/mruby-test/driver.c
+++ b/src/mrbgems_port/mruby-test/driver.c
@@ -6,9 +6,11 @@
 */
 
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <basic.h>
+#include <bstdio.h>
+#include <bstdlib.h>
+#include <bstring.h>
+#include <btron/btron.h>
 
 #include "mruby.h"
 #include "mruby/proc.h"
@@ -18,6 +20,8 @@
 #include "mruby/variable.h"
 #include "mruby/array.h"
 
+#include "../../posix_include/stdlib.h"
+
 void
 mrb_init_mrbtest(mrb_state *);
 
@@ -60,12 +64,10 @@ static void
 t_printstr(mrb_state *mrb, mrb_value obj)
 {
   char *s;
-  int len;
 
   if (mrb_string_p(obj)) {
     s = RSTRING_PTR(obj);
-    len = RSTRING_LEN(obj);
-    fwrite(s, len, 1, stdout);
+    printf("%s", s);
   }
 }
 
@@ -136,8 +138,8 @@ mrb_t_pass_result(mrb_state *mrb_dst, mrb_state *mrb_src)
   }
 }
 
-int
-main(int argc, char **argv)
+EXPORT W
+MAIN(MESSAGE *msg)
 {
   mrb_state *mrb;
   int ret;
@@ -148,14 +150,16 @@ main(int argc, char **argv)
   /* new interpreter instance */
   mrb = mrb_open();
   if (mrb == NULL) {
-    fprintf(stderr, "Invalid mrb_state, exiting test driver");
+    printf("Invalid mrb_state, exiting test driver");
     return EXIT_FAILURE;
   }
 
+  /*
   if (argc == 2 && argv[1][0] == '-' && argv[1][1] == 'v') {
     printf("verbose mode: enable\n\n");
     verbose = TRUE;
   }
+  */
 
   mrb_init_test_driver(mrb, verbose);
   mrb_init_mrbtest(mrb);

--- a/src/mrbgems_port/mruby-test/init_mrbtest.c
+++ b/src/mrbgems_port/mruby-test/init_mrbtest.c
@@ -19,7 +19,7 @@ mrb_init_mrbtest(mrb_state *mrb)
 
   core_test = mrb_open_core(mrb_default_allocf, NULL);
   if (core_test == NULL) {
-    fprintf(stderr, "Invalid mrb_state, exiting %s", __FUNCTION__);
+    printf("Invalid mrb_state, exiting %s", __FUNCTION__);
     exit(EXIT_FAILURE);
   }
   mrb_init_test_driver(core_test, mrb_test(mrb_gv_get(mrb, mrb_intern_lit(mrb, "$mrbtest_verbose"))));

--- a/src/mrbgems_port/mruby-test/mrbgem.rake
+++ b/src/mrbgems_port/mruby-test/mrbgem.rake
@@ -1,6 +1,6 @@
 MRuby::Gem::Specification.new('mruby-test') do |spec|
   spec.license = 'MIT'
-  spec.author  = 'mruby developers'
+  spec.author  = ['mruby developers', 'ornse01']
   spec.summary = 'mruby test'
 
   build.bins << 'mrbtest'
@@ -81,7 +81,7 @@ MRuby::Gem::Specification.new('mruby-test') do |spec|
             f.puts %Q[  ai = mrb_gc_arena_save(mrb);]
             f.puts %Q[  mrb2 = mrb_open_core(mrb_default_allocf, NULL);]
             f.puts %Q[  if (mrb2 == NULL) {]
-            f.puts %Q[    fprintf(stderr, "Invalid mrb_state, exiting \%s", __FUNCTION__);]
+            f.puts %Q[    printf("Invalid mrb_state, exiting \%s", __FUNCTION__);]
             f.puts %Q[    exit(EXIT_FAILURE);]
             f.puts %Q[  }]
             dep_list.each do |d|