daff 1.2.6 → 1.3.1

data/lib/lib/coopy/table.rb

@@ -16,6 +16,7 @@ module Coopy
     def get_height() puts "Abstract Table.get_height called" end
     def getData() puts "Abstract Table.getData called" end
     def clone() puts "Abstract Table.clone called" end
+    def getMeta() puts "Abstract Table.getMeta called" end
   haxe_me ["coopy", "Table"]
   end
 

data/lib/lib/coopy/table_diff.rb

@@ -8,6 +8,7 @@ module Coopy
       @align = align
       @flags = flags
       @builder = nil
+      @preserve_columns = false
     end
     
     protected
@@ -15,6 +16,41 @@ module Coopy
     attr_accessor :align
     attr_accessor :flags
     attr_accessor :builder
+    attr_accessor :row_map
+    attr_accessor :col_map
+    attr_accessor :has_parent
+    attr_accessor :a
+    attr_accessor :b
+    attr_accessor :p
+    attr_accessor :rp_header
+    attr_accessor :ra_header
+    attr_accessor :rb_header
+    attr_accessor :is_index_p
+    attr_accessor :is_index_a
+    attr_accessor :is_index_b
+    attr_accessor :order
+    attr_accessor :row_units
+    attr_accessor :column_units
+    attr_accessor :show_rc_numbers
+    attr_accessor :row_moves
+    attr_accessor :col_moves
+    attr_accessor :active_row
+    attr_accessor :active_column
+    attr_accessor :allow_insert
+    attr_accessor :allow_delete
+    attr_accessor :allow_update
+    attr_accessor :v
+    attr_accessor :sep
+    attr_accessor :conflict_sep
+    attr_accessor :schema
+    attr_accessor :have_schema
+    attr_accessor :top_line_done
+    attr_accessor :have_addition
+    attr_accessor :act
+    attr_accessor :publish
+    attr_accessor :diff_found
+    attr_accessor :schema_diff_found
+    attr_accessor :preserve_columns
     
     public
     
@@ -71,7 +107,7 @@ module Coopy
           end
         end
       end
-      return sep
+      sep
     end
     
     def quote_for_diff(v,d)
@@ -90,7 +126,7 @@ module Coopy
         end
       end
       str = "_" + _hx_str(str) if str[score..-1] == _nil
-      return str
+      str
     end
     
     def is_reordered(m,ct)
@@ -120,7 +156,7 @@ module Coopy
           end
         end
       end
-      return reordered
+      reordered
     end
     
     def spread_context(units,del,active)
@@ -209,51 +245,47 @@ module Coopy
           ct+=1
         end
       end
-      return ct
+      ct
     end
     
-    public
+    def reset 
+      @has_parent = false
+      @rp_header = @ra_header = @rb_header = 0
+      @is_index_p = {}
+      @is_index_a = {}
+      @is_index_b = {}
+      @row_map = {}
+      @col_map = {}
+      @show_rc_numbers = false
+      @row_moves = nil
+      @col_moves = nil
+      @allow_insert = @allow_delete = @allow_update = true
+      @sep = ""
+      @conflict_sep = ""
+      @top_line_done = false
+      @diff_found = false
+      @schema_diff_found = false
+    end
     
-    def hilite(output)
-      return false if !output.is_resizable
-      if @builder == nil 
-        if @flags.allow_nested_cells 
-          @builder = ::Coopy::NestedCellBuilder.new
-        else 
-          @builder = ::Coopy::FlatCellBuilder.new
-        end
-      end
-      output.resize(0,0)
-      output.clear
-      row_map = {}
-      col_map = {}
-      order = @align.to_order
-      units = order.get_list
-      has_parent = @align.reference != nil
-      a = nil
-      b = nil
-      p = nil
-      rp_header = 0
-      ra_header = 0
-      rb_header = 0
-      is_index_p = {}
-      is_index_a = {}
-      is_index_b = {}
-      if has_parent 
-        p = @align.get_source
-        a = @align.reference.get_target
-        b = @align.get_target
-        rp_header = @align.reference.meta.get_source_header
-        ra_header = @align.reference.meta.get_target_header
-        rb_header = @align.meta.get_target_header
+    def setup_tables 
+      @order = @align.to_order
+      @row_units = @order.get_list
+      @has_parent = @align.reference != nil
+      if @has_parent 
+        @p = @align.get_source
+        @a = @align.reference.get_target
+        @b = @align.get_target
+        @rp_header = @align.reference.meta.get_source_header
+        @ra_header = @align.reference.meta.get_target_header
+        @rb_header = @align.meta.get_target_header
         if @align.get_index_columns != nil 
           _g = 0
           _g1 = @align.get_index_columns
           while(_g < _g1.length) 
             p2b = _g1[_g]
             _g+=1
-            is_index_p[p2b.l] = true if p2b.l >= 0
-            is_index_b[p2b.r] = true if p2b.r >= 0
+            @is_index_p[p2b.l] = true if p2b.l >= 0
+            @is_index_b[p2b.r] = true if p2b.r >= 0
           end
         end
         if @align.reference.get_index_columns != nil 
@@ -262,491 +294,259 @@ module Coopy
           while(_g2 < _g11.length) 
             p2a = _g11[_g2]
             _g2+=1
-            is_index_p[p2a.l] = true if p2a.l >= 0
-            is_index_a[p2a.r] = true if p2a.r >= 0
+            @is_index_p[p2a.l] = true if p2a.l >= 0
+            @is_index_a[p2a.r] = true if p2a.r >= 0
           end
         end
       else 
-        a = @align.get_source
-        b = @align.get_target
-        p = a
-        ra_header = @align.meta.get_source_header
-        rp_header = ra_header
-        rb_header = @align.meta.get_target_header
+        @a = @align.get_source
+        @b = @align.get_target
+        @p = @a
+        @ra_header = @align.meta.get_source_header
+        @rp_header = @ra_header
+        @rb_header = @align.meta.get_target_header
         if @align.get_index_columns != nil 
           _g3 = 0
           _g12 = @align.get_index_columns
           while(_g3 < _g12.length) 
             a2b = _g12[_g3]
             _g3+=1
-            is_index_a[a2b.l] = true if a2b.l >= 0
-            is_index_b[a2b.r] = true if a2b.r >= 0
+            @is_index_a[a2b.l] = true if a2b.l >= 0
+            @is_index_b[a2b.r] = true if a2b.r >= 0
           end
         end
       end
+      @allow_insert = @flags.allow_insert
+      @allow_delete = @flags.allow_delete
+      @allow_update = @flags.allow_update
+      @v = @a.get_cell_view
+      @builder.set_view(@v)
+    end
+    
+    def scan_activity 
+      @active_row = Array.new
+      @active_column = nil
+      if !@flags.show_unchanged 
+        _g1 = 0
+        _g = @row_units.length
+        while(_g1 < _g) 
+          i = _g1
+          _g1+=1
+          @active_row[@row_units.length - 1 - i] = 0
+        end
+      end
+      if !@flags.show_unchanged_columns 
+        @active_column = Array.new
+        begin
+          _g11 = 0
+          _g2 = @column_units.length
+          while(_g11 < _g2) 
+            i1 = _g11
+            _g11+=1
+            v = 0
+            unit = @column_units[i1]
+            v = 1 if unit.l >= 0 && @is_index_a[unit.l]
+            v = 1 if unit.r >= 0 && @is_index_b[unit.r]
+            v = 1 if unit.p >= 0 && @is_index_p[unit.p]
+            @active_column[i1] = v
+          end
+        end
+      end
+    end
+    
+    def setup_columns 
       column_order = @align.meta.to_order
-      column_units = column_order.get_list
-      p_ignore = {}
-      a_ignore = {}
-      b_ignore = {}
+      @column_units = column_order.get_list
       ignore = @flags.get_ignored_columns
       if ignore != nil 
-        self.set_ignore(ignore,p_ignore,p,rp_header)
-        self.set_ignore(ignore,a_ignore,a,ra_header)
-        self.set_ignore(ignore,b_ignore,b,rb_header)
+        p_ignore = {}
+        a_ignore = {}
+        b_ignore = {}
+        self.set_ignore(ignore,p_ignore,@p,@rp_header)
+        self.set_ignore(ignore,a_ignore,@a,@ra_header)
+        self.set_ignore(ignore,b_ignore,@b,@rb_header)
         ncolumn_units = Array.new
         begin
-          _g13 = 0
-          _g4 = column_units.length
-          while(_g13 < _g4) 
-            j = _g13
-            _g13+=1
-            cunit = column_units[j]
+          _g1 = 0
+          _g = @column_units.length
+          while(_g1 < _g) 
+            j = _g1
+            _g1+=1
+            cunit = @column_units[j]
             next if p_ignore.include?(cunit.p) || a_ignore.include?(cunit.l) || b_ignore.include?(cunit.r)
             ncolumn_units.push(cunit)
           end
         end
-        column_units = ncolumn_units
+        @column_units = ncolumn_units
       end
-      show_rc_numbers = false
-      row_moves = nil
-      col_moves = nil
+    end
+    
+    def setup_moves 
       if @flags.ordered 
-        row_moves = {}
-        moves = ::Coopy::Mover.move_units(units)
+        @row_moves = {}
+        moves = ::Coopy::Mover.move_units(@row_units)
         begin
-          _g14 = 0
-          _g5 = moves.length
-          while(_g14 < _g5) 
-            i = _g14
-            _g14+=1
+          _g1 = 0
+          _g = moves.length
+          while(_g1 < _g) 
+            i = _g1
+            _g1+=1
             begin
-              row_moves[moves[i]] = i
+              @row_moves[moves[i]] = i
               i
             end
           end
         end
-        col_moves = {}
-        moves = ::Coopy::Mover.move_units(column_units)
+        @col_moves = {}
+        moves = ::Coopy::Mover.move_units(@column_units)
         begin
-          _g15 = 0
-          _g6 = moves.length
-          while(_g15 < _g6) 
-            i1 = _g15
-            _g15+=1
+          _g11 = 0
+          _g2 = moves.length
+          while(_g11 < _g2) 
+            i1 = _g11
+            _g11+=1
             begin
-              col_moves[moves[i1]] = i1
+              @col_moves[moves[i1]] = i1
               i1
             end
           end
         end
       end
-      active = Array.new
-      active_column = nil
-      if !@flags.show_unchanged 
-        _g16 = 0
-        _g7 = units.length
-        while(_g16 < _g7) 
-          i2 = _g16
-          _g16+=1
-          active[units.length - 1 - i2] = 0
-        end
-      end
-      allow_insert = @flags.allow_insert
-      allow_delete = @flags.allow_delete
-      allow_update = @flags.allow_update
-      if !@flags.show_unchanged_columns 
-        active_column = Array.new
-        begin
-          _g17 = 0
-          _g8 = column_units.length
-          while(_g17 < _g8) 
-            i3 = _g17
-            _g17+=1
-            v = 0
-            unit = column_units[i3]
-            v = 1 if unit.l >= 0 && is_index_a[unit.l]
-            v = 1 if unit.r >= 0 && is_index_b[unit.r]
-            v = 1 if unit.p >= 0 && is_index_p[unit.p]
-            active_column[i3] = v
-          end
-        end
-      end
-      v1 = a.get_cell_view
-      @builder.set_view(v1)
-      outer_reps_needed = nil
-      if @flags.show_unchanged && @flags.show_unchanged_columns 
-        outer_reps_needed = 1
-      else 
-        outer_reps_needed = 2
-      end
-      sep = ""
-      conflict_sep = ""
-      schema = Array.new
-      have_schema = false
+    end
+    
+    def scan_schema 
+      @schema = Array.new
+      @have_schema = false
       begin
-        _g18 = 0
-        _g9 = column_units.length
-        while(_g18 < _g9) 
-          j1 = _g18
-          _g18+=1
-          cunit1 = column_units[j1]
+        _g1 = 0
+        _g = @column_units.length
+        while(_g1 < _g) 
+          j = _g1
+          _g1+=1
+          cunit = @column_units[j]
           reordered = false
           if @flags.ordered 
-            reordered = true if col_moves.include?(j1)
-            show_rc_numbers = true if reordered
+            reordered = true if @col_moves.include?(j)
+            @show_rc_numbers = true if reordered
           end
           act = ""
-          if cunit1.r >= 0 && cunit1.lp == -1 
-            have_schema = true
+          if cunit.r >= 0 && cunit.lp == -1 
+            @have_schema = true
             act = "+++"
-            if active_column != nil 
-              active_column[j1] = 1 if allow_update
+            if @active_column != nil 
+              @active_column[j] = 1 if @allow_update
             end
           end
-          if cunit1.r < 0 && cunit1.lp >= 0 
-            have_schema = true
+          if cunit.r < 0 && cunit.lp >= 0 
+            @have_schema = true
             act = "---"
-            if active_column != nil 
-              active_column[j1] = 1 if allow_update
+            if @active_column != nil 
+              @active_column[j] = 1 if @allow_update
             end
           end
-          if cunit1.r >= 0 && cunit1.lp >= 0 
-            if p.get_height >= rp_header && b.get_height >= rb_header 
-              pp = p.get_cell(cunit1.lp,rp_header)
-              bb = b.get_cell(cunit1.r,rb_header)
-              if !v1.equals(pp,bb) 
-                have_schema = true
+          if cunit.r >= 0 && cunit.lp >= 0 
+            if @p.get_height >= @rp_header && @b.get_height >= @rb_header 
+              pp = @p.get_cell(cunit.lp,@rp_header)
+              bb = @b.get_cell(cunit.r,@rb_header)
+              if !@v.equals(pp,bb) 
+                @have_schema = true
                 act = "("
-                act += v1.to_s(pp)
+                act += @v.to_s(pp)
                 act += ")"
-                active_column[j1] = 1 if active_column != nil
+                @active_column[j] = 1 if @active_column != nil
               end
             end
           end
           if reordered 
             act = ":" + _hx_str(act)
-            have_schema = true
-            active_column = nil if active_column != nil
-          end
-          schema.push(act)
-        end
-      end
-      if have_schema 
-        at = output.get_height
-        output.resize(column_units.length + 1,at + 1)
-        output.set_cell(0,at,@builder.marker("!"))
-        begin
-          _g19 = 0
-          _g10 = column_units.length
-          while(_g19 < _g10) 
-            j2 = _g19
-            _g19+=1
-            output.set_cell(j2 + 1,at,v1.to_datum(schema[j2]))
-          end
-        end
-      end
-      top_line_done = false
-      if @flags.always_show_header 
-        at1 = output.get_height
-        output.resize(column_units.length + 1,at1 + 1)
-        output.set_cell(0,at1,@builder.marker("@@"))
-        begin
-          _g110 = 0
-          _g20 = column_units.length
-          while(_g110 < _g20) 
-            j3 = _g110
-            _g110+=1
-            cunit2 = column_units[j3]
-            if cunit2.r >= 0 
-              output.set_cell(j3 + 1,at1,b.get_cell(cunit2.r,rb_header)) if b.get_height != 0
-            elsif cunit2.lp >= 0 
-              output.set_cell(j3 + 1,at1,p.get_cell(cunit2.lp,rp_header)) if p.get_height != 0
-            end
-            col_map[j3 + 1] = cunit2
-          end
-        end
-        top_line_done = true
-      end
-      output_height = output.get_height
-      output_height_init = output.get_height
-      begin
-        _g21 = 0
-        while(_g21 < outer_reps_needed) 
-          out = _g21
-          _g21+=1
-          if out == 1 
-            self.spread_context(units,@flags.unchanged_context,active)
-            self.spread_context(column_units,@flags.unchanged_column_context,active_column)
-            if active_column != nil 
-              _g22 = 0
-              _g111 = column_units.length
-              while(_g22 < _g111) 
-                i4 = _g22
-                _g22+=1
-                active_column[i4] = 0 if active_column[i4] == 3
-              end
-            end
-            rows = self.count_active(active) + output_height_init
-            rows-=1 if top_line_done
-            output_height = output_height_init
-            output.resize(column_units.length + 1,rows) if rows > output.get_height
-          end
-          showed_dummy = false
-          l = -1
-          r = -1
-          begin
-            _g23 = 0
-            _g112 = units.length
-            while(_g23 < _g112) 
-              i5 = _g23
-              _g23+=1
-              unit1 = units[i5]
-              reordered1 = false
-              if @flags.ordered 
-                reordered1 = true if row_moves.include?(i5)
-                show_rc_numbers = true if reordered1
-              end
-              next if unit1.r < 0 && unit1.l < 0
-              next if unit1.r == 0 && unit1.lp == 0 && top_line_done
-              act1 = ""
-              act1 = ":" if reordered1
-              publish = @flags.show_unchanged
-              dummy = false
-              if out == 1 
-                publish = active[i5] > 0
-                dummy = active[i5] == 3
-                next if dummy && showed_dummy
-                next if !publish
-              end
-              showed_dummy = false if !dummy
-              at2 = output_height
-              if publish 
-                output_height+=1
-                output.resize(column_units.length + 1,output_height) if output.get_height < output_height
-              end
-              if dummy 
-                begin
-                  _g41 = 0
-                  _g31 = column_units.length + 1
-                  while(_g41 < _g31) 
-                    j4 = _g41
-                    _g41+=1
-                    output.set_cell(j4,at2,v1.to_datum("..."))
-                  end
-                end
-                showed_dummy = true
-                next
-              end
-              have_addition = false
-              skip = false
-              if unit1.p < 0 && unit1.l < 0 && unit1.r >= 0 
-                skip = true if !allow_insert
-                act1 = "+++"
-              end
-              if (unit1.p >= 0 || !has_parent) && unit1.l >= 0 && unit1.r < 0 
-                skip = true if !allow_delete
-                act1 = "---"
-              end
-              if skip 
-                if !publish 
-                  active[i5] = -3 if active != nil
-                end
-                next
-              end
-              begin
-                _g42 = 0
-                _g32 = column_units.length
-                while(_g42 < _g32) 
-                  j5 = _g42
-                  _g42+=1
-                  cunit3 = column_units[j5]
-                  pp1 = nil
-                  ll = nil
-                  rr = nil
-                  dd = nil
-                  dd_to = nil
-                  have_dd_to = false
-                  dd_to_alt = nil
-                  have_dd_to_alt = false
-                  have_pp = false
-                  have_ll = false
-                  have_rr = false
-                  if cunit3.p >= 0 && unit1.p >= 0 
-                    pp1 = p.get_cell(cunit3.p,unit1.p)
-                    have_pp = true
-                  end
-                  if cunit3.l >= 0 && unit1.l >= 0 
-                    ll = a.get_cell(cunit3.l,unit1.l)
-                    have_ll = true
-                  end
-                  if cunit3.r >= 0 && unit1.r >= 0 
-                    rr = b.get_cell(cunit3.r,unit1.r)
-                    have_rr = true
-                    if (((have_pp) ? cunit3.p : cunit3.l)) < 0 
-                      if rr != nil 
-                        if v1.to_s(rr) != "" 
-                          have_addition = true if @flags.allow_update
-                        end
-                      end
-                    end
-                  end
-                  if have_pp 
-                    if !have_rr 
-                      dd = pp1
-                    elsif v1.equals(pp1,rr) 
-                      dd = pp1
-                    else 
-                      dd = pp1
-                      dd_to = rr
-                      have_dd_to = true
-                      if !v1.equals(pp1,ll) 
-                        if !v1.equals(pp1,rr) 
-                          dd_to_alt = ll
-                          have_dd_to_alt = true
-                        end
-                      end
-                    end
-                  elsif have_ll 
-                    if !have_rr 
-                      dd = ll
-                    elsif v1.equals(ll,rr) 
-                      dd = ll
-                    else 
-                      dd = ll
-                      dd_to = rr
-                      have_dd_to = true
-                    end
-                  else 
-                    dd = rr
-                  end
-                  cell = dd
-                  if have_dd_to && allow_update 
-                    active_column[j5] = 1 if active_column != nil
-                    if sep == "" 
-                      if @builder.need_separator 
-                        sep = self.get_separator(a,b,"->")
-                        @builder.set_separator(sep)
-                      else 
-                        sep = "->"
-                      end
-                    end
-                    is_conflict = false
-                    if have_dd_to_alt 
-                      is_conflict = true if !v1.equals(dd_to,dd_to_alt)
-                    end
-                    if !is_conflict 
-                      cell = @builder.update(dd,dd_to)
-                      act1 = sep if sep.length > act1.length
-                    else 
-                      if conflict_sep == "" 
-                        if @builder.need_separator 
-                          conflict_sep = _hx_str(self.get_separator(p,a,"!")) + _hx_str(sep)
-                          @builder.set_conflict_separator(conflict_sep)
-                        else 
-                          conflict_sep = "!->"
-                        end
-                      end
-                      cell = @builder.conflict(dd,dd_to_alt,dd_to)
-                      act1 = conflict_sep
-                    end
-                  end
-                  act1 = "+" if act1 == "" && have_addition
-                  if act1 == "+++" 
-                    if have_rr 
-                      active_column[j5] = 1 if active_column != nil
-                    end
-                  end
-                  if publish 
-                    output.set_cell(j5 + 1,at2,cell) if active_column == nil || active_column[j5] > 0
-                  end
-                end
-              end
-              if publish 
-                output.set_cell(0,at2,@builder.marker(act1))
-                row_map[at2] = unit1
-              end
-              if act1 != "" 
-                if !publish 
-                  active[i5] = 1 if active != nil
-                end
-              end
-            end
+            @have_schema = true
+            @active_column = nil if @active_column != nil
           end
+          @schema.push(act)
         end
       end
-      if !show_rc_numbers 
+    end
+    
+    def check_rc_numbers(w,h)
+      if !@show_rc_numbers 
         if @flags.always_show_order 
-          show_rc_numbers = true
+          @show_rc_numbers = true
         elsif @flags.ordered 
-          show_rc_numbers = self.is_reordered(row_map,output.get_height)
-          show_rc_numbers = self.is_reordered(col_map,output.get_width) if !show_rc_numbers
+          @show_rc_numbers = self.is_reordered(@row_map,h)
+          @show_rc_numbers = self.is_reordered(@col_map,w) if !@show_rc_numbers
         end
       end
+    end
+    
+    def add_rc_numbers(output)
       admin_w = 1
-      if show_rc_numbers && !@flags.never_show_order 
+      if @show_rc_numbers && !@flags.never_show_order 
         admin_w+=1
         target = Array.new
         begin
-          _g113 = 0
-          _g24 = output.get_width
-          while(_g113 < _g24) 
-            i6 = _g113
-            _g113+=1
-            target.push(i6 + 1)
+          _g1 = 0
+          _g = output.get_width
+          while(_g1 < _g) 
+            i = _g1
+            _g1+=1
+            target.push(i + 1)
           end
         end
         output.insert_or_delete_columns(target,output.get_width + 1)
         begin
-          _g114 = 0
-          _g25 = output.get_height
-          while(_g114 < _g25) 
-            i7 = _g114
-            _g114+=1
-            unit2 = row_map[i7]
-            if unit2 == nil 
-              output.set_cell(0,i7,"")
+          _g11 = 0
+          _g2 = output.get_height
+          while(_g11 < _g2) 
+            i1 = _g11
+            _g11+=1
+            unit = @row_map[i1]
+            if unit == nil 
+              output.set_cell(0,i1,"")
               next
             end
-            output.set_cell(0,i7,@builder.links(unit2))
+            output.set_cell(0,i1,@builder.links(unit,true))
           end
         end
         target = Array.new
         begin
-          _g115 = 0
-          _g26 = output.get_height
-          while(_g115 < _g26) 
-            i8 = _g115
-            _g115+=1
-            target.push(i8 + 1)
+          _g12 = 0
+          _g3 = output.get_height
+          while(_g12 < _g3) 
+            i2 = _g12
+            _g12+=1
+            target.push(i2 + 1)
           end
         end
         output.insert_or_delete_rows(target,output.get_height + 1)
         begin
-          _g116 = 1
-          _g27 = output.get_width
-          while(_g116 < _g27) 
-            i9 = _g116
-            _g116+=1
-            unit3 = col_map[i9 - 1]
-            if unit3 == nil 
-              output.set_cell(i9,0,"")
+          _g13 = 1
+          _g4 = output.get_width
+          while(_g13 < _g4) 
+            i3 = _g13
+            _g13+=1
+            unit1 = @col_map[i3 - 1]
+            if unit1 == nil 
+              output.set_cell(i3,0,"")
               next
             end
-            output.set_cell(i9,0,@builder.links(unit3))
+            output.set_cell(i3,0,@builder.links(unit1,false))
           end
         end
         output.set_cell(0,0,@builder.marker("@:@"))
       end
-      if active_column != nil 
+      admin_w
+    end
+    
+    def elide_columns(output,admin_w)
+      if @active_column != nil 
         all_active = true
         begin
-          _g117 = 0
-          _g28 = active_column.length
-          while(_g117 < _g28) 
-            i10 = _g117
-            _g117+=1
-            if active_column[i10] == 0 
+          _g1 = 0
+          _g = @active_column.length
+          while(_g1 < _g) 
+            i = _g1
+            _g1+=1
+            if @active_column[i] == 0 
               all_active = false
               break
             end
@@ -755,23 +555,23 @@ module Coopy
         if !all_active 
           fate = Array.new
           begin
-            _g29 = 0
-            while(_g29 < admin_w) 
-              i11 = _g29
-              _g29+=1
-              fate.push(i11)
+            _g2 = 0
+            while(_g2 < admin_w) 
+              i1 = _g2
+              _g2+=1
+              fate.push(i1)
             end
           end
-          at3 = admin_w
+          at = admin_w
           ct = 0
           dots = Array.new
           begin
-            _g118 = 0
-            _g30 = active_column.length
-            while(_g118 < _g30) 
-              i12 = _g118
-              _g118+=1
-              off = active_column[i12] == 0
+            _g11 = 0
+            _g3 = @active_column.length
+            while(_g11 < _g3) 
+              i2 = _g11
+              _g11+=1
+              off = @active_column[i2] == 0
               if off 
                 ct = ct + 1
               else 
@@ -780,32 +580,411 @@ module Coopy
               if off && ct > 1 
                 fate.push(-1)
               else 
-                dots.push(at3) if off
-                fate.push(at3)
-                at3+=1
+                dots.push(at) if off
+                fate.push(at)
+                at+=1
               end
             end
           end
-          output.insert_or_delete_columns(fate,at3)
+          output.insert_or_delete_columns(fate,at)
           begin
-            _g33 = 0
-            while(_g33 < dots.length) 
-              d = dots[_g33]
-              _g33+=1
+            _g4 = 0
+            while(_g4 < dots.length) 
+              d = dots[_g4]
+              _g4+=1
               begin
-                _g210 = 0
-                _g119 = output.get_height
-                while(_g210 < _g119) 
-                  j6 = _g210
-                  _g210+=1
-                  output.set_cell(d,j6,@builder.marker("..."))
+                _g21 = 0
+                _g12 = output.get_height
+                while(_g21 < _g12) 
+                  j = _g21
+                  _g21+=1
+                  output.set_cell(d,j,@builder.marker("..."))
                 end
               end
             end
           end
         end
       end
-      return true
+    end
+    
+    def add_schema(output)
+      if @have_schema 
+        at = output.get_height
+        output.resize(@column_units.length + 1,at + 1)
+        output.set_cell(0,at,@builder.marker("!"))
+        begin
+          _g1 = 0
+          _g = @column_units.length
+          while(_g1 < _g) 
+            j = _g1
+            _g1+=1
+            output.set_cell(j + 1,at,@v.to_datum(@schema[j]))
+          end
+        end
+        @schema_diff_found = true
+      end
+    end
+    
+    def add_header(output)
+      if @flags.always_show_header 
+        at = output.get_height
+        output.resize(@column_units.length + 1,at + 1)
+        output.set_cell(0,at,@builder.marker("@@"))
+        begin
+          _g1 = 0
+          _g = @column_units.length
+          while(_g1 < _g) 
+            j = _g1
+            _g1+=1
+            cunit = @column_units[j]
+            if cunit.r >= 0 
+              output.set_cell(j + 1,at,@b.get_cell(cunit.r,@rb_header)) if @b.get_height != 0
+            elsif cunit.l >= 0 
+              output.set_cell(j + 1,at,@a.get_cell(cunit.l,@ra_header)) if @a.get_height != 0
+            elsif cunit.lp >= 0 
+              output.set_cell(j + 1,at,@p.get_cell(cunit.lp,@rp_header)) if @p.get_height != 0
+            end
+            @col_map[j + 1] = cunit
+          end
+        end
+        @top_line_done = true
+      end
+    end
+    
+    def check_meta(t,meta)
+      return false if meta.get_width != t.get_width + 1
+      return false if meta.get_width == 0 || meta.get_height == 0
+      true
+    end
+    
+    def get_meta_table(t)
+      meta = t.get_meta
+      return nil if meta == nil
+      meta.as_table
+    end
+    
+    def add_meta(output)
+      a_meta = nil
+      b_meta = nil
+      p_meta = nil
+      a_meta = self.get_meta_table(@a)
+      b_meta = self.get_meta_table(@b)
+      p_meta = self.get_meta_table(@p)
+      return false if a_meta == nil || b_meta == nil || p_meta == nil
+      return false if !self.check_meta(@a,a_meta)
+      return false if !self.check_meta(@b,b_meta)
+      return false if !self.check_meta(@p,p_meta)
+      return false if !@flags.show_meta
+      meta_diff = ::Coopy::SimpleTable.new(0,0)
+      meta_flags = ::Coopy::CompareFlags.new
+      meta_flags.add_primary_key("@@")
+      meta_flags.add_primary_key("@")
+      meta_flags.unchanged_column_context = 65536
+      meta_flags.unchanged_context = 0
+      meta_align = ::Coopy::Coopy.compare_tables3(((a_meta == p_meta) ? nil : p_meta),a_meta,b_meta,meta_flags).align
+      td = ::Coopy::TableDiff.new(meta_align,meta_flags)
+      td.preserve_columns = true
+      td.hilite(meta_diff)
+      if td.has_difference 
+        h = output.get_height
+        dh = meta_diff.get_height
+        offset = nil
+        if td.has_schema_difference 
+          offset = 2
+        else 
+          offset = 1
+        end
+        output.resize(output.get_width,h + dh - offset)
+        v = meta_diff.get_cell_view
+        begin
+          _g = offset
+          while(_g < dh) 
+            y = _g
+            _g+=1
+            begin
+              _g2 = 1
+              _g1 = meta_diff.get_width
+              while(_g2 < _g1) 
+                x = _g2
+                _g2+=1
+                c = meta_diff.get_cell(x,y)
+                c = "@" + _hx_str(v.to_s(c)) + "@" + _hx_str(v.to_s(meta_diff.get_cell(0,y))) if x == 1
+                output.set_cell(x - 1,h + y - offset,c)
+              end
+            end
+          end
+        end
+        if @active_column != nil 
+          if td.active_column.length == meta_diff.get_width 
+            _g11 = 1
+            _g3 = meta_diff.get_width
+            while(_g11 < _g3) 
+              i = _g11
+              _g11+=1
+              @active_column[i - 1] = 1 if td.active_column[i] >= 0
+            end
+          end
+        end
+      end
+      false
+    end
+    
+    def refine_activity 
+      self.spread_context(@row_units,@flags.unchanged_context,@active_row)
+      self.spread_context(@column_units,@flags.unchanged_column_context,@active_column)
+      if @active_column != nil 
+        _g1 = 0
+        _g = @column_units.length
+        while(_g1 < _g) 
+          i = _g1
+          _g1+=1
+          @active_column[i] = 0 if @active_column[i] == 3
+        end
+      end
+    end
+    
+    def scan_row(unit,output,at,i)
+      begin
+        _g1 = 0
+        _g = @column_units.length
+        while(_g1 < _g) 
+          j = _g1
+          _g1+=1
+          cunit = @column_units[j]
+          pp = nil
+          ll = nil
+          rr = nil
+          dd = nil
+          dd_to = nil
+          have_dd_to = false
+          dd_to_alt = nil
+          have_dd_to_alt = false
+          have_pp = false
+          have_ll = false
+          have_rr = false
+          if cunit.p >= 0 && unit.p >= 0 
+            pp = @p.get_cell(cunit.p,unit.p)
+            have_pp = true
+          end
+          if cunit.l >= 0 && unit.l >= 0 
+            ll = @a.get_cell(cunit.l,unit.l)
+            have_ll = true
+          end
+          if cunit.r >= 0 && unit.r >= 0 
+            rr = @b.get_cell(cunit.r,unit.r)
+            have_rr = true
+            if (((have_pp) ? cunit.p : cunit.l)) < 0 
+              if rr != nil 
+                if @v.to_s(rr) != "" 
+                  @have_addition = true if @flags.allow_update
+                end
+              end
+            end
+          end
+          if have_pp 
+            if !have_rr 
+              dd = pp
+            elsif @v.equals(pp,rr) 
+              dd = ll
+            else 
+              dd = pp
+              dd_to = rr
+              have_dd_to = true
+              if !@v.equals(pp,ll) 
+                if !@v.equals(pp,rr) 
+                  dd_to_alt = ll
+                  have_dd_to_alt = true
+                end
+              end
+            end
+          elsif have_ll 
+            if !have_rr 
+              dd = ll
+            elsif @v.equals(ll,rr) 
+              dd = ll
+            else 
+              dd = ll
+              dd_to = rr
+              have_dd_to = true
+            end
+          else 
+            dd = rr
+          end
+          cell = dd
+          if have_dd_to && @allow_update 
+            @active_column[j] = 1 if @active_column != nil
+            if @sep == "" 
+              if @builder.need_separator 
+                @sep = self.get_separator(@a,@b,"->")
+                @builder.set_separator(@sep)
+              else 
+                @sep = "->"
+              end
+            end
+            is_conflict = false
+            if have_dd_to_alt 
+              is_conflict = true if !@v.equals(dd_to,dd_to_alt)
+            end
+            if !is_conflict 
+              cell = @builder.update(dd,dd_to)
+              @act = @sep if @sep.length > @act.length
+            else 
+              if @conflict_sep == "" 
+                if @builder.need_separator 
+                  @conflict_sep = _hx_str(self.get_separator(@p,@a,"!")) + _hx_str(@sep)
+                  @builder.set_conflict_separator(@conflict_sep)
+                else 
+                  @conflict_sep = "!->"
+                end
+              end
+              cell = @builder.conflict(dd,dd_to_alt,dd_to)
+              @act = @conflict_sep
+            end
+          end
+          @act = "+" if @act == "" && @have_addition
+          if @act == "+++" 
+            if have_rr 
+              @active_column[j] = 1 if @active_column != nil
+            end
+          end
+          if @publish 
+            output.set_cell(j + 1,at,cell) if @active_column == nil || @active_column[j] > 0
+          end
+        end
+      end
+      if @publish 
+        output.set_cell(0,at,@builder.marker(@act))
+        @row_map[at] = unit
+      end
+      if @act != "" 
+        @diff_found = true
+        if !@publish 
+          @active_row[i] = 1 if @active_row != nil
+        end
+      end
+    end
+    
+    public
+    
+    def hilite(output)
+      return false if !output.is_resizable
+      if @builder == nil 
+        if @flags.allow_nested_cells 
+          @builder = ::Coopy::NestedCellBuilder.new
+        else 
+          @builder = ::Coopy::FlatCellBuilder.new(@flags)
+        end
+      end
+      output.resize(0,0)
+      output.clear
+      self.reset
+      self.setup_tables
+      self.setup_columns
+      self.setup_moves
+      self.scan_activity
+      self.scan_schema
+      self.add_schema(output)
+      self.add_header(output)
+      self.add_meta(output)
+      outer_reps_needed = nil
+      if @flags.show_unchanged && @flags.show_unchanged_columns 
+        outer_reps_needed = 1
+      else 
+        outer_reps_needed = 2
+      end
+      output_height = output.get_height
+      output_height_init = output.get_height
+      begin
+        _g = 0
+        while(_g < outer_reps_needed) 
+          out = _g
+          _g+=1
+          if out == 1 
+            self.refine_activity
+            rows = self.count_active(@active_row) + output_height_init
+            rows-=1 if @top_line_done
+            output_height = output_height_init
+            output.resize(@column_units.length + 1,rows) if rows > output.get_height
+          end
+          showed_dummy = false
+          l = -1
+          r = -1
+          begin
+            _g2 = 0
+            _g1 = @row_units.length
+            while(_g2 < _g1) 
+              i = _g2
+              _g2+=1
+              unit = @row_units[i]
+              reordered = false
+              if @flags.ordered 
+                reordered = true if @row_moves.include?(i)
+                @show_rc_numbers = true if reordered
+              end
+              next if unit.r < 0 && unit.l < 0
+              next if unit.r == 0 && unit.lp <= 0 && @top_line_done
+              @publish = @flags.show_unchanged
+              dummy = false
+              if out == 1 
+                @publish = @active_row[i] > 0
+                dummy = @active_row[i] == 3
+                next if dummy && showed_dummy
+                next if !@publish
+              end
+              showed_dummy = false if !dummy
+              at = output_height
+              if @publish 
+                output_height+=1
+                output.resize(@column_units.length + 1,output_height) if output.get_height < output_height
+              end
+              if dummy 
+                begin
+                  _g4 = 0
+                  _g3 = @column_units.length + 1
+                  while(_g4 < _g3) 
+                    j = _g4
+                    _g4+=1
+                    output.set_cell(j,at,@v.to_datum("..."))
+                  end
+                end
+                showed_dummy = true
+                next
+              end
+              @have_addition = false
+              skip = false
+              @act = ""
+              @act = ":" if reordered
+              if unit.p < 0 && unit.l < 0 && unit.r >= 0 
+                skip = true if !@allow_insert
+                @act = "+++"
+              end
+              if (unit.p >= 0 || !@has_parent) && unit.l >= 0 && unit.r < 0 
+                skip = true if !@allow_delete
+                @act = "---"
+              end
+              if skip 
+                if !@publish 
+                  @active_row[i] = -3 if @active_row != nil
+                end
+                next
+              end
+              self.scan_row(unit,output,at,i)
+            end
+          end
+        end
+      end
+      self.check_rc_numbers(output.get_width,output.get_height)
+      admin_w = self.add_rc_numbers(output)
+      self.elide_columns(output,admin_w) if !@preserve_columns
+      true
+    end
+    
+    def has_difference 
+      @diff_found
+    end
+    
+    def has_schema_difference 
+      @schema_diff_found
     end
     
   haxe_me ["coopy", "TableDiff"]