Permalink
Browse files

Merge branch 'master' into iij

Conflicts:
	.gitignore
  • Loading branch information...
2 parents efccb2d + 0f98227 commit 957ad58176092a12f61295093f039cb704951201 @akiray03 akiray03 committed Jan 8, 2013
View
@@ -1,17 +1,10 @@
# /
*.bak
-*.dylib
-*.inc
-*.o
-*.a
*.orig
*.rej
*.sav
*.swp
-*.d
*.tmp
-*.ctmp
-*.rbtmp
*~
.DS_Store
.ccmalloc
@@ -21,21 +14,4 @@ cscope.out
/src/y.tab.c
/bin
/build
-/mrblib/mrblib.c
-/mrblib/*.*tmp
-/mrblib/mrblib.mrb
-/test/mrbtest
-/test/mrbtest.c
-/test/*.*tmp
-/test/mrubytest.*
-tools/mrbc/mrbc.mrb
-CMakeFiles
-CMakeCache.txt
-/mrbgems/generator
-/mrbgems/gem_init.c
-/mrbgems/g/Makefile
-/mrbgems/g/MakefileGemList
-/mrbgems/g/mrbgemtest.ctmp
-/mrbgems/g/mrbgemtest.rbtmp
-/mrbgems/g/*/gem_*
/tmp
View
@@ -16,6 +16,3 @@ test :
clean :
$(RAKE) clean
-.PHONY : showconfig
-showconfig :
- $(RAKE) showconfig
View
@@ -21,6 +21,8 @@ load 'tasks/mrbgems.rake'
load 'tasks/libmruby.rake'
load 'tools/mruby/mruby.rake'
load 'tools/mirb/mirb.rake'
+
+load 'tasks/mrbgems_test.rake'
load 'test/mrbtest.rake'
##############################
View
@@ -27,6 +27,10 @@ A remote GIT repository location for a GEM is also supported:
conf.gem :git => 'https://github.com/masuidrive/mrbgems-example.git', :branch => 'master'
```
+```
+conf.gem :github => 'masuidrive/mrbgems-example', :branch => 'master'
+```
+
## GEM Structure
@@ -1,5 +0,0 @@
-# mrbgems
-*.d
-gem_init.c
-gem_test.c
-
@@ -1,5 +0,0 @@
-# mrbgems
-*.d
-gem_init.c
-gem_test.c
-
@@ -1,4 +0,0 @@
-# mrbgems
-*.d
-gem_init.c
-gem_test.c
View
@@ -128,7 +128,10 @@ typedef struct mrb_state {
size_t gc_threshold;
int gc_interval_ratio;
int gc_step_ratio;
- int gc_disabled;
+ unsigned int gc_disabled:1;
+ unsigned int gc_full:1;
+ unsigned int is_generational_gc_mode:1;
+ size_t majorgc_old_threshold;
struct alloca_header *mems;
mrb_sym symidx;
@@ -245,16 +248,6 @@ void mrb_write_barrier(mrb_state *, struct RBasic*);
#define MRUBY_VERSION "Rite"
-#ifdef DEBUG
-#undef DEBUG
-#endif
-
-#if 0
-#define DEBUG(x) x
-#else
-#define DEBUG(x)
-#endif
-
mrb_value mrb_check_convert_type(mrb_state *mrb, mrb_value val, mrb_int type, const char *tname, const char *method);
mrb_value mrb_any_to_s(mrb_state *mrb, mrb_value obj);
const char * mrb_obj_classname(mrb_state *mrb, mrb_value obj);
View
@@ -55,6 +55,7 @@ mrb_value mrb_ary_new4(mrb_state *mrb, int n, const mrb_value *elts);
mrb_value mrb_assoc_new(mrb_state *mrb, mrb_value car, mrb_value cdr);
mrb_value mrb_ary_entry(mrb_value ary, int offset);
mrb_value mrb_ary_shift(mrb_state *mrb, mrb_value self);
+mrb_value mrb_ary_clear(mrb_state *mrb, mrb_value self);
#if defined(__cplusplus)
} /* extern "C" { */
View
@@ -12,7 +12,11 @@ extern "C" {
#endif
#include "mruby.h"
-#include <stdio.h>
+#ifdef DISABLE_STDIO
+# error "Configuration conflict. Can't use with DISABLE_STDIO option."
+#else
+# include <stdio.h>
+#endif
int mrb_cdump_irep(mrb_state *mrb, int n, FILE *f,const char *initname);
View
@@ -1102,6 +1102,10 @@ codegen(codegen_scope *s, node *tree, int val)
genop(s, MKOP_AsBx(OP_JMPNOT, cursp(), 0));
codegen(s, tree->cdr->car, val);
+ if (val && !(tree->cdr->car)) {
+ genop(s, MKOP_A(OP_LOADNIL, cursp()));
+ push();
+ }
if (e) {
if (val) pop();
pos2 = new_label(s);
Oops, something went wrong.

0 comments on commit 957ad58

Please sign in to comment.