svnno****@sourc*****
svnno****@sourc*****
2009年 8月 16日 (日) 16:44:07 JST
Revision: 977
http://sourceforge.jp/projects/hiki/svn/view?view=rev&revision=977
Author: fdiary
Date: 2009-08-16 16:44:07 +0900 (Sun, 16 Aug 2009)
Log Message:
-----------
more fix for Ruby-1.9. a bit code cleanup.
Modified Paths:
--------------
hiki/trunk/hiki/docdiff/view.rb
Modified: hiki/trunk/hiki/docdiff/view.rb
===================================================================
--- hiki/trunk/hiki/docdiff/view.rb 2009-08-15 17:55:54 UTC (rev 976)
+++ hiki/trunk/hiki/docdiff/view.rb 2009-08-16 07:44:07 UTC (rev 977)
@@ -57,11 +57,11 @@
@difference.each{|block|
operation = block.first
if block_given?
- source = yield block[1].join rescue ''
- target = yield block[2].join rescue ''
+ source = yield (block[1] || []).join
+ target = yield (block[2] || []).join
else
- source = block[1].join rescue ''
- target = block[2].join rescue ''
+ source = (block[1] || []).join
+ target = (block[2] || []).join
end
case operation
when :common_elt_elt
@@ -95,21 +95,21 @@
d2l = doc2_line_number = 1
@difference.each_with_index{|entry, i|
if block_given?
- source = yield entry[1].join rescue ''
- target = yield entry[2].join rescue ''
+ source = yield (entry[1] || []).join
+ target = yield (entry[2] || []).join
else
- source = entry[1].join rescue ''
- target = entry[2].join rescue ''
+ source = (entry[1] || []).join
+ target = (entry[2] || []).join
end
if i == 0
context_pre = "" # no pre context for the first entry
else
- context_pre = @difference[i-1][1].to_s.scan(context_pre_pat).to_s
+ context_pre = (@difference[i-1][1] || []).join.scan(context_pre_pat).join
end
if (i + 1) ==****@diffe*****
context_post = "" # no post context for the last entry
else
- context_post = @difference[i+1][1].to_s.scan(context_post_pat).to_s
+ context_post = (@difference[i+1][1] || []).join.scan(context_post_pat).join
end
# elements for an entry
e_header = Proc.new {|pos_str|