daff 1.2.6 → 1.3.1

data/lib/lib/coopy/highlight_patch_unit.rb

@@ -29,7 +29,7 @@ module Coopy
     attr_accessor :patch_row
     
     def to_s 
-      return _hx_str(@code) + " patchRow " + _hx_str(@patch_row) + " sourceRows " + _hx_str(@source_prev_row) + "," + _hx_str(@source_row) + "," + _hx_str(@source_next_row) + " destRow " + _hx_str(@dest_row)
+      "(" + _hx_str(@code) + " patch " + _hx_str(@patch_row) + " source " + _hx_str(@source_prev_row) + ":" + _hx_str(@source_row) + ":" + _hx_str(@source_next_row) + "+" + _hx_str(@source_row_offset) + " dest " + _hx_str(@dest_row) + ")"
     end
     
   haxe_me ["coopy", "HighlightPatchUnit"]

data/lib/lib/coopy/index.rb

@@ -10,6 +10,7 @@ module Coopy
       @keys = Array.new
       @top_freq = 0
       @height = 0
+      @hdr = 0
     end
     
     attr_accessor :items
@@ -22,6 +23,7 @@ module Coopy
     attr_accessor :cols
     attr_accessor :v
     attr_accessor :indexed_table
+    attr_accessor :hdr
     
     public
     
@@ -29,8 +31,9 @@ module Coopy
       @cols.push(i)
     end
     
-    def index_table(t)
+    def index_table(t,hdr)
       @indexed_table = t
+      @hdr = hdr
       @keys[t.get_height - 1] = nil if @keys.length != t.get_height && t.get_height > 0
       begin
         _g1 = 0
@@ -61,7 +64,12 @@ module Coopy
     end
     
     def to_key(t,i)
-      wide = ""
+      wide = nil
+      if i < @hdr 
+        wide = "_"
+      else 
+        wide = ""
+      end
       @v = t.get_cell_view if @v == nil
       begin
         _g1 = 0
@@ -71,16 +79,21 @@ module Coopy
           _g1+=1
           d = t.get_cell(@cols[k],i)
           txt = @v.to_s(d)
-          next if txt == nil || txt == "" || txt == "null" || txt == "undefined"
           wide += " // " if k > 0
+          next if txt == nil || txt == "" || txt == "null" || txt == "undefined"
           wide += txt
         end
       end
-      return wide
+      wide
     end
     
     def to_key_by_content(row)
-      wide = ""
+      wide = nil
+      if row.is_preamble 
+        wide = "_"
+      else 
+        wide = ""
+      end
       begin
         _g1 = 0
         _g = @cols.length
@@ -88,16 +101,16 @@ module Coopy
           k = _g1
           _g1+=1
           txt = row.get_row_string(@cols[k])
-          next if txt == nil || txt == "" || txt == "null" || txt == "undefined"
           wide += " // " if k > 0
+          next if txt == nil || txt == "" || txt == "null" || txt == "undefined"
           wide += txt
         end
       end
-      return wide
+      wide
     end
     
     def get_table 
-      return @indexed_table
+      @indexed_table
     end
     
   haxe_me ["coopy", "Index"]

data/lib/lib/coopy/index_item.rb

@@ -16,15 +16,19 @@ module Coopy
     def add(i)
       @lst = Array.new if @lst == nil
       @lst.push(i)
-      return @lst.length
+      @lst.length
     end
     
     def length 
-      return @lst.length
+      @lst.length
     end
     
     def value 
-      return @lst[0]
+      @lst[0]
+    end
+    
+    def as_list 
+      @lst
     end
     
   haxe_me ["coopy", "IndexItem"]

data/lib/lib/coopy/index_pair.rb

@@ -8,12 +8,14 @@ module Coopy
       @ia = ::Coopy::Index.new
       @ib = ::Coopy::Index.new
       @quality = 0
+      @hdr = 0
     end
     
     protected
     
     attr_accessor :ia
     attr_accessor :ib
+    attr_accessor :hdr
     attr_accessor :quality
     
     public
@@ -23,9 +25,10 @@ module Coopy
       @ib.add_column(cb)
     end
     
-    def index_tables(a,b)
-      @ia.index_table(a)
-      @ib.index_table(b)
+    def index_tables(a,b,hdr)
+      @ia.index_table(a,hdr)
+      @ib.index_table(b,hdr)
+      @hdr = hdr
       good = 0
       _it = ::Rb::RubyIterator.new(@ia.items.keys)
       while(_it.has_next) do
@@ -52,7 +55,7 @@ module Coopy
         result.spot_a = result.item_a.lst.length if result.item_a != nil
         result.spot_b = result.item_b.lst.length if result.item_b != nil
       end
-      return result
+      result
     end
     
     public
@@ -60,29 +63,29 @@ module Coopy
     def query_by_content(row)
       result = ::Coopy::CrossMatch.new
       ka = @ia.to_key_by_content(row)
-      return self.query_by_key(ka)
+      self.query_by_key(ka)
     end
     
     def query_local(row)
       ka = @ia.to_key(@ia.get_table,row)
-      return self.query_by_key(ka)
+      self.query_by_key(ka)
     end
     
     def local_key(row)
-      return @ia.to_key(@ia.get_table,row)
+      @ia.to_key(@ia.get_table,row)
     end
     
     def remote_key(row)
-      return @ib.to_key(@ib.get_table,row)
+      @ib.to_key(@ib.get_table,row)
     end
     
     def get_top_freq 
       return @ib.top_freq if @ib.top_freq > @ia.top_freq
-      return @ia.top_freq
+      @ia.top_freq
     end
     
     def get_quality 
-      return @quality
+      @quality
     end
     
   haxe_me ["coopy", "IndexPair"]

data/lib/lib/coopy/merger.rb

@@ -75,7 +75,7 @@ module Coopy
           end
         end
       end
-      return at
+      at
     end
     
     def shuffle_columns 
@@ -171,13 +171,13 @@ module Coopy
           end
         end
       end
-      return @conflicts
+      @conflicts
     end
     
     # protected - in ruby this doesn't play well with static/inline methods
     
     def Merger.make_conflicted_cell(view,pcell,lcell,rcell)
-      return view.to_datum("((( " + _hx_str(view.to_s(pcell)) + " ))) " + _hx_str(view.to_s(lcell)) + " /// " + _hx_str(view.to_s(rcell)))
+      view.to_datum("((( " + _hx_str(view.to_s(pcell)) + " ))) " + _hx_str(view.to_s(lcell)) + " /// " + _hx_str(view.to_s(rcell)))
     end
     
   haxe_me ["coopy", "Merger"]

data/lib/lib/coopy/meta.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class Meta 
+    def alterColumns(columns) puts "Abstract Meta.alterColumns called" end
+    def changeRow(rc) puts "Abstract Meta.changeRow called" end
+    def applyFlags(flags) puts "Abstract Meta.applyFlags called" end
+    def asTable() puts "Abstract Meta.asTable called" end
+    def cloneMeta(table = nil) puts "Abstract Meta.cloneMeta called" end
+    def useForColumnChanges() puts "Abstract Meta.useForColumnChanges called" end
+    def useForRowChanges() puts "Abstract Meta.useForRowChanges called" end
+    def getRowStream() puts "Abstract Meta.getRowStream called" end
+  haxe_me ["coopy", "Meta"]
+  end
+
+end

data/lib/lib/coopy/mover.rb

@@ -53,7 +53,7 @@ module Coopy
           idest.push(v) if v != nil
         end
       end
-      return ::Coopy::Mover.move_without_extras(isrc,idest)
+      ::Coopy::Mover.move_without_extras(isrc,idest)
     end
     
     def Mover.move(isrc,idest)
@@ -104,7 +104,7 @@ module Coopy
           dest.push(v) if in_src.include?(v)
         end
       end
-      return ::Coopy::Mover.move_without_extras(src,dest)
+      ::Coopy::Mover.move_without_extras(src,dest)
     end
     
     # protected - in ruby this doesn't play well with static/inline methods
@@ -155,8 +155,10 @@ module Coopy
         k = _it._next
         blks.push(k)
       end
-      blks.sort {|a,b|
-        return blk_len[b] - blk_len[a]
+      blks.sort! {|a,b|
+        diff = blk_len[b] - blk_len[a]
+        return diff if diff != 0
+        a - b
       }
       moved = Array.new
       while(blks.length > 0) 
@@ -186,7 +188,7 @@ module Coopy
           i1-=1
         end
       end
-      return moved
+      moved
     end
     
   haxe_me ["coopy", "Mover"]

data/lib/lib/coopy/ndjson.rb

@@ -38,7 +38,7 @@ module Coopy
           end
         end
       end
-      return ::Haxe::Format::JsonPrinter._print(row,nil,nil)
+      ::Haxe::Format::JsonPrinter._print(row,nil,nil)
     end
     
     def render 
@@ -58,7 +58,7 @@ module Coopy
           txt += "\n"
         end
       end
-      return txt
+      txt
     end
     
     def add_row(r,txt)

data/lib/lib/coopy/nested_cell_builder.rb

@@ -14,7 +14,7 @@ module Coopy
     public
     
     def need_separator 
-      return false
+      false
     end
     
     def set_separator(separator)
@@ -31,7 +31,7 @@ module Coopy
       h = @view.make_hash
       @view.hash_set(h,"before",local)
       @view.hash_set(h,"after",remote)
-      return h
+      h
     end
     
     def conflict(parent,local,remote)
@@ -39,23 +39,23 @@ module Coopy
       @view.hash_set(h,"before",parent)
       @view.hash_set(h,"ours",local)
       @view.hash_set(h,"theirs",remote)
-      return h
+      h
     end
     
     def marker(label)
-      return @view.to_datum(label)
+      @view.to_datum(label)
     end
     
     protected
     
     def neg_to_null(x)
       return nil if x < 0
-      return x
+      x
     end
     
     public
     
-    def links(unit)
+    def links(unit,row_like)
       h = @view.make_hash
       if unit.p >= -1 
         @view.hash_set(h,"before",self.neg_to_null(unit.p))
@@ -65,7 +65,7 @@ module Coopy
       end
       @view.hash_set(h,"before",self.neg_to_null(unit.l))
       @view.hash_set(h,"after",self.neg_to_null(unit.r))
-      return h
+      h
     end
     
   haxe_me ["coopy", "NestedCellBuilder"]

data/lib/lib/coopy/ordering.rb

@@ -22,7 +22,11 @@ module Coopy
     end
     
     def get_list 
-      return @order
+      @order
+    end
+    
+    def set_list(lst)
+      @order = lst
     end
     
     def to_s 
@@ -37,7 +41,7 @@ module Coopy
           txt += @order[i].to_s
         end
       end
-      return txt
+      txt
     end
     
     def ignore_parent 

data/lib/lib/coopy/property_change.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class PropertyChange 
+    
+    def initialize
+    end
+    
+    attr_accessor :prev_name
+    attr_accessor :name
+    attr_accessor :val
+  haxe_me ["coopy", "PropertyChange"]
+  end
+
+end

data/lib/lib/coopy/row.rb

@@ -4,6 +4,7 @@
 module Coopy
   class Row 
     def getRowString(c) puts "Abstract Row.getRowString called" end
+    def isPreamble() puts "Abstract Row.isPreamble called" end
   haxe_me ["coopy", "Row"]
   end
 

data/lib/lib/coopy/row_change.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class RowChange 
+    
+    def initialize
+    end
+    
+    attr_accessor :cond
+    attr_accessor :val
+    attr_accessor :conflicting_val
+    attr_accessor :conflicting_parent_val
+    attr_accessor :conflicted
+    attr_accessor :is_key
+    attr_accessor :action
+    
+    protected
+    
+    def show_map(m)
+      return "{}" if m == nil
+      txt = ""
+      _it = ::Rb::RubyIterator.new(m.keys)
+      while(_it.has_next) do
+        k = _it._next
+        txt += ", " if txt != ""
+        v = m[k]
+        txt += _hx_str(k) + "=" + _hx_str(v.to_s)
+      end
+      "{ " + _hx_str(txt) + " }"
+    end
+    
+    public
+    
+    def to_s 
+      _hx_str(@action) + " " + _hx_str(self.show_map(@cond)) + " : " + _hx_str(self.show_map(@val))
+    end
+    
+  haxe_me ["coopy", "RowChange"]
+  end
+
+end

data/lib/lib/coopy/row_stream.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class RowStream 
+    def fetchColumns() puts "Abstract RowStream.fetchColumns called" end
+    def fetchRow() puts "Abstract RowStream.fetchRow called" end
+  haxe_me ["coopy", "RowStream"]
+  end
+
+end