svnno****@sourc*****
svnno****@sourc*****
2009年 8月 16日 (日) 18:38:29 JST
Revision: 978
http://sourceforge.jp/projects/hiki/svn/view?view=rev&revision=978
Author: fdiary
Date: 2009-08-16 18:38:29 +0900 (Sun, 16 Aug 2009)
Log Message:
-----------
more fix for Ruby-1.9.
Modified Paths:
--------------
hiki/trunk/hiki/docdiff/view.rb
hiki/trunk/hiki/util.rb
Modified: hiki/trunk/hiki/docdiff/view.rb
===================================================================
--- hiki/trunk/hiki/docdiff/view.rb 2009-08-16 07:44:07 UTC (rev 977)
+++ hiki/trunk/hiki/docdiff/view.rb 2009-08-16 09:38:29 UTC (rev 978)
@@ -57,8 +57,8 @@
@difference.each{|block|
operation = block.first
if block_given?
- source = yield (block[1] || []).join
- target = yield (block[2] || []).join
+ source = yield((block[1] || []).join)
+ target = yield((block[2] || []).join)
else
source = (block[1] || []).join
target = (block[2] || []).join
@@ -95,8 +95,8 @@
d2l = doc2_line_number = 1
@difference.each_with_index{|entry, i|
if block_given?
- source = yield (entry[1] || []).join
- target = yield (entry[2] || []).join
+ source = yield((entry[1] || []).join)
+ target = yield((entry[2] || []).join)
else
source = (entry[1] || []).join
target = (entry[2] || []).join
Modified: hiki/trunk/hiki/util.rb
===================================================================
--- hiki/trunk/hiki/util.rb 2009-08-16 07:44:07 UTC (rev 977)
+++ hiki/trunk/hiki/util.rb 2009-08-16 09:38:29 UTC (rev 978)
@@ -285,9 +285,9 @@
words = Difference.new
lines.each{|line|
if line.first == :change_elt
- before_change = Document.new(line[1].to_s,
+ before_change = Document.new((line[1] || []).join,
doc1.encoding, doc1.eol)
- after_change = Document.new(line[2].to_s,
+ after_change = Document.new((line[2] || []).join,
doc2.encoding, doc2.eol)
Difference.new(before_change.split_to_word,
after_change.split_to_word).each{|word|