<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html lang='en' xml:lang='en' xmlns='http://www.w3.org/1999/xhtml'> <head> <title>rcov/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs/hunk.rb</title> <link href="screen.css" media="all" rel="stylesheet" type="text/css" /> <link href="print.css" media="print" rel="stylesheet" type="text/css" /> <meta http-equiv="Content-type" content="text/html;charset=UTF-8" /> <script type="text/javascript" src="rcov.js"></script> </head> <body> <h1>Rspec Steps C0 Coverage Information - RCov</h1> <h2>rcov/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs/hunk.rb</h2> <div class="report_table_wrapper"> <table class='report' id='report_table'> <thead> <tr> <th class="left_align">Name</th> <th class="right_align">Total Lines</th> <th class="right_align">Lines of Code</th> <th class="left_align">Total Coverage</th> <th class="left_align">Code Coverage</th> </tr> </thead> <tbody> <tr> <td class="left_align"><a href="rcov-ruby-1_8-gems-diff-lcs-1_1_2-lib-diff-lcs-hunk_rb.html">rcov/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs/hunk.rb</a></td> <td class='right_align'><tt>257</tt></td> <td class='right_align'><tt>170</tt></td> <td class="left_align"><div class="percent_graph_legend"><tt class=''>25.29%</tt></div> <div class="percent_graph"> <div class="covered" style="width:25px"></div> <div class="uncovered" style="width:75px"></div> </div></td> <td class="left_align"><div class="percent_graph_legend"><tt class=''>11.76%</tt></div> <div class="percent_graph"> <div class="covered" style="width:12px"></div> <div class="uncovered" style="width:88px"></div> </div></td> </tr> </tbody> </table> </div> <h3>Key</h3> <div class="key"><pre><span class='marked'>Code reported as executed by Ruby looks like this...</span><span class='marked1'>and this: this line is also marked as covered.</span><span class='inferred'>Lines considered as run by rcov, but not reported by Ruby, look like this,</span><span class='inferred1'>and this: these lines were inferred by rcov (using simple heuristics).</span><span class='uncovered'>Finally, here's a line marked as not executed.</span></pre></div> <h3>Coverage Details</h3> <table class="details"> <tbody> <tr class="inferred"> <td><pre><a name="line1">1</a> #! /usr/env/bin ruby</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line2">2</a> #--</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line3">3</a> # Copyright 2004 Austin Ziegler <diff-lcs@halostatue.ca></pre></td> </tr> <tr class="inferred"> <td><pre><a name="line4">4</a> # adapted from:</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line5">5</a> # Algorithm::Diff (Perl) by Ned Konz <perl@bike-nomad.com></pre></td> </tr> <tr class="inferred"> <td><pre><a name="line6">6</a> # Smalltalk by Mario I. Wolczko <mario@wolczko.com></pre></td> </tr> <tr class="inferred"> <td><pre><a name="line7">7</a> # implements McIlroy-Hunt diff algorithm</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line8">8</a> #</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line9">9</a> # This program is free software. It may be redistributed and/or modified under</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line10">10</a> # the terms of the GPL version 2 (or later), the Perl Artistic licence, or the</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line11">11</a> # Ruby licence.</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line12">12</a> # </pre></td> </tr> <tr class="inferred"> <td><pre><a name="line13">13</a> # $Id: hunk.rb,v 1.2 2004/08/08 20:33:09 austin Exp $</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line14">14</a> #++</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line15">15</a> # Contains Diff::LCS::Hunk for bin/ldiff.</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line16">16</a> </pre></td> </tr> <tr class="marked"> <td><pre><a name="line17">17</a> require 'diff/lcs/block'</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line18">18</a> </pre></td> </tr> <tr class="inferred"> <td><pre><a name="line19">19</a> # A Hunk is a group of Blocks which overlap because of the context</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line20">20</a> # surrounding each block. (So if we're not using context, every hunk will</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line21">21</a> # contain one block.) Used in the diff program (bin/diff).</pre></td> </tr> <tr class="marked"> <td><pre><a name="line22">22</a> class Diff::LCS::Hunk</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line23">23</a> # Create a hunk using references to both the old and new data, as well as</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line24">24</a> # the piece of data</pre></td> </tr> <tr class="marked"> <td><pre><a name="line25">25</a> def initialize(data_old, data_new, piece, context, file_length_difference)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line26">26</a> # At first, a hunk will have just one Block in it</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line27">27</a> @blocks = [ Diff::LCS::Block.new(piece) ]</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line28">28</a> @data_old = data_old</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line29">29</a> @data_new = data_new</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line30">30</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line31">31</a> before = after = file_length_difference</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line32">32</a> after += @blocks[0].diff_size</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line33">33</a> @file_length_difference = after # The caller must get this manually</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line34">34</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line35">35</a> # Save the start & end of each array. If the array doesn't exist</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line36">36</a> # (e.g., we're only adding items in this block), then figure out the</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line37">37</a> # line number based on the line number of the other file and the</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line38">38</a> # current difference in file lengths.</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line39">39</a> if @blocks[0].remove.empty?</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line40">40</a> a1 = a2 = nil</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line41">41</a> else</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line42">42</a> a1 = @blocks[0].remove[0].position</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line43">43</a> a2 = @blocks[0].remove[-1].position</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line44">44</a> end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line45">45</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line46">46</a> if @blocks[0].insert.empty?</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line47">47</a> b1 = b2 = nil</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line48">48</a> else</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line49">49</a> b1 = @blocks[0].insert[0].position</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line50">50</a> b2 = @blocks[0].insert[-1].position</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line51">51</a> end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line52">52</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line53">53</a> @start_old = a1 || (b1 - before)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line54">54</a> @start_new = b1 || (a1 + before)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line55">55</a> @end_old = a2 || (b2 - after)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line56">56</a> @end_new = b2 || (a2 + after)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line57">57</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line58">58</a> self.flag_context = context</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line59">59</a> end</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line60">60</a> </pre></td> </tr> <tr class="marked"> <td><pre><a name="line61">61</a> attr_reader :blocks</pre></td> </tr> <tr class="marked"> <td><pre><a name="line62">62</a> attr_reader :start_old, :start_new</pre></td> </tr> <tr class="marked"> <td><pre><a name="line63">63</a> attr_reader :end_old, :end_new</pre></td> </tr> <tr class="marked"> <td><pre><a name="line64">64</a> attr_reader :file_length_difference</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line65">65</a> </pre></td> </tr> <tr class="inferred"> <td><pre><a name="line66">66</a> # Change the "start" and "end" fields to note that context should be added</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line67">67</a> # to this hunk</pre></td> </tr> <tr class="marked"> <td><pre><a name="line68">68</a> attr_accessor :flag_context</pre></td> </tr> <tr class="marked"> <td><pre><a name="line69">69</a> def flag_context=(context) #:nodoc:</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line70">70</a> return if context.nil? or context.zero?</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line71">71</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line72">72</a> add_start = (context > @start_old) ? @start_old : context</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line73">73</a> @start_old -= add_start</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line74">74</a> @start_new -= add_start</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line75">75</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line76">76</a> if (@end_old + context) > @data_old.size</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line77">77</a> add_end = @data_old.size - @end_old</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line78">78</a> else</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line79">79</a> add_end = context</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line80">80</a> end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line81">81</a> @end_old += add_end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line82">82</a> @end_new += add_end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line83">83</a> end</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line84">84</a> </pre></td> </tr> <tr class="marked"> <td><pre><a name="line85">85</a> def unshift(hunk)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line86">86</a> @start_old = hunk.start_old</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line87">87</a> @start_new = hunk.start_new</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line88">88</a> blocks.unshift(*hunk.blocks)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line89">89</a> end</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line90">90</a> </pre></td> </tr> <tr class="inferred"> <td><pre><a name="line91">91</a> # Is there an overlap between hunk arg0 and old hunk arg1? Note: if end</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line92">92</a> # of old hunk is one less than beginning of second, they overlap</pre></td> </tr> <tr class="marked"> <td><pre><a name="line93">93</a> def overlaps?(hunk = nil)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line94">94</a> return nil if hunk.nil?</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line95">95</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line96">96</a> a = (@start_old - hunk.end_old) <= 1</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line97">97</a> b = (@start_new - hunk.end_new) <= 1</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line98">98</a> return (a or b)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line99">99</a> end</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line100">100</a> </pre></td> </tr> <tr class="marked"> <td><pre><a name="line101">101</a> def diff(format)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line102">102</a> case format</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line103">103</a> when :old</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line104">104</a> old_diff</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line105">105</a> when :unified</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line106">106</a> unified_diff</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line107">107</a> when :context</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line108">108</a> context_diff</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line109">109</a> when :ed</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line110">110</a> self</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line111">111</a> when :reverse_ed, :ed_finish</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line112">112</a> ed_diff(format)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line113">113</a> else</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line114">114</a> raise "Unknown diff format #{format}."</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line115">115</a> end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line116">116</a> end</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line117">117</a> </pre></td> </tr> <tr class="marked"> <td><pre><a name="line118">118</a> def each_old(block)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line119">119</a> @data_old[@start_old .. @end_old].each { |e| yield e }</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line120">120</a> end</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line121">121</a> </pre></td> </tr> <tr class="marked"> <td><pre><a name="line122">122</a> private</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line123">123</a> # Note that an old diff can't have any context. Therefore, we know that</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line124">124</a> # there's only one block in the hunk.</pre></td> </tr> <tr class="marked"> <td><pre><a name="line125">125</a> def old_diff</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line126">126</a> warn "Expecting only one block in an old diff hunk!" if @blocks.size > 1</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line127">127</a> op_act = { "+" => 'a', "-" => 'd', "!" => "c" }</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line128">128</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line129">129</a> block = @blocks[0]</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line130">130</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line131">131</a> # Calculate item number range. Old diff range is just like a context</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line132">132</a> # diff range, except the ranges are on one line with the action between</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line133">133</a> # them.</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line134">134</a> s = "#{context_range(:old)}#{op_act[block.op]}#{context_range(:new)}\n"</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line135">135</a> # If removing anything, just print out all the remove lines in the hunk</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line136">136</a> # which is just all the remove lines in the block.</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line137">137</a> @data_old[@start_old .. @end_old].each { |e| s << "< #{e}\n" } unless block.remove.empty?</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line138">138</a> s << "---\n" if block.op == "!"</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line139">139</a> @data_new[@start_new .. @end_new].each { |e| s << "> #{e}\n" } unless block.insert.empty?</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line140">140</a> s</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line141">141</a> end</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line142">142</a> </pre></td> </tr> <tr class="marked"> <td><pre><a name="line143">143</a> def unified_diff</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line144">144</a> # Calculate item number range.</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line145">145</a> s = "@@ -#{unified_range(:old)} +#{unified_range(:new)} @@\n"</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line146">146</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line147">147</a> # Outlist starts containing the hunk of the old file. Removing an item</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line148">148</a> # just means putting a '-' in front of it. Inserting an item requires</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line149">149</a> # getting it from the new file and splicing it in. We splice in</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line150">150</a> # +num_added+ items. Remove blocks use +num_added+ because splicing</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line151">151</a> # changed the length of outlist.</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line152">152</a> #</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line153">153</a> # We remove +num_removed+ items. Insert blocks use +num_removed+</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line154">154</a> # because their item numbers -- corresponding to positions in the NEW</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line155">155</a> # file -- don't take removed items into account.</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line156">156</a> lo, hi, num_added, num_removed = @start_old, @end_old, 0, 0</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line157">157</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line158">158</a> outlist = @data_old[lo .. hi].collect { |e| e.gsub(/^/, ' ') }</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line159">159</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line160">160</a> @blocks.each do |block|</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line161">161</a> block.remove.each do |item|</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line162">162</a> op = item.action.to_s # -</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line163">163</a> offset = item.position - lo + num_added</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line164">164</a> outlist[offset].gsub!(/^ /, op.to_s)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line165">165</a> num_removed += 1</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line166">166</a> end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line167">167</a> block.insert.each do |item|</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line168">168</a> op = item.action.to_s # +</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line169">169</a> offset = item.position - @start_new + num_removed</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line170">170</a> outlist[offset, 0] = "#{op}#{@data_new[item.position]}"</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line171">171</a> num_added += 1</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line172">172</a> end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line173">173</a> end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line174">174</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line175">175</a> s << outlist.join("\n")</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line176">176</a> end</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line177">177</a> </pre></td> </tr> <tr class="marked"> <td><pre><a name="line178">178</a> def context_diff</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line179">179</a> s = "***************\n"</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line180">180</a> s << "*** #{context_range(:old)} ****\n"</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line181">181</a> r = context_range(:new)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line182">182</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line183">183</a> # Print out file 1 part for each block in context diff format if there</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line184">184</a> # are any blocks that remove items</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line185">185</a> lo, hi = @start_old, @end_old</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line186">186</a> removes = @blocks.select { |e| not e.remove.empty? }</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line187">187</a> if removes</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line188">188</a> outlist = @data_old[lo .. hi].collect { |e| e.gsub(/^/, ' ') }</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line189">189</a> removes.each do |block|</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line190">190</a> block.remove.each do |item|</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line191">191</a> outlist[item.position - lo].gsub!(/^ /) { block.op } # - or !</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line192">192</a> end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line193">193</a> end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line194">194</a> s << outlist.join("\n")</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line195">195</a> end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line196">196</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line197">197</a> s << "\n--- #{r} ----\n"</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line198">198</a> lo, hi = @start_new, @end_new</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line199">199</a> inserts = @blocks.select { |e| not e.insert.empty? }</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line200">200</a> if inserts</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line201">201</a> outlist = @data_new[lo .. hi].collect { |e| e.gsub(/^/, ' ') }</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line202">202</a> inserts.each do |block|</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line203">203</a> block.insert.each do |item|</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line204">204</a> outlist[item.position - lo].gsub!(/^ /) { block.op } # + or !</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line205">205</a> end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line206">206</a> end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line207">207</a> s << outlist.join("\n")</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line208">208</a> end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line209">209</a> s</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line210">210</a> end</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line211">211</a> </pre></td> </tr> <tr class="marked"> <td><pre><a name="line212">212</a> def ed_diff(format)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line213">213</a> op_act = { "+" => 'a', "-" => 'd', "!" => "c" }</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line214">214</a> warn "Expecting only one block in an old diff hunk!" if @blocks.size > 1</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line215">215</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line216">216</a> if format == :reverse_ed</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line217">217</a> s = "#{op_act[@blocks[0].op]}#{context_range(:old)}\n"</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line218">218</a> else</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line219">219</a> s = "#{context_range(:old).gsub(/,/, ' ')}#{op_act[@blocks[0].op]}\n"</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line220">220</a> end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line221">221</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line222">222</a> unless @blocks[0].insert.empty?</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line223">223</a> @data_new[@start_new .. @end_new].each { |e| s << "#{e}\n" }</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line224">224</a> s << ".\n"</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line225">225</a> end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line226">226</a> s</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line227">227</a> end</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line228">228</a> </pre></td> </tr> <tr class="inferred"> <td><pre><a name="line229">229</a> # Generate a range of item numbers to print. Only print 1 number if the</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line230">230</a> # range has only one item in it. Otherwise, it's 'start,end'</pre></td> </tr> <tr class="marked"> <td><pre><a name="line231">231</a> def context_range(mode)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line232">232</a> case mode</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line233">233</a> when :old</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line234">234</a> s, e = (@start_old + 1), (@end_old + 1)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line235">235</a> when :new</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line236">236</a> s, e = (@start_new + 1), (@end_new + 1)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line237">237</a> end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line238">238</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line239">239</a> (s < e) ? "#{s},#{e}" : "#{e}"</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line240">240</a> end</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line241">241</a> </pre></td> </tr> <tr class="inferred"> <td><pre><a name="line242">242</a> # Generate a range of item numbers to print for unified diff. Print</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line243">243</a> # number where block starts, followed by number of lines in the block</pre></td> </tr> <tr class="inferred"> <td><pre><a name="line244">244</a> # (don't print number of lines if it's 1)</pre></td> </tr> <tr class="marked"> <td><pre><a name="line245">245</a> def unified_range(mode)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line246">246</a> case mode</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line247">247</a> when :old</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line248">248</a> s, e = (@start_old + 1), (@end_old + 1)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line249">249</a> when :new</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line250">250</a> s, e = (@start_new + 1), (@end_new + 1)</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line251">251</a> end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line252">252</a> </pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line253">253</a> length = e - s + 1</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line254">254</a> first = (length < 2) ? e : s # "strange, but correct"</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line255">255</a> (length == 1) ? "#{first}" : "#{first},#{length}"</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line256">256</a> end</pre></td> </tr> <tr class="uncovered"> <td><pre><a name="line257">257</a> end</pre></td> </tr> </tbody> </table> <p>Generated on Fri Apr 22 17:22:41 -0700 2011 with <a href="http://github.com/relevance/rcov">rcov 0.9.8</a></p> </body> </html>