* parse.y [ripper]: adjust lineno and columns for multi-line strings.

* parse.y [ripper]: delay heredocument events until seeing end-of-line.
* parse.y [ripper]: event on__heredoc_contentn -> on__tstring_content.
* ext/ripper/eventids2.c: ditto.
* ext/ripper/lib/ripper.rb: sync with eventids2.c.
* test/ripper/test_scanner_events.rb: test it.
* ext/ripper/tools/generate-ripper_rb.rb: show basename of input.
* ext/ripper/Makefile.dev: support objdir build.


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

4 files changed, 6 insertions, 15 deletions

diff --git a/ext/ripper/Makefile.dev b/ext/ripper/Makefile.dev
index 59615e56d6..ab16a7a74b 100644
--- a/ext/ripper/Makefile.dev
+++ b/ext/ripper/Makefile.dev
@@ -15,4 +15,4 @@ test:
 
 preproc: ripper.E
 ripper.E: ripper.c
-	$(CC) -E $(CPPFLAGS) ripper.c | ruby tools/strip.rb > $@
+	$(CC) -E $(CPPFLAGS) ripper.c | ruby $(srcdir)/tools/strip.rb > $@
diff --git a/ext/ripper/eventids2.c b/ext/ripper/eventids2.c
index cab4b45657..f26b5f8433 100644
--- a/ext/ripper/eventids2.c
+++ b/ext/ripper/eventids2.c
@@ -5,10 +5,9 @@
 #define tEMBDOC_END      (tLAST_TOKEN + 5)
 #define tSP              (tLAST_TOKEN + 6)
 #define tHEREDOC_BEG     (tLAST_TOKEN + 7)
-#define tHEREDOC_CONTENT (tLAST_TOKEN + 8)
-#define tHEREDOC_END     (tLAST_TOKEN + 9)
-#define k__END__         (tLAST_TOKEN + 10)
-#define tCHAR            (tLAST_TOKEN + 11)
+#define tHEREDOC_END     (tLAST_TOKEN + 8)
+#define k__END__         (tLAST_TOKEN + 9)
+#define tCHAR            (tLAST_TOKEN + 10)
 
 static ID ripper_id_scan;
 
@@ -53,7 +52,6 @@ static ID ripper_id_embdoc;
 static ID ripper_id_embdoc_end;
 static ID ripper_id_sp;
 static ID ripper_id_heredoc_beg;
-static ID ripper_id_heredoc_content;
 static ID ripper_id_heredoc_end;
 static ID ripper_id___end__;
 static ID ripper_id_CHAR;
@@ -104,7 +102,6 @@ ripper_init_eventids2()
     ripper_id_embdoc_end = rb_intern("on__embdoc_end");
     ripper_id_sp = rb_intern("on__sp");
     ripper_id_heredoc_beg = rb_intern("on__heredoc_beg");
-    ripper_id_heredoc_content = rb_intern("on__heredoc_content");
     ripper_id_heredoc_end = rb_intern("on__heredoc_end");
     ripper_id___end__ = rb_intern("on____end__");
     ripper_id_CHAR = rb_intern("on__CHAR");
@@ -250,7 +247,6 @@ static struct token_assoc {
     {tEMBDOC_END,       &ripper_id_embdoc_end},
     {tSP,               &ripper_id_sp},
     {tHEREDOC_BEG,      &ripper_id_heredoc_beg},
-    {tHEREDOC_CONTENT,  &ripper_id_heredoc_content},
     {tHEREDOC_END,      &ripper_id_heredoc_end},
     {k__END__,          &ripper_id___end__},
     {0, NULL}
diff --git a/ext/ripper/lib/ripper.rb b/ext/ripper/lib/ripper.rb
index 16db062ad4..c0715de988 100644
--- a/ext/ripper/lib/ripper.rb
+++ b/ext/ripper/lib/ripper.rb
@@ -1,5 +1,5 @@
 #
-# This file is automatically generated from /home/aamine/c/ruby/ext/ripper/ripper.rb.in and parse.y.
+# This file is automatically generated from ripper.rb.in and parse.y.
 # DO NOT MODIFY!!!!!!
 #
 #
@@ -165,7 +165,6 @@ class Ripper
     :float => 1,
     :gvar => 1,
     :heredoc_beg => 1,
-    :heredoc_content => 1,
     :heredoc_end => 1,
     :ident => 1,
     :ignored_nl => 1,
@@ -774,10 +773,6 @@ class Ripper
     token
   end
 
-  def on__heredoc_content(token)
-    token
-  end
-
   def on__heredoc_end(token)
     token
   end
diff --git a/ext/ripper/tools/generate-ripper_rb.rb b/ext/ripper/tools/generate-ripper_rb.rb
index b85d2745a0..b6fb166568 100755
--- a/ext/ripper/tools/generate-ripper_rb.rb
+++ b/ext/ripper/tools/generate-ripper_rb.rb
@@ -4,7 +4,7 @@ def main
   template, ids1, ids2 = *ARGV
   print <<header
 #
-# This file is automatically generated from #{template} and parse.y.
+# This file is automatically generated from #{File.basename(template)} and parse.y.
 # DO NOT MODIFY!!!!!!
 #
 header