* io.c (rb_io_mode_flags): both 'r+b' and 'rb+' should be allowed.

* io.c (rb_io_mode_modenum): ditto.

* gc.c (rb_memerror): rename from mem_error, and exported.

* gc.c (Init_GC): pre-allocate NoMemoryError instance.

* object.c (convert_type): error message changed from "failed to
  convert" to "cannot convert", since it does not try to convert
  if an object does not respond to the converting method.

* eval.c (block_pass): convert Method to Proc using
  rb_check_convert_type().

* object.c (rb_check_convert_type): always convert T_DATA

* eval.c (rb_thread_cleanup): should not terminate main_thread by
  Fatal error.

* regex.c (is_in_list): need to not exclude NUL and NEWLINE.

* re.c (rb_reg_expr_str): wrong backslash escapement.

* re.c (rb_reg_expr_str): do not escape embedded space
  characters.

* marshal.c (w_object): T_DATA process patch from Joel VanderWerf
  <vjoel@PATH.Berkeley.EDU>.  This is temporary hack; it remains
  undocumented, and it will be removed when marshaling is
  re-designed.

* marshal.c (r_object): ditto.

* numeric.c (num_step): Integer#step is moved to Numeric#step;
  Fixnum#step is merged into this method.

* numeric.c (int_dotimes): Fixnum#times is merged.

* numeric.c (int_upto): Fixnum#upto is merged.

* numeric.c (int_downto): Fixnum#downto is merged.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 42 insertions, 42 deletions

diff --git a/parse.y b/parse.y
index 213edbbd92..2afc4ded5d 100644
--- a/parse.y
+++ b/parse.y
@@ -472,7 +472,7 @@ stmt		: kALIAS fitem {lex_state = EXPR_FNAME;} fitem
 		    }
 		| primary_value '[' aref_args ']' tOP_ASGN command_call
 		    {
-                        NODE *tmp, *args = NEW_LIST($6);
+                        NODE *args = NEW_LIST($6);
 
 			$3 = list_append($3, NEW_NIL());
 			list_concat(args, $3);
@@ -836,7 +836,7 @@ arg		: lhs '=' arg
 		    }
 		| primary_value '[' aref_args ']' tOP_ASGN arg
 		    {
-                        NODE *tmp, *args = NEW_LIST($6);
+                        NODE *args = NEW_LIST($6);
 
 			$3 = list_append($3, NEW_NIL());
 			list_concat(args, $3);
@@ -5203,46 +5203,46 @@ static struct {
     ID token;
     char *name;
 } op_tbl[] = {
-    tDOT2,	"..",
-    tDOT3,	"...",
-    '+',	"+",
-    '-',	"-",
-    '+',	"+(binary)",
-    '-',	"-(binary)",
-    '*',	"*",
-    '/',	"/",
-    '%',	"%",
-    tPOW,	"**",
-    tUPLUS,	"+@",
-    tUMINUS,	"-@",
-    tUPLUS,	"+(unary)",
-    tUMINUS,	"-(unary)",
-    '|',	"|",
-    '^',	"^",
-    '&',	"&",
-    tCMP,	"<=>",
-    '>',	">",
-    tGEQ,	">=",
-    '<',	"<",
-    tLEQ,	"<=",
-    tEQ,	"==",
-    tEQQ,	"===",
-    tNEQ,	"!=",
-    tMATCH,	"=~",
-    tNMATCH,	"!~",
-    '!',	"!",
-    '~',	"~",
-    '!',	"!(unary)",
-    '~',	"~(unary)",
-    '!',	"!@",
-    '~',	"~@",
-    tAREF,	"[]",
-    tASET,	"[]=",
-    tLSHFT,	"<<",
-    tRSHFT,	">>",
-    tCOLON2,	"::",
-    '`',	"`",
-    0,		0,
+    {tDOT2,	".."},
+    {tDOT3,	"..."},
+    {'+',	"+"},
+    {'-',	"-"},
+    {'+',	"+(binary)"},
+    {'-',	"-(binary)"},
+    {'*',	"*"},
+    {'/',	"/"},
+    {'%',	"%"},
+    {tPOW,	"**"},
+    {tUPLUS,	"+@"},
+    {tUMINUS,	"-@"},
+    {tUPLUS,	"+(unary)"},
+    {tUMINUS,	"-(unary)"},
+    {'|',	"|"},
+    {'^',	"^"},
+    {'&',	"&"},
+    {tCMP,	"<=>"},
+    {'>',	">"},
+    {tGEQ,	">="},
+    {'<',	"<"},
+    {tLEQ,	"<="},
+    {tEQ,	"=="},
+    {tEQQ,	"==="},
+    {tNEQ,	"!="},
+    {tMATCH,	"=~"},
+    {tNMATCH,	"!~"},
+    {'!',	"!"},
+    {'~',	"~"},
+    {'!',	"!(unary)"},
+    {'~',	"~(unary)"},
+    {'!',	"!@"},
+    {'~',	"~@"},
+    {tAREF,	"[]"},
+    {tASET,	"[]="},
+    {tLSHFT,	"<<"},
+    {tRSHFT,	">>"},
+    {tCOLON2,	"::"},
+    {'`',	"`"},
+    {0,	0}
 };
 
 static st_table *sym_tbl;