* eval.c (rb_eval), parse.y (arg): reduce fixnum range literal at

  parser.  fixed: [ruby-dev:26113]


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

3 files changed, 21 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 15cb7a7c16..cf26c43aa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 12 01:21:13 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_eval), parse.y (arg): reduce fixnum range literal at
+	  parser.  fixed: [ruby-dev:26113]
+
 Wed May 11 16:20:01 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/cgi.rb: new methods WEBrick::CGI#[], WEBrick::CGI#logger
diff --git a/eval.c b/eval.c
index 990aa5da47..86a97c1b31 100644
--- a/eval.c
+++ b/eval.c
@@ -3207,16 +3207,6 @@ rb_eval(self, n)
 	result = rb_range_new(rb_eval(self, node->nd_beg),
 			      rb_eval(self, node->nd_end),
 			      nd_type(node) == NODE_DOT3);
-	if (node->nd_state) break;
-	if (nd_type(node->nd_beg) == NODE_LIT && FIXNUM_P(node->nd_beg->nd_lit) &&
-	    nd_type(node->nd_end) == NODE_LIT && FIXNUM_P(node->nd_end->nd_lit))
-	{
-	    nd_set_type(node, NODE_LIT);
-	    node->nd_lit = result;
-	}
-	else {
-	    node->nd_state = 1;
-	}
 	break;
 
       case NODE_FLIP2:		/* like AWK */
diff --git a/parse.y b/parse.y
index 2b41cd558a..fe2cd06856 100644
--- a/parse.y
+++ b/parse.y
@@ -1057,13 +1057,27 @@ arg		: lhs '=' arg
 		    {
 			value_expr($1);
 			value_expr($3);
-			$$ = NEW_DOT2($1, $3);
+			if (nd_type($1) == NODE_LIT && FIXNUM_P($1->nd_lit) &&
+			    nd_type($3) == NODE_LIT && FIXNUM_P($3->nd_lit)) {
+			    $1->nd_lit = rb_range_new($1->nd_lit, $3->nd_lit, Qfalse);
+			    $$ = $1;
+			}
+			else {
+			    $$ = NEW_DOT2($1, $3);
+			}
 		    }
 		| arg tDOT3 arg
 		    {
 			value_expr($1);
 			value_expr($3);
-			$$ = NEW_DOT3($1, $3);
+			if (nd_type($1) == NODE_LIT && FIXNUM_P($1->nd_lit) &&
+			    nd_type($3) == NODE_LIT && FIXNUM_P($3->nd_lit)) {
+			    $1->nd_lit = rb_range_new($1->nd_lit, $3->nd_lit, Qtrue);
+			    $$ = $1;
+			}
+			else {
+			    $$ = NEW_DOT3($1, $3);
+			}
 		    }
 		| arg '+' arg
 		    {