summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-10-20 13:23:26 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-10-20 13:23:26 +0000
commitd284e44687ae8075941833e6867654a2b76e846a (patch)
treeff24d1da95fba044ed642f5f4ff6cad47ac8e75f
parent14029df9302ba632bc271ae4149571d8b4a98675 (diff)
* ext/ripper/tools/preproc.rb (prelude): do not append surplus
newlines to fix line numbers. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9430 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rwxr-xr-xext/ripper/tools/preproc.rb4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 44e4c864e9..2adade6fb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
-Thu Oct 20 22:14:43 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Oct 20 22:22:49 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parser.y (struct parser_params): parser never modify input string.
+ * ext/ripper/tools/preproc.rb (prelude): do not append surplus
+ newlines to fix line numbers.
+
Thu Oct 20 11:41:57 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* class.c, eval.c, hash.c, st.c, variable.c: changed /* ??? */ stuff
diff --git a/ext/ripper/tools/preproc.rb b/ext/ripper/tools/preproc.rb
index bd3f33772c..06397cea05 100755
--- a/ext/ripper/tools/preproc.rb
+++ b/ext/ripper/tools/preproc.rb
@@ -51,9 +51,9 @@ def prelude(f, out)
out << '%%' << $/
return
when /\A%token/
- out << line.sub(/<\w+>/, '<val>') << $/
+ out << line.sub(/<\w+>/, '<val>')
when /\A%type/
- out << line.sub(/<\w+>/, '<val>') << $/
+ out << line.sub(/<\w+>/, '<val>')
else
out << line
end