* parse.y (opt_rescue): use NODE_ERRINFO() instead of

  NODE_GVAR("$!"), to avoid confusion from variable aliasing.
  [ruby-talk:90074]

* version.c (Init_version): remove obsolete constants VERSION
  etc.  [ruby-dev:22643]


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

1 files changed, 3 insertions, 0 deletions

diff --git a/eval.c b/eval.c
index 24cf02c9c4..ed7729fcfa 100644
--- a/eval.c
+++ b/eval.c
@@ -2775,6 +2775,9 @@ rb_eval(self, n)
       case NODE_FALSE:
 	RETURN(Qfalse);
 
+      case NODE_ERRINFO:
+	RETURN(ruby_errinfo);
+
       case NODE_IF:
 	if (trace_func) {
 	    call_trace_func("line", node, self,