resolve conflict

mruby · May 31, 2012 · 64fc4ac · 64fc4ac
1 parent 0d8adaa
commit 64fc4ac
Show file tree

Hide file tree

Showing 11 changed files with 350 additions and 4,784 deletions.
diff --git a/include/mruby/string.h b/include/mruby/string.h
@@ -30,34 +30,15 @@ extern const char mrb_digitmap[];
 struct RString {
   MRUBY_OBJECT_HEADER;
   int len;
-  union {
+  int capa;
-    int capa;
-    struct RString *shared;
-  } aux;
   char *buf;
 };
 
-extern struct SCOPE {
-    struct RBasic super;
-    mrb_sym *local_tbl;
-    mrb_value *local_vars;
-    int flags;
-} *ruby_scope;
-
-struct RVarmap {
-    struct RBasic super;
-    mrb_sym id;
-    mrb_value val;
-    struct RVarmap *next;
-};
-extern struct RVarmap *ruby_dyna_vars;
-
 #define mrb_str_ptr(s)    ((struct RString*)((s).value.p))
 #define RSTRING(s)        ((struct RString*)((s).value.p))
 #define RSTRING_PTR(s)    (RSTRING(s)->buf)
 #define RSTRING_LEN(s)    (RSTRING(s)->len)
-#define RSTRING_CAPA(s)   (RSTRING(s)->aux.capa)
+#define RSTRING_CAPA(s)   (RSTRING(s)->capa)
-#define RSTRING_SHARED(s) (RSTRING(s)->aux.shared)
 #define RSTRING_END(s)    (RSTRING(s)->buf + RSTRING(s)->len)
 
 #define MRB_STR_SHARED      256

diff --git a/src/class.c b/src/class.c
@@ -17,12 +17,6 @@
 
 #include "mruby/khash.h"
 
-#ifdef INCLUDE_REGEXP
-  #define mrb_usascii_str_new2 mrb_usascii_str_new_cstr
-#else
-  #define mrb_usascii_str_new2 mrb_str_new_cstr
-#endif
-
 KHASH_MAP_INIT_INT(mt, struct RProc*);
 KHASH_MAP_INIT_INT(iv, mrb_value);
 
@@ -1052,7 +1046,7 @@ mrb_mod_to_s(mrb_state *mrb, mrb_value klass)
 {
   //if (FL_TEST(klass, FL_SINGLETON)) {
   if (mrb_type(klass) == MRB_TT_SCLASS) {
-    mrb_value s = mrb_usascii_str_new2(mrb, "#<");
+    mrb_value s = mrb_str_new_cstr(mrb, "#<");
     mrb_value v = mrb_iv_get(mrb, klass, mrb_intern(mrb, "__attached__"));
 
     mrb_str_cat2(mrb, s, "Class:");