Merge pull request #1072 from monaka/pr-cleanup-code-20130326

Cleanup code.

3 files changed, 1 insertions, 22 deletions

diff --git a/src/array.c b/src/array.c
index 5f588e195..f9cc9119c 100644
--- a/src/array.c
+++ b/src/array.c
@@ -952,11 +952,7 @@ static mrb_value
 mrb_ary_inspect(mrb_state *mrb, mrb_value ary)
 {
   if (RARRAY_LEN(ary) == 0) return mrb_str_new(mrb, "[]", 2);
-  #if 0 /* THREAD */
-    return mrb_exec_recursive(inspect_ary_r, ary, 0);
-  #else
     return inspect_ary(mrb, ary, mrb_ary_new(mrb));
-  #endif
 }
 
 static mrb_value
diff --git a/src/parse.y b/src/parse.y
index bdb646799..4826f4336 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -395,15 +395,6 @@ new_fcall(parser_state *p, mrb_sym b, node *c)
   return list4((node*)NODE_FCALL, new_self(p), nsym(b), c);
 }
 
-#if 0
-// (:vcall self mid)
-static node*
-new_vcall(parser_state *p, mrb_sym b)
-{
-  return list3((node*)NODE_VCALL, new_self(p), (node*)b);
-}
-#endif
-
 // (:super . c)
 static node*
 new_super(parser_state *p, node *c)
@@ -1790,11 +1781,6 @@ arg		: lhs '=' arg
 		| arg tMATCH arg
 		    {
 		      $$ = call_bin_op(p, $1, "=~", $3);
-#if 0
-		      if (nd_type($1) == NODE_LIT && TYPE($1->nd_lit) == T_REGEXP) {
-			$$ = reg_named_capture_assign($1->nd_lit, $$);
-		      }
-#endif
 		    }
 		| arg tNMATCH arg
 		    {
diff --git a/src/string.c b/src/string.c
index 79c40e9cc..65f21a091 100644
--- a/src/string.c
+++ b/src/string.c
@@ -2068,9 +2068,6 @@ mrb_str_sub(mrb_state *mrb, mrb_value self)
 mrb_value
 mrb_cstr_to_inum(mrb_state *mrb, const char *str, int base, int badcheck)
 {
-  #define BDIGIT unsigned int
-  #define BDIGIT_DBL unsigned long
-
   char *end;
   char sign = 1;
   int c;
@@ -2278,7 +2275,7 @@ mrb_cstr_to_dbl(mrb_state *mrb, const char * p, int badcheck)
   char *end;
   double d;
 #if !defined(DBL_DIG)
-  #define DBL_DIG 16
+# define DBL_DIG 16
 #endif
 
   enum {max_width = 20};