* parse.y (parser_parse_string): mention "regexp" in a error

  message.  a patch from Mauricio Fernandez <mfp at acm.org>
  [ruby-core:07340]

* eval.c (rb_f_autoload): check if ruby_cbase is nil (during
  instance_eval for objects cannot have singleton classes,
  e.g. fixnums and symbols).  [ruby-dev:28178]

* gc.c (rb_gc_call_finalizer_at_exit): turn on during_gc while
  invoking finalizers.

* gc.c (rb_gc_finalize_deferred): ditto.

* io.c (rb_write_error2): use fwrite(3) if rb_stderr is not
  updated or is already freed.  [ruby-dev:28313]

* eval.c (error_line): include the class name of a surrounding
  method in error position description.


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

1 files changed, 10 insertions, 3 deletions

diff --git a/parse.y b/parse.y
index 41de56b9d5..d7af518fdf 100644
--- a/parse.y
+++ b/parse.y
@@ -5194,9 +5194,16 @@ parser_parse_string(struct parser_params *parser, NODE *quote)
     }
     pushback(c);
     if (tokadd_string(func, term, paren, &quote->nd_nest) == -1) {
-	ruby_sourceline = nd_line(quote);
-	rb_compile_error(PARSER_ARG  "unterminated string meets end of file");
-	return tSTRING_END;
+       if (func & STR_FUNC_REGEXP) {
+           ruby_sourceline = nd_line(quote);
+           rb_compile_error(PARSER_ARG  "unterminated regexp meets end of file");
+           return tREGEXP_END;
+       }
+       else {
+           ruby_sourceline = nd_line(quote);
+           rb_compile_error(PARSER_ARG  "unterminated string meets end of file");
+           return tSTRING_END;
+       }
     }
 
     tokfix();