* eval.c (avalue_to_svalue): typo.

* eval.c (rb_load): rb_prohibit_interrupt should not underflow.

* parse.y (NODE_STRTERM, tokadd_string, parse_string): moved string
  nest level from a static variable to NODE_STRTERM.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 2 deletions

diff --git a/eval.c b/eval.c
index 43404a91a..964d30270 100644
--- a/eval.c
+++ b/eval.c
@@ -2289,7 +2289,7 @@ avalue_to_svalue(v)
     VALUE tmp, top;
 
     tmp = rb_check_array_type(v);
-    if (NIL_P(v)) {
+    if (NIL_P(tmp)) {
 	return v;
     }
     if (RARRAY(tmp)->len == 0) {
@@ -5761,7 +5761,6 @@ rb_load(fname, wrap)
 	rb_load_file(RSTRING(fname)->ptr);
 	ruby_in_eval--;
 	node = ruby_eval_tree;
-	ALLOW_INTS;
 	rb_thread_critical = critical;
 	if (ruby_nerrs == 0) {
 	    eval_node(self, node);