[ruby-dev:21235] Re: [PATCH] reducing PUSH/POP/EXEC_TAG() for retry

なかだです。

At Fri, 22 Aug 2003 00:55:34 +0900,
Yukihiro Matsumoto wrote:
> |retryするときに同じ場所でEXEC_TAG()を繰り返すのを、減らしてみま
> |した。
> 
> 採用したいんですが、このパッチを当てるとmakeが
> 
> compiling Win32API
> /home/matz/work/ruby/lib/fileutils.rb:415:in `sysread': End of file reached (EOFError)

rescueの後でruby_errinfoを戻してませんでした。忘れてましたが、
そういえばloadって最後にruby_errinfoをチェックするんですよねぇ。


Index: eval.c
===================================================================
RCS file: /cvs/ruby/src/ruby/eval.c,v
retrieving revision 1.520
diff -u -2 -p -r1.520 eval.c
--- eval.c	23 Aug 2003 04:05:38 -0000	1.520
+++ eval.c	23 Aug 2003 04:27:24 -0000
@@ -2711,5 +2711,4 @@ rb_eval(self, n)
       case NODE_FOR:
 	{
-	  iter_retry:
 	    PUSH_TAG(PROT_FUNC);
 	    PUSH_BLOCK(node->nd_var, node->nd_body);
@@ -2717,4 +2716,5 @@ rb_eval(self, n)
 	    state = EXEC_TAG();
 	    if (state == 0) {
+	      iter_retry:
 		PUSH_ITER(ITER_PRE);
 		if (nd_type(node) == NODE_ITER) {
@@ -2734,8 +2734,14 @@ rb_eval(self, n)
 		POP_ITER();
 	    }
-	    else if (_block.tag->dst == state) {
-		state &= TAG_MASK;
-		if (state == TAG_RETURN || state == TAG_BREAK) {
-		    result = prot_tag->retval;
+	    else {
+		if (_block.tag->dst == state) {
+		    state &= TAG_MASK;
+		    if (state == TAG_RETURN || state == TAG_BREAK) {
+			result = prot_tag->retval;
+		    }
+		}
+		if (state == TAG_RETRY) {
+		    state = 0;
+		    goto iter_retry;
 		}
 	    }
@@ -2746,7 +2752,4 @@ rb_eval(self, n)
 		break;
 
-	      case TAG_RETRY:
-		goto iter_retry;
-
 	      case TAG_BREAK:
 		break;
@@ -2808,7 +2811,7 @@ rb_eval(self, n)
 
       case NODE_RESCUE:
-      retry_entry:
         {
 	    volatile VALUE e_info = ruby_errinfo;
+	    volatile int rescuing = 0;
 
 	    PUSH_TAG(PROT_NONE);
@@ -2816,7 +2819,16 @@ rb_eval(self, n)
 		result = rb_eval(self, node->nd_head);
 	    }
-	    POP_TAG();
-	    if (state == TAG_RAISE) {
-		NODE * volatile resq = node->nd_resq;
+	    else if (rescuing) {
+		if (state == TAG_RETRY) {
+		    rescuing = state = 0;
+		    e_info = ruby_errinfo = Qnil;
+		    result = rb_eval(self, node->nd_head);
+		}
+		else if (state != TAG_RAISE) {
+		    ruby_errinfo = e_info;
+		}
+	    }
+	    else if (state == TAG_RAISE) {
+		NODE *resq = node->nd_resq;
 
 		while (resq) {
@@ -2824,17 +2836,7 @@ rb_eval(self, n)
 		    if (handle_rescue(self, resq)) {
 			state = 0;
-			PUSH_TAG(PROT_NONE);
-			if ((state = EXEC_TAG()) == 0) {
-			    result = rb_eval(self, resq->nd_body);
-			}
-			POP_TAG();
-			if (state == TAG_RETRY) {
-			    state = 0;
-			    ruby_errinfo = Qnil;
-			    goto retry_entry;
-			}
-			if (state != TAG_RAISE) {
-			    ruby_errinfo = e_info;
-			}
+			rescuing = 1;
+			result = rb_eval(self, resq->nd_body);
+			ruby_errinfo = e_info;
 			break;
 		    }
@@ -2842,10 +2844,10 @@ rb_eval(self, n)
 		}
 	    }
-	    else if (node->nd_else) { /* else clause given */
-		if (!state) {	/* no exception raised */
-		    result = rb_eval(self, node->nd_else);
-		}
-	    }
+	    POP_TAG();
 	    if (state) JUMP_TAG(state);
+	    /* no exception raised */
+	    if (node->nd_else) { /* else clause given */
+		result = rb_eval(self, node->nd_else);
+	    }
 	}
         break;
@@ -4436,5 +4438,4 @@ rb_iterate(it_proc, data1, bl_proc, data
     VALUE self = ruby_top_self;
 
-  iter_retry:
     PUSH_ITER(ITER_PRE);
     PUSH_BLOCK(0, node);
@@ -4443,10 +4444,17 @@ rb_iterate(it_proc, data1, bl_proc, data
     state = EXEC_TAG();
     if (state == 0) {
+  iter_retry:
 	retval = (*it_proc)(data1);
     }
-    if (ruby_block->tag->dst == state) {
-	state &= TAG_MASK;
-	if (state == TAG_RETURN || state == TAG_BREAK) {
-	    retval = prot_tag->retval;
+    else {
+	if (ruby_block->tag->dst == state) {
+	    state &= TAG_MASK;
+	    if (state == TAG_RETURN || state == TAG_BREAK) {
+		retval = prot_tag->retval;
+	    }
+	}
+	if (state == TAG_RETRY) {
+	    state = 0;
+	    goto iter_retry;
 	}
     }
@@ -4459,7 +4467,4 @@ rb_iterate(it_proc, data1, bl_proc, data
 	break;
 
-      case TAG_RETRY:
-	goto iter_retry;
-
       case TAG_BREAK:
 	break;
@@ -7046,5 +7051,4 @@ proc_invoke(proc, args, self, klass)
     ruby_block = &_block;
 
-  again:
     PUSH_ITER(ITER_CUR);
     ruby_frame->iter = ITER_CUR;
@@ -7260,5 +7264,4 @@ block_pass(self, node)
     orphan = block_orphan(data);
 
-  retry:
     /* PUSH BLOCK from data */
     old_block = ruby_block;
@@ -7272,4 +7275,5 @@ block_pass(self, node)
     state = EXEC_TAG();
     if (state == 0) {
+      retry:
 	proc_set_safe_level(proc);
 	if (safe > ruby_safe_level)
@@ -7277,6 +7281,4 @@ block_pass(self, node)
 	result = rb_eval(self, node->nd_iter);
     }
-    POP_TAG();
-    POP_ITER();
     if (_block.tag->dst == state) {
 	if (orphan) {
@@ -7298,4 +7300,10 @@ block_pass(self, node)
 	}
     }
+    if (state == TAG_RETRY) {
+	state = 0;
+	goto retry;
+    }
+    POP_TAG();
+    POP_ITER();
     ruby_block = old_block;
     ruby_safe_level = safe;
@@ -7307,6 +7315,4 @@ block_pass(self, node)
 	result = prot_tag->retval;
 	break;
-      case TAG_RETRY:
-	goto retry;
       case TAG_RETURN:
 	if (orphan) {


-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦