nobu	2008-09-30 01:02:58 +0900 (Tue, 30 Sep 2008)

  New Revision: 19631

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19631

  Log:
    * parse.y (token_info_push, token_info_pop): do nothing for evaled
      source.

  Modified files:
    trunk/ChangeLog
    trunk/parse.y

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19630)
+++ ChangeLog	(revision 19631)
@@ -1,71 +1,8 @@
-Tue Sep 30 00:47:43 2008  Nobuyoshi Nakada  <nobu@r...>
+Tue Sep 30 01:02:55 2008  Nobuyoshi Nakada  <nobu@r...>
 
-	* ext/nkf/nkf-utf8/nkf.c: constified.
+	* parse.y (token_info_push, token_info_pop): do nothing for evaled
+	  source.
 
-Mon Sep 29 23:32:25 2008  Tanaka Akira  <akr@f...>
-
-	* string.c (rb_str_subseq): don't use rb_str_drop_bytes for short
-	  string.
-
-Mon Sep 29 22:54:29 2008  Tadayoshi Funaba  <tadf@d...>
-
-	* lib/mathn.rb: added String#to_[rc].  moved def_canon.
-
-Mon Sep 29 20:41:19 2008  Tanaka Akira  <akr@f...>
-
-	* string.c (rb_str_subseq): use rb_str_drop_bytes if possible.
-
-Mon Sep 29 20:22:20 2008  Tadayoshi Funaba  <tadf@d...>
-
-	* test/date/*.rb: imported additional tests and some adjustments.
-
-Mon Sep 29 20:13:05 2008  Masaki Suketa  <masaki.suketa@n...>
-
-	* ext/win32ole/win32ole.c (fev_initialize): initialization
-	  handler instance variable.
-
-	* test/win32ole/test_win32ole_typelib.rb (test_s_typelibs):
-	  fix the warning of shadowing outer local variable.
-
-Mon Sep 29 19:59:00 2008  Masaki Suketa  <masaki.suketa@n...>
-
-	* ext/win32ole/win32ole.c (rescue_callback): use rb_write_error
-	  instead of fprintf.
-
-Mon Sep 29 01:51:54 2008  Yusuke Endoh  <mame@t...>
-
-	* test/rdoc/test_rdoc_info_formatting.rb (teardown): delete tmpdir for
-	  test.
-
-Mon Sep 29 00:30:20 2008  Takeyuki Fujioka  <xibbar@r...>
-
-	* lib/cgi/html.rb (CGI::HtmlExtension::{radio_group, checkbox_group}):
-	can specify the false as checked or selected value.
-	[ruby-core:18306], [ruby-core:18307]
-
-	* test/cgi/test_cgi_tag_helper.rb: add a test.
-
-Sun Sep 28 23:08:38 2008  Takeyuki Fujioka  <xibbar@r...>
-
-	* lib/cgi/html.rb (CGI::HtmlExtension::popup_menu):
-	fix the calls #bytesize on array parameters. [ruby-core:18919]
-
-Sun Sep 28 22:44:26 2008  Takeyuki Fujioka  <xibbar@r...>
-
-	* lib/cgi/core.rb (CGI::parse): ignore illegal query params.
-	[ruby-dev:36618]
-
-Sun Sep 28 22:05:07 2008  Yusuke Endoh  <mame@t...>
-
-	* compile.c (iseq_set_sequence): check duplicated when clause.
-	  [ruby-dev:36616]
-
-Sun Sep 28 19:04:03 2008  Tadayoshi Funaba  <tadf@d...>
-
-	* test/date/*.rb: imported a date test suite ruby 1.9 limited ed.
-
-Sun Sep 28 18:40:49 2008  Nobuyoshi Nakada  <nobu@r...>
-
 	* lib/mini/test.rb (MINI_DIR): loaded path is expanded.
 
 	* lib/mini/test.rb (assert_match): get rid of confusion of
Index: parse.y
===================================================================
--- parse.y	(revision 19630)
+++ parse.y	(revision 19631)
@@ -4814,8 +4814,10 @@
 static void
 token_info_push(struct parser_params *parser, const char *token)
 {
-    token_info *ptinfo = ALLOC(token_info);
+    token_info *ptinfo;
 
+    if (compile_for_eval) return;
+    ptinfo = ALLOC(token_info);
     ptinfo->token = token;
     ptinfo->linenum = ruby_sourceline;
     ptinfo->column = token_info_get_column(parser, token);
@@ -4831,6 +4833,7 @@
     int linenum;
     token_info *ptinfo = parser->parser_token_info;
 
+    if (!ptinfo) return;
     parser->parser_token_info = ptinfo->next;
     if (token_info_get_column(parser, token) == ptinfo->column) { /* OK */
 	goto finish;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/