webruby 0.2.2 → 0.2.4

data/modules/mruby/tools/mrbc/mrbc.c

@@ -11,8 +11,6 @@
 
 void mrb_show_version(mrb_state *);
 void mrb_show_copyright(mrb_state *);
-void parser_dump(mrb_state*, struct mrb_ast_node*, int);
-void codedump_all(mrb_state*, int);
 
 struct mrbc_args {
   int argc;
@@ -181,13 +179,14 @@ partial_hook(struct mrb_parser_state *p)
   return 0;
 }
 
-static int
+static mrb_value
 load_file(mrb_state *mrb, struct mrbc_args *args)
 {
   mrbc_context *c;
   mrb_value result;
   char *input = args->argv[args->idx];
   FILE *infile;
+  int need_close = FALSE;
 
   c = mrbc_context_new(mrb);
   if (args->verbose)
@@ -196,38 +195,43 @@ load_file(mrb_state *mrb, struct mrbc_args *args)
   if (input[0] == '-' && input[1] == '\0') {
     infile = stdin;
   }
-  else if ((infile = fopen(input, "r")) == NULL) {
-    fprintf(stderr, "%s: cannot open program file. (%s)\n", args->prog, input);
-    return EXIT_FAILURE;
+  else {
+    need_close = TRUE;
+    if ((infile = fopen(input, "r")) == NULL) {
+      fprintf(stderr, "%s: cannot open program file. (%s)\n", args->prog, input);
+      return mrb_nil_value();
+    }
   }
   mrbc_filename(mrb, c, input);
   args->idx++;
   if (args->idx < args->argc) {
+    need_close = FALSE;
     mrbc_partial_hook(mrb, c, partial_hook, (void*)args);
   }
 
   result = mrb_load_file_cxt(mrb, infile, c);
-  if (mrb_undef_p(result) || mrb_fixnum(result) < 0) {
-    mrbc_context_free(mrb, c);
-    return EXIT_FAILURE;
-  }
+  if (need_close) fclose(infile);
   mrbc_context_free(mrb, c);
-  return EXIT_SUCCESS;
+  if (mrb_undef_p(result)) {
+    return mrb_nil_value();
+  }
+  return result;
 }
 
 static int
-dump_file(mrb_state *mrb, FILE *wfp, const char *outfile, struct mrbc_args *args)
+dump_file(mrb_state *mrb, FILE *wfp, const char *outfile, struct RProc *proc, struct mrbc_args *args)
 {
   int n = MRB_DUMP_OK;
+  mrb_irep *irep = proc->body.irep;
 
   if (args->initname) {
-    n = mrb_dump_irep_cfunc(mrb, 0, args->debug_info, wfp, args->initname);
+    n = mrb_dump_irep_cfunc(mrb, irep, args->debug_info, wfp, args->initname);
     if (n == MRB_DUMP_INVALID_ARGUMENT) {
       fprintf(stderr, "%s: invalid C language symbol name\n", args->initname);
     }
   }
   else {
-    n = mrb_dump_irep_binary(mrb, 0, args->debug_info, wfp);
+    n = mrb_dump_irep_binary(mrb, irep, args->debug_info, wfp);
   }
   if (n != MRB_DUMP_OK) {
     fprintf(stderr, "%s: error in mrb dump (%s) %d\n", args->prog, outfile, n);
@@ -242,6 +246,7 @@ main(int argc, char **argv)
   int n, result;
   struct mrbc_args args;
   FILE *wfp;
+  mrb_value load;
 
   if (mrb == NULL) {
     fputs("Invalid mrb_state, exiting mrbc\n", stderr);
@@ -269,12 +274,13 @@ main(int argc, char **argv)
   }
 
   args.idx = n;
-  if (load_file(mrb, &args) == EXIT_FAILURE) {
+  load = load_file(mrb, &args);
+  if (mrb_nil_p(load)) {
     cleanup(mrb, &args);
     return EXIT_FAILURE;
   }
   if (args.check_syntax) {
-    printf("%s:%s:Syntax OK", args.prog, argv[n]);
+    printf("%s:%s:Syntax OK\n", args.prog, argv[n]);
   }
 
   if (args.check_syntax) {
@@ -295,7 +301,7 @@ main(int argc, char **argv)
     fprintf(stderr, "Output file is required\n");
     return EXIT_FAILURE;
   }
-  result = dump_file(mrb, wfp, args.outfile, &args);
+  result = dump_file(mrb, wfp, args.outfile, mrb_proc_ptr(load), &args);
   fclose(wfp);
   cleanup(mrb, &args);
   if (result != MRB_DUMP_OK) {

data/modules/mruby/travis_config.rb

@@ -1,7 +1,16 @@
+MRuby::Build.new('debug') do |conf|
+  toolchain :gcc
+  enable_debug
+
+  # include all core GEMs
+  conf.gembox 'full-core'
+  conf.cc.defines += %w(MRB_GC_FIXED_ARENA)
+end
+
 MRuby::Build.new do |conf|
   toolchain :gcc
 
   # include all core GEMs
   conf.gembox 'full-core'
-  conf.cc.defines = %w(MRB_DEBUG)
+  conf.cc.defines += %w(MRB_GC_FIXED_ARENA)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webruby
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Xuejie Xiao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies: []
 description: compile your favourite Ruby source code for the browser!
 email: xxuejie@gmail.com
@@ -33,7 +33,10 @@ files:
 - templates/minimal/app/app.rb
 - templates/minimal/Rakefile
 - modules/emscripten/AUTHORS
+- modules/emscripten/ChangeLog
+- modules/emscripten/cmake/Modules/FindOpenAL.cmake
 - modules/emscripten/cmake/Platform/Emscripten.cmake
+- modules/emscripten/CONTRIBUTING.markdown
 - modules/emscripten/em++
 - modules/emscripten/em++.bat
 - modules/emscripten/em-config
@@ -50,6 +53,8 @@ files:
 - modules/emscripten/emmake.bat
 - modules/emscripten/emranlib
 - modules/emscripten/emranlib.bat
+- modules/emscripten/emrun
+- modules/emscripten/emrun.bat
 - modules/emscripten/emscons
 - modules/emscripten/emscripten.py
 - modules/emscripten/LICENSE
@@ -68,6 +73,7 @@ files:
 - modules/emscripten/src/determinstic.js
 - modules/emscripten/src/embind/embind.js
 - modules/emscripten/src/embind/emval.js
+- modules/emscripten/src/emrun_postjs.js
 - modules/emscripten/src/experimental/allow_loopvars_from_memsetcpy_inasm.diff
 - modules/emscripten/src/experimental/batching.diff
 - modules/emscripten/src/experimental/functypeopt.diff
@@ -83,6 +89,7 @@ files:
 - modules/emscripten/src/gl-matrix.js
 - modules/emscripten/src/headless.js
 - modules/emscripten/src/headlessCanvas.js
+- modules/emscripten/src/hello_world.js
 - modules/emscripten/src/intertyper.js
 - modules/emscripten/src/jsifier.js
 - modules/emscripten/src/library.js
@@ -181,15 +188,19 @@ files:
 - modules/emscripten/system/include/compat/sys/timeb.h
 - modules/emscripten/system/include/compat/time.h
 - modules/emscripten/system/include/compat/unistd.h
+- modules/emscripten/system/include/compat/wchar.h
+- modules/emscripten/system/include/compat/wctype.h
 - modules/emscripten/system/include/compat/xlocale.h
 - modules/emscripten/system/include/EGL/egl.h
 - modules/emscripten/system/include/EGL/eglext.h
 - modules/emscripten/system/include/EGL/eglplatform.h
 - modules/emscripten/system/include/emscripten/bind.h
+- modules/emscripten/system/include/emscripten/emmintrin.h
 - modules/emscripten/system/include/emscripten/emscripten.h
 - modules/emscripten/system/include/emscripten/val.h
 - modules/emscripten/system/include/emscripten/vector.h
 - modules/emscripten/system/include/emscripten/wire.h
+- modules/emscripten/system/include/emscripten/xmmintrin.h
 - modules/emscripten/system/include/execinfo.h
 - modules/emscripten/system/include/gc.h
 - modules/emscripten/system/include/gfx/png.h
@@ -457,6 +468,7 @@ files:
 - modules/emscripten/system/include/libcxx/cwchar
 - modules/emscripten/system/include/libcxx/cwctype
 - modules/emscripten/system/include/libcxx/deque
+- modules/emscripten/system/include/libcxx/dynarray
 - modules/emscripten/system/include/libcxx/exception
 - modules/emscripten/system/include/libcxx/ext/__hash
 - modules/emscripten/system/include/libcxx/ext/hash_map
@@ -481,6 +493,7 @@ files:
 - modules/emscripten/system/include/libcxx/mutex
 - modules/emscripten/system/include/libcxx/new
 - modules/emscripten/system/include/libcxx/numeric
+- modules/emscripten/system/include/libcxx/optional
 - modules/emscripten/system/include/libcxx/ostream
 - modules/emscripten/system/include/libcxx/queue
 - modules/emscripten/system/include/libcxx/random
@@ -489,12 +502,16 @@ files:
 - modules/emscripten/system/include/libcxx/regex
 - modules/emscripten/system/include/libcxx/scoped_allocator
 - modules/emscripten/system/include/libcxx/set
+- modules/emscripten/system/include/libcxx/shared_mutex
 - modules/emscripten/system/include/libcxx/sstream
 - modules/emscripten/system/include/libcxx/stack
 - modules/emscripten/system/include/libcxx/stdexcept
 - modules/emscripten/system/include/libcxx/streambuf
 - modules/emscripten/system/include/libcxx/string
 - modules/emscripten/system/include/libcxx/strstream
+- modules/emscripten/system/include/libcxx/support/ibm/limits.h
+- modules/emscripten/system/include/libcxx/support/ibm/support.h
+- modules/emscripten/system/include/libcxx/support/ibm/xlocale.h
 - modules/emscripten/system/include/libcxx/support/solaris/floatingpoint.h
 - modules/emscripten/system/include/libcxx/support/solaris/wchar.h
 - modules/emscripten/system/include/libcxx/support/solaris/xlocale.h
@@ -689,6 +706,11 @@ files:
 - modules/emscripten/system/lib/libc/musl/src/multibyte/wcstombs.c
 - modules/emscripten/system/lib/libc/musl/src/multibyte/wctob.c
 - modules/emscripten/system/lib/libc/musl/src/multibyte/wctomb.c
+- modules/emscripten/system/lib/libc/musl/src/regex/regcomp.c
+- modules/emscripten/system/lib/libc/musl/src/regex/regerror.c
+- modules/emscripten/system/lib/libc/musl/src/regex/regexec.c
+- modules/emscripten/system/lib/libc/musl/src/regex/tre-mem.c
+- modules/emscripten/system/lib/libc/musl/src/regex/tre.h
 - modules/emscripten/system/lib/libc/musl/src/stdio/fwprintf.c
 - modules/emscripten/system/lib/libc/musl/src/stdio/swprintf.c
 - modules/emscripten/system/lib/libc/musl/src/stdio/vfwprintf.c
@@ -746,9 +768,11 @@ files:
 - modules/emscripten/system/lib/libcxx/memory.cpp
 - modules/emscripten/system/lib/libcxx/mutex.cpp
 - modules/emscripten/system/lib/libcxx/new.cpp
+- modules/emscripten/system/lib/libcxx/optional.cpp
 - modules/emscripten/system/lib/libcxx/random.cpp
 - modules/emscripten/system/lib/libcxx/readme.txt
 - modules/emscripten/system/lib/libcxx/regex.cpp
+- modules/emscripten/system/lib/libcxx/shared_mutex.cpp
 - modules/emscripten/system/lib/libcxx/stdexcept.cpp
 - modules/emscripten/system/lib/libcxx/string.cpp
 - modules/emscripten/system/lib/libcxx/strstream.cpp
@@ -818,6 +842,7 @@ files:
 - modules/emscripten/third_party/jni/emjvm.js
 - modules/emscripten/third_party/jni/jni.h
 - modules/emscripten/third_party/libiberty.h
+- modules/emscripten/third_party/lzma.js/doit.bat
 - modules/emscripten/third_party/lzma.js/doit.sh
 - modules/emscripten/third_party/lzma.js/lzip/arg_parser.cc
 - modules/emscripten/third_party/lzma.js/lzip/arg_parser.h
@@ -1463,8 +1488,7 @@ files:
 - modules/mruby/tasks/toolchains/androideabi.rake
 - modules/mruby/tasks/toolchains/clang.rake
 - modules/mruby/tasks/toolchains/gcc.rake
-- modules/mruby/tasks/toolchains/vs2010.rake
-- modules/mruby/tasks/toolchains/vs2012.rake
+- modules/mruby/tasks/toolchains/visualcpp.rake
 - modules/mruby/test/assert.rb
 - modules/mruby/test/driver.c
 - modules/mruby/test/init_mrbtest.c
@@ -1516,7 +1540,6 @@ files:
 - modules/mrubymix/LICENSE
 - modules/mrubymix/mrubymix.gemspec
 - modules/mrubymix/README.md
-- modules/emscripten/tests/hello_world.js
 homepage: https://github.com/xxuejie/webruby
 licenses:
 - MIT

data/modules/mruby/tasks/toolchains/vs2010.rake

@@ -1,3 +0,0 @@
-MRuby::Toolchain.new(:vs2010) do |conf|
-  toolchain :vs2012
-end