daff 1.2.6 → 1.3.1

data/lib/lib/coopy/csv.rb

@@ -25,28 +25,23 @@ module Coopy
     
     def render_table(t)
       result = ""
-      w = t.get_width
-      h = t.get_height
       txt = ""
       v = t.get_cell_view
-      begin
-        _g = 0
-        while(_g < h) 
-          y = _g
-          _g+=1
-          begin
-            _g1 = 0
-            while(_g1 < w) 
-              x = _g1
-              _g1+=1
-              txt += @delim if x > 0
-              txt += self.render_cell(v,t.get_cell(x,y))
-            end
+      stream = ::Coopy::TableStream.new(t)
+      w = stream.width
+      while(stream.fetch) 
+        begin
+          _g = 0
+          while(_g < w) 
+            x = _g
+            _g+=1
+            txt += @delim if x > 0
+            txt += self.render_cell(v,stream.get_cell(x))
           end
-          txt += "\r\n"
         end
+        txt += "\r\n"
       end
-      return txt
+      txt
     end
     
     def render_cell(v,d)
@@ -89,7 +84,7 @@ module Coopy
         end
       end
       result += "\"" if need_quote
-      return result
+      result
     end
     
     def parse_table(txt,tab)
@@ -120,13 +115,13 @@ module Coopy
         end
         @cursor+=1
       end
-      return true
+      true
     end
     
     def make_table(txt)
       tab = ::Coopy::SimpleTable.new(0,0)
       self.parse_table(txt,tab)
-      return tab
+      tab
     end
     
     protected
@@ -191,7 +186,7 @@ module Coopy
           return result[1..-1] if result[del..-1] == "NULL"
         end
       end
-      return result
+      result
     end
     
     public
@@ -200,7 +195,7 @@ module Coopy
       @cursor = 0
       @row_ended = false
       @has_structure = false
-      return self.parse_cell_part(txt)
+      self.parse_cell_part(txt)
     end
     
   haxe_me ["coopy", "Csv"]

data/lib/lib/coopy/diff_render.rb

@@ -85,11 +85,11 @@ module Coopy
     public
     
     def html 
-      return @text_to_insert.join("")
+      @text_to_insert.join("")
     end
     
     def to_s 
-      return self.html
+      self.html
     end
     
     def render(tab)
@@ -121,7 +121,7 @@ module Coopy
           ::Coopy::DiffRender.examine_cell(off,row,view,txt,"",txt,corner,cell,off)
           row_mode = cell.category
           change_row = row if row_mode == "spec"
-          if row_mode == "header" || row_mode == "spec" || row_mode == "index" 
+          if row_mode == "header" || row_mode == "spec" || row_mode == "index" || row_mode == "meta" 
             self.set_section("head")
           else 
             self.set_section("body")
@@ -141,11 +141,11 @@ module Coopy
         end
       end
       render.end_table
-      return self
+      self
     end
     
     def sample_css 
-      return ".highlighter .add { \n  background-color: #7fff7f;\n}\n\n.highlighter .remove { \n  background-color: #ff7f7f;\n}\n\n.highlighter td.modify { \n  background-color: #7f7fff;\n}\n\n.highlighter td.conflict { \n  background-color: #f00;\n}\n\n.highlighter .spec { \n  background-color: #aaa;\n}\n\n.highlighter .move { \n  background-color: #ffa;\n}\n\n.highlighter .null { \n  color: #888;\n}\n\n.highlighter table { \n  border-collapse:collapse;\n}\n\n.highlighter td, .highlighter th {\n  border: 1px solid #2D4068;\n  padding: 3px 7px 2px;\n}\n\n.highlighter th, .highlighter .header { \n  background-color: #aaf;\n  font-weight: bold;\n  padding-bottom: 4px;\n  padding-top: 5px;\n  text-align:left;\n}\n\n.highlighter tr.header th {\n  border-bottom: 2px solid black;\n}\n\n.highlighter tr.index td, .highlighter .index, .highlighter tr.header th.index {\n  background-color: white;\n  border: none;\n}\n\n.highlighter .gap {\n  color: #888;\n}\n\n.highlighter td {\n  empty-cells: show;\n}\n"
+      ".highlighter .add { \n  background-color: #7fff7f;\n}\n\n.highlighter .remove { \n  background-color: #ff7f7f;\n}\n\n.highlighter td.modify { \n  background-color: #7f7fff;\n}\n\n.highlighter td.conflict { \n  background-color: #f00;\n}\n\n.highlighter .spec { \n  background-color: #aaa;\n}\n\n.highlighter .move { \n  background-color: #ffa;\n}\n\n.highlighter .null { \n  color: #888;\n}\n\n.highlighter table { \n  border-collapse:collapse;\n}\n\n.highlighter td, .highlighter th {\n  border: 1px solid #2D4068;\n  padding: 3px 7px 2px;\n}\n\n.highlighter th, .highlighter .header, .highlighter .meta {\n  background-color: #aaf;\n  font-weight: bold;\n  padding-bottom: 4px;\n  padding-top: 5px;\n  text-align:left;\n}\n\n.highlighter tr.header th {\n  border-bottom: 2px solid black;\n}\n\n.highlighter tr.index td, .highlighter .index, .highlighter tr.header th.index {\n  background-color: white;\n  border: none;\n}\n\n.highlighter .gap {\n  color: #888;\n}\n\n.highlighter td {\n  empty-cells: show;\n}\n"
     end
     
     def complete_html 
@@ -165,12 +165,20 @@ module Coopy
       cell.pretty_separator = ""
       cell.conflicted = false
       cell.updated = false
-      cell.pvalue = cell.lvalue = cell.rvalue = nil
+      cell.meta = cell.pvalue = cell.lvalue = cell.rvalue = nil
       cell.value = value
       cell.value = "" if cell.value == nil
       cell.pretty_value = cell.value
       vrow = "" if vrow == nil
       vcol = "" if vcol == nil
+      if vrow.length >= 3 && vrow[0] == "@" && vrow[1] != "@" 
+        idx = vrow.index("@",1 || 0) || -1
+        if idx >= 0 
+          cell.meta = vrow[1,idx - 1]
+          vrow = vrow[idx + 1,vrow.length]
+          cell.category = "meta"
+        end
+      end
       removed_column = false
       cell.category = "move" if vrow == ":"
       cell.category = "index" if vrow == "" && offset == 1 && y == 0
@@ -278,7 +286,7 @@ module Coopy
           il+=1
         end
       end
-      return slo
+      slo
     end
     
     public
@@ -293,7 +301,7 @@ module Coopy
         off = 0
       end
       ::Coopy::DiffRender.examine_cell(x,y,view,tab.get_cell(x,y),view.to_s(tab.get_cell(x,off)),view.to_s(tab.get_cell(off,y)),corner,cell,off)
-      return cell
+      cell
     end
     
   haxe_me ["coopy", "DiffRender"]

data/lib/lib/coopy/flat_cell_builder.rb

@@ -4,7 +4,8 @@
 module Coopy
   class FlatCellBuilder 
     
-    def initialize
+    def initialize(flags)
+      @flags = flags
     end
     
     # protected - in ruby this doesn't play well with static/inline methods
@@ -12,11 +13,12 @@ module Coopy
     attr_accessor :view
     attr_accessor :separator
     attr_accessor :conflict_separator
+    attr_accessor :flags
     
     public
     
     def need_separator 
-      return true
+      true
     end
     
     def set_separator(separator)
@@ -32,19 +34,20 @@ module Coopy
     end
     
     def update(local,remote)
-      return @view.to_datum(_hx_str(::Coopy::FlatCellBuilder.quote_for_diff(@view,local)) + _hx_str(@separator) + _hx_str(::Coopy::FlatCellBuilder.quote_for_diff(@view,remote)))
+      @view.to_datum(_hx_str(::Coopy::FlatCellBuilder.quote_for_diff(@view,local)) + _hx_str(@separator) + _hx_str(::Coopy::FlatCellBuilder.quote_for_diff(@view,remote)))
     end
     
     def conflict(parent,local,remote)
-      return _hx_str(@view.to_s(parent)) + _hx_str(@conflict_separator) + _hx_str(@view.to_s(local)) + _hx_str(@conflict_separator) + _hx_str(@view.to_s(remote))
+      _hx_str(@view.to_s(parent)) + _hx_str(@conflict_separator) + _hx_str(@view.to_s(local)) + _hx_str(@conflict_separator) + _hx_str(@view.to_s(remote))
     end
     
     def marker(label)
-      return @view.to_datum(label)
+      @view.to_datum(label)
     end
     
-    def links(unit)
-      return @view.to_datum(unit.to_s)
+    def links(unit,row_like)
+      return @view.to_datum(unit.to_base26string) if @flags.count_like_a_spreadsheet && !row_like
+      @view.to_datum(unit.to_s)
     end
     
     def FlatCellBuilder.quote_for_diff(v,d)
@@ -63,7 +66,7 @@ module Coopy
         end
       end
       str = "_" + _hx_str(str) if str[score..-1] == _nil
-      return str
+      str
     end
     
   haxe_me ["coopy", "FlatCellBuilder"]

data/lib/lib/coopy/highlight_patch.rb

@@ -4,11 +4,14 @@
 module Coopy
   class HighlightPatch 
     
-    def initialize(source,patch)
+    def initialize(source,patch,flags = nil)
       @source = source
       @patch = patch
+      @flags = flags
+      @flags = ::Coopy::CompareFlags.new if flags == nil
       @view = patch.get_cell_view
       @source_view = source.get_cell_view
+      @meta = source.get_meta
     end
     
     protected
@@ -35,6 +38,8 @@ module Coopy
     attr_accessor :indexes
     attr_accessor :source_in_patch_col
     attr_accessor :patch_in_source_col
+    attr_accessor :dest_in_patch_col
+    attr_accessor :patch_in_dest_col
     attr_accessor :patch_in_source_row
     attr_accessor :last_source_row
     attr_accessor :actions
@@ -43,6 +48,15 @@ module Coopy
     attr_accessor :col_permutation
     attr_accessor :col_permutation_rev
     attr_accessor :have_dropped_columns
+    attr_accessor :header_row
+    attr_accessor :preamble_row
+    attr_accessor :flags
+    attr_accessor :meta_change
+    attr_accessor :process_meta
+    attr_accessor :prev_meta
+    attr_accessor :next_meta
+    attr_accessor :finished_columns
+    attr_accessor :meta
     
     def reset 
       @header = {}
@@ -58,7 +72,7 @@ module Coopy
       @current_row = -1
       @row_info = ::Coopy::CellInfo.new
       @cell_info = ::Coopy::CellInfo.new
-      @source_in_patch_col = @patch_in_source_col = nil
+      @source_in_patch_col = @patch_in_source_col = @patch_in_dest_col = nil
       @patch_in_source_row = {}
       @indexes = nil
       @last_source_row = -1
@@ -68,6 +82,17 @@ module Coopy
       @col_permutation = nil
       @col_permutation_rev = nil
       @have_dropped_columns = false
+      @header_row = 0
+      @preamble_row = 0
+      @meta_change = false
+      @process_meta = false
+      @prev_meta = nil
+      @next_meta = nil
+      @finished_columns = false
+    end
+    
+    def process_meta 
+      @process_meta = true
     end
     
     public
@@ -94,6 +119,7 @@ module Coopy
           @actions.push(((str != nil) ? str : ""))
         end
       end
+      @preamble_row = @header_row = @rc_offset
       begin
         _g11 = 0
         _g2 = @patch.get_height
@@ -103,9 +129,9 @@ module Coopy
           self.apply_row(r1)
         end
       end
-      self.finish_rows
       self.finish_columns
-      return true
+      self.finish_rows
+      true
     end
     
     protected
@@ -130,6 +156,24 @@ module Coopy
       end
     end
     
+    def need_dest_columns 
+      return if @patch_in_dest_col != nil
+      @patch_in_dest_col = {}
+      @dest_in_patch_col = {}
+      begin
+        _g = 0
+        _g1 = @cmods
+        while(_g < _g1.length) 
+          cmod = _g1[_g]
+          _g+=1
+          if cmod.patch_row != -1 
+            @patch_in_dest_col[cmod.patch_row] = cmod.dest_row
+            @dest_in_patch_col[cmod.dest_row] = cmod.patch_row
+          end
+        end
+      end
+    end
+    
     def need_source_index 
       return if @indexes != nil
       state = ::Coopy::TableComparisonState.new
@@ -143,34 +187,111 @@ module Coopy
       self.need_source_columns
     end
     
+    def set_meta_prop(target,column_name,prop_name,value)
+      return if column_name == nil
+      return if prop_name == nil
+      if !target.include?(column_name) 
+        value1 = Array.new
+        target[column_name] = value1
+      end
+      change = ::Coopy::PropertyChange.new
+      change.prev_name = prop_name
+      change.name = prop_name
+      value = nil if value == ""
+      change.val = value
+      target[column_name].push(change)
+    end
+    
+    def apply_meta_row(code)
+      self.need_source_columns
+      codes = code.split("@")
+      prop_name = ""
+      prop_name = codes[codes.length - 2] if codes.length > 1
+      code = codes[codes.length - 1] if codes.length > 0
+      @prev_meta = {} if @prev_meta == nil
+      @next_meta = {} if @next_meta == nil
+      begin
+        _g1 = @payload_col
+        _g = @payload_top
+        while(_g1 < _g) 
+          i = _g1
+          _g1+=1
+          txt = self.get_string(i)
+          idx_patch = i
+          idx_src = nil
+          if @patch_in_source_col.include?(idx_patch) 
+            idx_src = @patch_in_source_col[idx_patch]
+          else 
+            idx_src = -1
+          end
+          prev_name = nil
+          name = nil
+          prev_name = @source.get_cell(idx_src,0) if idx_src != -1
+          name = @header[idx_patch] if @header.include?(idx_patch)
+          ::Coopy::DiffRender.examine_cell(0,0,@view,txt,"",code,"",@cell_info)
+          if @cell_info.updated 
+            self.set_meta_prop(@prev_meta,prev_name,prop_name,@cell_info.lvalue)
+            self.set_meta_prop(@next_meta,name,prop_name,@cell_info.rvalue)
+          else 
+            self.set_meta_prop(@prev_meta,prev_name,prop_name,@cell_info.value)
+            self.set_meta_prop(@next_meta,name,prop_name,@cell_info.value)
+          end
+        end
+      end
+    end
+    
     def apply_row(r)
       @current_row = r
       code = @actions[r]
+      done = false
       if r == 0 && @rc_offset > 0 
+        done = true
       elsif code == "@@" 
+        @preamble_row = @header_row = r
         self.apply_header
         self.apply_action("@@")
+        done = true
       elsif code == "!" 
+        @preamble_row = @header_row = r
         self.apply_meta
-      elsif code == "+++" 
-        self.apply_action(code)
-      elsif code == "---" 
-        self.apply_action(code)
-      elsif code == "+" || code == ":" 
-        self.apply_action(code)
-      elsif (code.index("->",nil || 0) || -1) >= 0 
-        self.apply_action("->")
-      else 
-        @last_source_row = -1
+        done = true
+      elsif (code.index("@",nil || 0) || -1) == 0 
+        @flags.add_warning("cannot usefully apply diffs with metadata yet: '" + _hx_str(code) + "'")
+        @preamble_row = r
+        self.apply_meta_row(code)
+        if @process_meta 
+          codes = code.split("@")
+          code = codes[codes.length - 1] if codes.length > 0
+        else 
+          @meta_change = true
+          done = true
+        end
+        @meta_change = true
+        done = true
+      end
+      return if @process_meta
+      if !done 
+        self.finish_columns
+        if code == "+++" 
+          self.apply_action(code)
+        elsif code == "---" 
+          self.apply_action(code)
+        elsif code == "+" || code == ":" 
+          self.apply_action(code)
+        elsif (code.index("->",nil || 0) || -1) >= 0 
+          self.apply_action("->")
+        else 
+          @last_source_row = -1
+        end
       end
     end
     
     def get_datum(c)
-      return @patch.get_cell(c,@current_row)
+      @patch.get_cell(c,@current_row)
     end
     
     def get_string(c)
-      return @view.to_s(self.get_datum(c))
+      @view.to_s(self.get_datum(c))
     end
     
     def apply_meta 
@@ -224,12 +345,13 @@ module Coopy
           end
         end
       end
-      self.apply_action("+++") if @source.get_height == 0
+      if !self.use_meta_for_row_changes 
+        self.apply_action("+++") if @source.get_height == 0
+      end
     end
     
     def look_up(del = 0)
-      at = @patch_in_source_row[@current_row + del]
-      return at if at != nil
+      return @patch_in_source_row[@current_row + del] if @patch_in_source_row.include?(@current_row + del)
       result = -1
       @current_row += del
       if @current_row >= 0 && @current_row < @patch.get_height 
@@ -239,9 +361,28 @@ module Coopy
           idx = _g1[_g]
           _g+=1
           match = idx.query_by_content(self)
-          next if match.spot_a != 1
-          result = match.item_a.lst[0]
-          break
+          next if match.spot_a == 0
+          if match.spot_a == 1 
+            result = match.item_a.lst[0]
+            break
+          end
+          if @current_row > 0 
+            prev = @patch_in_source_row[@current_row - 1]
+            if prev != nil 
+              lst = match.item_a.lst
+              begin
+                _g2 = 0
+                while(_g2 < lst.length) 
+                  row = lst[_g2]
+                  _g2+=1
+                  if row == prev + 1 
+                    result = row
+                    break
+                  end
+                end
+              end
+            end
+          end
         end
       end
       begin
@@ -249,10 +390,64 @@ module Coopy
         result
       end
       @current_row -= del
-      return result
+      result
+    end
+    
+    def apply_action_external(code)
+      return if code == "@@"
+      rc = ::Coopy::RowChange.new
+      rc.action = code
+      self.check_act
+      rc.cond = {} if code != "+++"
+      rc.val = {} if code != "---"
+      have_column = false
+      begin
+        _g1 = @payload_col
+        _g = @payload_top
+        while(_g1 < _g) 
+          i = _g1
+          _g1+=1
+          prev_name = @header[i]
+          name = prev_name
+          name = @header_rename[prev_name] if @header_rename.include?(prev_name)
+          cact = @modifier[i]
+          next if cact == "..."
+          next if name == nil || name == ""
+          txt = self.get_string(i)
+          updated = false
+          if @row_info.updated 
+            self.get_pre_string(txt)
+            updated = @cell_info.updated
+          end
+          if cact == "+++" && code != "---" 
+            if txt != nil && txt != "" 
+              rc.val = {} if rc.val == nil
+              rc.val[name] = txt
+              have_column = true
+            end
+          end
+          if updated 
+            rc.cond[name] = @cell_info.lvalue
+            rc.val[name] = @cell_info.rvalue
+          elsif code == "+++" 
+            rc.val[name] = txt if cact != "---"
+          elsif cact != "+++" && cact != "---" 
+            rc.cond[name] = txt
+          end
+        end
+      end
+      if rc.action == "+" 
+        return if !have_column
+        rc.action = "->"
+      end
+      @meta.change_row(rc)
     end
     
     def apply_action(code)
+      if self.use_meta_for_row_changes 
+        self.apply_action_external(code)
+        return
+      end
       mod = ::Coopy::HighlightPatchUnit.new
       mod.code = code
       mod.add = code == "+++"
@@ -264,7 +459,14 @@ module Coopy
       next_act = @actions[@current_row + 1]
       mod.source_next_row = self.look_up(1) if next_act != "+++" && next_act != "..."
       if mod.add 
-        mod.source_prev_row = self.look_up(-1) if @actions[@current_row - 1] != "+++"
+        if @actions[@current_row - 1] != "+++" 
+          if @actions[@current_row - 1] == "@@" 
+            mod.source_prev_row = 0
+            @last_source_row = 0
+          else 
+            mod.source_prev_row = self.look_up(-1)
+          end
+        end
         mod.source_row = mod.source_prev_row
         mod.source_row_offset = 1 if mod.source_row != -1
       else 
@@ -286,7 +488,7 @@ module Coopy
       return txt if !@row_info.updated
       ::Coopy::DiffRender.examine_cell(0,0,@view,txt,"",@row_info.value,"",@cell_info)
       return txt if !@cell_info.updated
-      return @cell_info.lvalue
+      @cell_info.lvalue
     end
     
     public
@@ -294,7 +496,11 @@ module Coopy
     def get_row_string(c)
       at = @source_in_patch_col[c]
       return "NOT_FOUND" if at == nil
-      return self.get_pre_string(self.get_string(at))
+      self.get_pre_string(self.get_string(at))
+    end
+    
+    def is_preamble 
+      @current_row <= @preamble_row
     end
     
     protected
@@ -308,11 +514,11 @@ module Coopy
       return -1 if a.source_row + a.source_row_offset < b.source_row + b.source_row_offset
       return 1 if a.patch_row > b.patch_row
       return -1 if a.patch_row < b.patch_row
-      return 0
+      0
     end
     
     def process_mods(rmods,fate,len)
-      rmods.sort{|a,b| self.sort_mods(a,b)}
+      rmods.sort!{|a,b| self.sort_mods(a,b)}
       offset = 0
       last = -1
       target = 0
@@ -348,7 +554,9 @@ module Coopy
           if mod.source_row >= 0 
             last = mod.source_row + mod.source_row_offset
             last+=1 if mod.rem
-          else 
+          elsif mod.add && mod.source_next_row != -1 
+            last = mod.source_next_row + mod.source_row_offset
+          elsif mod.rem || mod.add 
             last = -1
           end
         end
@@ -363,7 +571,17 @@ module Coopy
           last+=1
         end
       end
-      return len + offset
+      len + offset
+    end
+    
+    def use_meta_for_column_changes 
+      return false if @meta == nil
+      @meta.use_for_column_changes
+    end
+    
+    def use_meta_for_row_changes 
+      return false if @meta == nil
+      @meta.use_for_row_changes
     end
     
     def compute_ordering(mods,permutation,permutation_rev,dim)
@@ -433,7 +651,7 @@ module Coopy
           while(_g2 < dim) 
             i1 = _g2
             _g2+=1
-            if meta_from_unit.include?(logical) 
+            if logical != nil && meta_from_unit.include?(logical) 
               cursor = meta_from_unit[logical]
             else 
               cursor = nil
@@ -482,7 +700,39 @@ module Coopy
       self.compute_ordering(@mods,@row_permutation,@row_permutation_rev,@source.get_height)
     end
     
+    def fill_in_new_columns 
+      _g = 0
+      _g1 = @cmods
+      while(_g < _g1.length) 
+        cmod = _g1[_g]
+        _g+=1
+        if !cmod.rem 
+          if cmod.add 
+            begin
+              _g2 = 0
+              _g3 = @mods
+              while(_g2 < _g3.length) 
+                mod = _g3[_g2]
+                _g2+=1
+                if mod.patch_row != -1 && mod.dest_row != -1 
+                  d = @patch.get_cell(cmod.patch_row,mod.patch_row)
+                  @source.set_cell(cmod.dest_row,mod.dest_row,d)
+                end
+              end
+            end
+            hdr = @header[cmod.patch_row]
+            @source.set_cell(cmod.dest_row,0,@view.to_datum(hdr))
+          end
+        end
+      end
+    end
+    
     def finish_rows 
+      return if self.use_meta_for_row_changes
+      if @source.get_width == 0 
+        @source.resize(0,0) if @source.get_height != 0
+        return
+      end
       fate = Array.new
       self.permute_rows
       if @row_permutation.length > 0 
@@ -497,6 +747,7 @@ module Coopy
       @source.insert_or_delete_rows(@row_permutation,@row_permutation.length) if @row_permutation.length > 0
       len = self.process_mods(@mods,fate,@source.get_height)
       @source.insert_or_delete_rows(fate,len)
+      self.need_dest_columns
       begin
         _g2 = 0
         _g11 = @mods
@@ -508,7 +759,7 @@ module Coopy
               _it = ::Rb::RubyIterator.new(@header_post.values)
               while(_it.has_next) do
                 c = _it._next
-                offset = @patch_in_source_col[c]
+                offset = @patch_in_dest_col[c]
                 @source.set_cell(offset,mod1.dest_row,@patch.get_cell(c,mod1.patch_row)) if offset != nil && offset >= 0
               end
             elsif mod1.update 
@@ -523,12 +774,26 @@ module Coopy
                 next if !@cell_info.updated
                 next if @cell_info.conflicted
                 d = @view.to_datum(@csv.parse_cell(@cell_info.rvalue))
-                @source.set_cell(@patch_in_source_col[c1],mod1.dest_row,d)
+                offset1 = @patch_in_dest_col[c1]
+                @source.set_cell(@patch_in_dest_col[c1],mod1.dest_row,d) if offset1 != nil && offset1 >= 0
               end
             end
           end
         end
       end
+      self.fill_in_new_columns
+      begin
+        _g12 = 0
+        _g3 = @source.get_width
+        while(_g12 < _g3) 
+          i = _g12
+          _g12+=1
+          name = @view.to_s(@source.get_cell(i,0))
+          next_name = @header_rename[name]
+          next if next_name == nil
+          @source.set_cell(i,0,@view.to_datum(next_name))
+        end
+      end
     end
     
     def permute_columns 
@@ -540,6 +805,8 @@ module Coopy
     end
     
     def finish_columns 
+      return if @finished_columns
+      @finished_columns = true
       self.need_source_columns
       begin
         _g1 = @payload_col
@@ -551,7 +818,8 @@ module Coopy
           hdr = @header[i]
           act = "" if act == nil
           if act == "---" 
-            at = @patch_in_source_col[i]
+            at = -1
+            at = @patch_in_source_col[i] if @patch_in_source_col.include?(i)
             mod = ::Coopy::HighlightPatchUnit.new
             mod.code = act
             mod.rem = true
@@ -570,15 +838,17 @@ module Coopy
             mod1.patch_row = i
             @cmods.push(mod1)
           elsif act != "..." 
+            at1 = -1
+            at1 = @patch_in_source_col[i] if @patch_in_source_col.include?(i)
             mod2 = ::Coopy::HighlightPatchUnit.new
             mod2.code = act
             mod2.patch_row = i
-            mod2.source_row = @patch_in_source_col[i]
+            mod2.source_row = at1
             @cmods.push(mod2)
           end
         end
       end
-      at1 = -1
+      at2 = -1
       rat = -1
       begin
         _g11 = 0
@@ -587,8 +857,8 @@ module Coopy
           i1 = _g11
           _g11+=1
           icode = @cmods[i1].code
-          at1 = @cmods[i1].source_row if icode != "+++" && icode != "---"
-          @cmods[i1 + 1].source_prev_row = at1
+          at2 = @cmods[i1].source_row if icode != "+++" && icode != "---"
+          @cmods[i1 + 1].source_prev_row = at2
           j = @cmods.length - 1 - i1
           jcode = @cmods[j].code
           rat = @cmods[j].source_row if jcode != "+++" && jcode != "---"
@@ -608,49 +878,79 @@ module Coopy
               mod3.source_row = @col_permutation[mod3.source_row] if mod3.source_row >= 0
             end
           end
-          @source.insert_or_delete_columns(@col_permutation,@col_permutation.length)
+          @source.insert_or_delete_columns(@col_permutation,@col_permutation.length) if !self.use_meta_for_column_changes
         end
       end
       len = self.process_mods(@cmods,fate,@source.get_width)
-      @source.insert_or_delete_columns(fate,len)
+      if !self.use_meta_for_column_changes 
+        @source.insert_or_delete_columns(fate,len)
+        return
+      end
+      changed = false
       begin
         _g4 = 0
         _g13 = @cmods
         while(_g4 < _g13.length) 
-          cmod = _g13[_g4]
+          mod4 = _g13[_g4]
           _g4+=1
-          if !cmod.rem 
-            if cmod.add 
-              begin
-                _g21 = 0
-                _g31 = @mods
-                while(_g21 < _g31.length) 
-                  mod4 = _g31[_g21]
-                  _g21+=1
-                  if mod4.patch_row != -1 && mod4.dest_row != -1 
-                    d = @patch.get_cell(cmod.patch_row,mod4.patch_row)
-                    @source.set_cell(cmod.dest_row,mod4.dest_row,d)
-                  end
-                end
-              end
-              hdr1 = @header[cmod.patch_row]
-              @source.set_cell(cmod.dest_row,0,@view.to_datum(hdr1))
-            end
+          if mod4.code != "" 
+            changed = true
+            break
           end
         end
       end
+      return if !changed
+      columns = Array.new
+      target = {}
+      inc = lambda {|x|
+        if x < 0 
+          return x
+        else 
+          return x + 1
+        end
+      }
       begin
         _g14 = 0
-        _g5 = @source.get_width
+        _g5 = fate.length
         while(_g14 < _g5) 
           i2 = _g14
           _g14+=1
-          name = @view.to_s(@source.get_cell(i2,0))
-          next_name = @header_rename[name]
-          next if next_name == nil
-          @source.set_cell(i2,0,@view.to_datum(next_name))
+          begin
+            value = (inc).call(fate[i2])
+            target[i2] = value
+          end
+        end
+      end
+      self.need_source_columns
+      self.need_dest_columns
+      begin
+        _g15 = 1
+        _g6 = @patch.get_width
+        while(_g15 < _g6) 
+          idx_patch = _g15
+          _g15+=1
+          change = ::Coopy::ColumnChange.new
+          idx_src = nil
+          if @patch_in_source_col.include?(idx_patch) 
+            idx_src = @patch_in_source_col[idx_patch]
+          else 
+            idx_src = -1
+          end
+          prev_name = nil
+          name = nil
+          prev_name = @source.get_cell(idx_src,0) if idx_src != -1
+          if @modifier[idx_patch] != "---" 
+            name = @header[idx_patch] if @header.include?(idx_patch)
+          end
+          change.prev_name = prev_name
+          change.name = name
+          if @next_meta != nil 
+            change.props = @next_meta[name] if @next_meta.include?(name)
+          end
+          columns.push(change)
         end
       end
+      @meta.alter_columns(columns)
     end
     
   haxe_me ["coopy", "HighlightPatch"]