daff 1.2.4 → 1.2.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 99676b5f3069a96639961074611e5c8c0125361a
+  data.tar.gz: 61f811c90251dfee2afc8f187731813aad4bece7
+SHA512:
+  metadata.gz: 1ebb393d477f490c2a733cd5ea055c64cc41cd32ef52fea5df7f92f8eee5983eea96bf7c4e79a377d3765a86d497a0e6cba38b520ea46ade3f6b644f11ff6f08
+  data.tar.gz: d70b61f7f4cb52e6e6d9a22cb9f50b8ce1c3fed78031baff2ae5c4ab1f9450131ed7a74f28abd49193dce685f107694420c7ec9d8f971953cb4257c02813ae4c

data/README.md

@@ -22,6 +22,7 @@ npm install daff -g  # node/javascript
 pip install daff     # python
 gem install daff     # ruby
 composer require paulfitz/daff-php  # php
+install.packages('daff') # R wrapper by Edwin de Jonge
 ````
 
 Other translations are available here:
@@ -215,11 +216,21 @@ For each language, the `daff` library expects to be handed an interface to table
 itself.  This is to avoid inefficient copies from one format to another.  You'll find a `SimpleTable` class you can use if
 you find this awkward.
 
+Other possibilities:
+
+ * There's a daff wrapper for R written by [Edwin de Jonge](https://github.com/edwindj), see https://github.com/edwindj/daff and http://cran.r-project.org/web/packages/daff
+ * There's a hand-written ruby port by [James Smith](https://github.com/Floppy), see https://github.com/theodi/coopy-ruby
+
 API documentation
 -----------------
 
  * You can browse the `daff` classes at http://paulfitz.github.io/daff-doc/
 
+Sponsors
+--------
+
+The [Data Commons Co-op](http://datacommons.coop),  "perhaps the geekiest of all cooperative organizations on the planet," has given great moral support during the initial development of `daff`. There's currently no financial support for `daff`. You could change that! [![tips](https://img.shields.io/gratipay/paulfitz.svg)](https://gratipay.com/paulfitz/)
+
 Reading material
 ----------------
 

data/lib/daff.rb

@@ -7,25 +7,37 @@ if ruby_major<1 || (ruby_major==1 && (ruby_minor<9 || (ruby_minor==9 && ruby_pat
   $stderr.puts "Your current Ruby version is: #{RUBY_VERSION}. Haxe/Ruby generates code for version 1.9.3 or later."
   Kernel.exit 1
 end
-def haxe_me
+def haxe_me(source_name)
+  $hx_types ||= {}
+  $hx_types[source_name.join('.')] = self
   _haxe_vars_ = {}
-  instance_methods(false).grep(/=$/).each do |v|
+  instance_methods(false).grep(/=$/).grep(/^[^\[=]/).each do |v|
     _haxe_vars_[v.to_s[0..-2].to_sym] = ('@'+v.to_s[0..-2]).to_sym
   end
+  old_get = instance_method(:[]) rescue nil
   define_method(:[]) do |x|
+    return old_get.bind(self).(x) if x.is_a?(Fixnum)
     tag = _haxe_vars_[x]
     return instance_variable_get(tag) if tag
     method x
   end
+  old_set = instance_method(:[]=) rescue nil
   define_method(:[]=) do |x,y|
+    return old_set.bind(self).(x,y) if x.is_a?(Fixnum)
     instance_variable_set(_haxe_vars_[x],y)
   end
+  define_method(:haxe_name) do
+    source_name.join('.')
+  end
   class << self
     define_method(:[]) do |x|
       method x
     end
   end
 end
+class Array
+  haxe_me(['Array'])
+end
 
 require 'date'
 require_relative 'lib/hx_overrides'
@@ -83,11 +95,7 @@ require_relative 'lib/haxe/ds/string_map'
 require_relative 'lib/haxe/format/json_parser'
 require_relative 'lib/haxe/format/json_printer'
 require_relative 'lib/haxe/io/bytes'
-require_relative 'lib/haxe/io/bytes_buffer'
-require_relative 'lib/haxe/io/input'
-require_relative 'lib/haxe/io/bytes_input'
 require_relative 'lib/haxe/io/output'
-require_relative 'lib/haxe/io/bytes_output'
 require_relative 'lib/haxe/io/eof'
 require_relative 'lib/haxe/io/error'
 require_relative 'lib/rb/boot'

data/lib/lib/coopy/alignment.rb

@@ -300,7 +300,7 @@ module Coopy
       return order
     end
     
-  haxe_me
+  haxe_me ["coopy", "Alignment"]
   end
 
 end

data/lib/lib/coopy/cell_builder.rb

@@ -11,7 +11,7 @@ module Coopy
     def conflict(parent,local,remote) puts "Abstract CellBuilder.conflict called" end
     def marker(label) puts "Abstract CellBuilder.marker called" end
     def links(unit) puts "Abstract CellBuilder.links called" end
-  haxe_me
+  haxe_me ["coopy", "CellBuilder"]
   end
 
 end

data/lib/lib/coopy/cell_info.rb

@@ -26,7 +26,7 @@ module Coopy
       return _hx_str(@pvalue) + "||" + _hx_str(@lvalue) + "::" + _hx_str(@rvalue)
     end
     
-  haxe_me
+  haxe_me ["coopy", "CellInfo"]
   end
 
 end

data/lib/lib/coopy/compare_flags.rb

@@ -84,7 +84,7 @@ module Coopy
       @columns_to_ignore.push(column)
     end
     
-  haxe_me
+  haxe_me ["coopy", "CompareFlags"]
   end
 
 end

data/lib/lib/coopy/compare_table.rb

@@ -177,9 +177,11 @@ module Coopy
           sorter = lambda {|a1,b1|
             return 1 if a1[1] < b1[1]
             return -1 if a1[1] > b1[1]
+            return 1 if a1[0] > b1[0]
+            return -1 if a1[0] < b1[0]
             return 0
           }
-          columns_eval.sort!{|a,b| sorter.call(a,b)}
+          columns_eval.sort{|a,b| sorter.call(a,b)}
           columns = Lambda.array(Lambda.map(columns_eval,lambda {|v|
             return v[0]
           }))
@@ -521,7 +523,7 @@ module Coopy
       return @indexes
     end
     
-  haxe_me
+  haxe_me ["coopy", "CompareTable"]
   end
 
 end

data/lib/lib/coopy/coopy.rb

@@ -31,7 +31,7 @@ module Coopy
       ext = ""
       pt = name.rindex(".",nil || 0) || -1
       if pt >= 0 
-        ext = HxOverrides.substr(name,pt + 1,nil).to_lower_case
+        ext = name[pt + 1..-1].to_lower_case
         case(ext)
         when "json"
           @format_preference = "json"
@@ -610,7 +610,7 @@ module Coopy
     class << self
     attr_accessor :version
     end
-    @version = "1.2.4"
+    @version = "1.2.6"
     
     def Coopy.compare_tables(local,remote,flags = nil)
       comp = ::Coopy::TableComparisonState.new
@@ -773,7 +773,7 @@ module Coopy
       return workbook
     end
     
-  haxe_me
+  haxe_me ["coopy", "Coopy"]
   end
 
 end

data/lib/lib/coopy/cross_match.rb

@@ -11,7 +11,7 @@ module Coopy
     attr_accessor :spot_b
     attr_accessor :item_a
     attr_accessor :item_b
-  haxe_me
+  haxe_me ["coopy", "CrossMatch"]
   end
 
 end

data/lib/lib/coopy/csv.rb

@@ -188,7 +188,7 @@ module Coopy
         return nil if result == "NULL"
         if first_non_underscore > start 
           del = first_non_underscore - start
-          return HxOverrides.substr(result,1,nil) if HxOverrides.substr(result,del,nil) == "NULL"
+          return result[1..-1] if result[del..-1] == "NULL"
         end
       end
       return result
@@ -203,7 +203,7 @@ module Coopy
       return self.parse_cell_part(txt)
     end
     
-  haxe_me
+  haxe_me ["coopy", "Csv"]
   end
 
 end

data/lib/lib/coopy/diff_render.rb

@@ -296,7 +296,7 @@ module Coopy
       return cell
     end
     
-  haxe_me
+  haxe_me ["coopy", "DiffRender"]
   end
 
 end

data/lib/lib/coopy/flat_cell_builder.rb

@@ -62,11 +62,11 @@ module Coopy
           score+=1
         end
       end
-      str = "_" + _hx_str(str) if HxOverrides.substr(str,score,nil) == _nil
+      str = "_" + _hx_str(str) if str[score..-1] == _nil
       return str
     end
     
-  haxe_me
+  haxe_me ["coopy", "FlatCellBuilder"]
   end
 
 end

data/lib/lib/coopy/highlight_patch.rb

@@ -203,13 +203,13 @@ module Coopy
           if mod != nil 
             if (mod[0].ord rescue nil) == 58 
               move = true
-              mod = HxOverrides.substr(mod,1,mod.length)
+              mod = mod[1,mod.length]
             end
           end
           @header[i] = name
           if mod != nil 
             if (mod[0].ord rescue nil) == 40 
-              prev_name = HxOverrides.substr(mod,1,mod.length - 2)
+              prev_name = mod[1,mod.length - 2]
               @header_pre[prev_name] = i
               @header_post[name] = i
               @header_rename[prev_name] = name
@@ -312,10 +312,13 @@ module Coopy
     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
+      if rmods.length > 0 
+        last = 0 if rmods[0].source_prev_row == -1
+      end
       begin
         _g = 0
         while(_g < rmods.length) 
@@ -414,8 +417,10 @@ module Coopy
             _g1+=1
             u = from_unit[i]
             if u != nil 
-              meta_from_unit[u] = i
-              i
+              begin
+                meta_from_unit[u] = i
+                i
+              end
             else 
               starts.push(i)
             end
@@ -648,7 +653,7 @@ module Coopy
       end
     end
     
-  haxe_me
+  haxe_me ["coopy", "HighlightPatch"]
   end
 
 end

data/lib/lib/coopy/highlight_patch_unit.rb

@@ -32,7 +32,7 @@ module Coopy
       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)
     end
     
-  haxe_me
+  haxe_me ["coopy", "HighlightPatchUnit"]
   end
 
 end

data/lib/lib/coopy/index.rb

@@ -100,7 +100,7 @@ module Coopy
       return @indexed_table
     end
     
-  haxe_me
+  haxe_me ["coopy", "Index"]
   end
 
 end

data/lib/lib/coopy/index_item.rb

@@ -27,7 +27,7 @@ module Coopy
       return @lst[0]
     end
     
-  haxe_me
+  haxe_me ["coopy", "IndexItem"]
   end
 
 end

data/lib/lib/coopy/index_pair.rb

@@ -85,7 +85,7 @@ module Coopy
       return @quality
     end
     
-  haxe_me
+  haxe_me ["coopy", "IndexPair"]
   end
 
 end

data/lib/lib/coopy/merger.rb

@@ -180,7 +180,7 @@ module Coopy
       return view.to_datum("((( " + _hx_str(view.to_s(pcell)) + " ))) " + _hx_str(view.to_s(lcell)) + " /// " + _hx_str(view.to_s(rcell)))
     end
     
-  haxe_me
+  haxe_me ["coopy", "Merger"]
   end
 
 end

data/lib/lib/coopy/mover.rb

@@ -155,7 +155,7 @@ module Coopy
         k = _it._next
         blks.push(k)
       end
-      blks.sort! {|a,b|
+      blks.sort {|a,b|
         return blk_len[b] - blk_len[a]
       }
       moved = Array.new
@@ -189,7 +189,7 @@ module Coopy
       return moved
     end
     
-  haxe_me
+  haxe_me ["coopy", "Mover"]
   end
 
 end

data/lib/lib/coopy/ndjson.rb

@@ -128,7 +128,7 @@ module Coopy
       self.add_header_row(0)
     end
     
-  haxe_me
+  haxe_me ["coopy", "Ndjson"]
   end
 
 end

data/lib/lib/coopy/nested_cell_builder.rb

@@ -68,7 +68,7 @@ module Coopy
       return h
     end
     
-  haxe_me
+  haxe_me ["coopy", "NestedCellBuilder"]
   end
 
 end

data/lib/lib/coopy/ordering.rb

@@ -44,7 +44,7 @@ module Coopy
       @ignore_parent = true
     end
     
-  haxe_me
+  haxe_me ["coopy", "Ordering"]
   end
 
 end

data/lib/lib/coopy/row.rb

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

data/lib/lib/coopy/simple_table.rb

@@ -281,7 +281,7 @@ module Coopy
       return true
     end
     
-  haxe_me
+  haxe_me ["coopy", "SimpleTable"]
   end
 
 end

data/lib/lib/coopy/simple_view.rb

@@ -52,7 +52,7 @@ module Coopy
       return h.respond_to? :keys
     end
     
-  haxe_me
+  haxe_me ["coopy", "SimpleView"]
   end
 
 end

data/lib/lib/coopy/sparse_sheet.rb

@@ -45,7 +45,7 @@ module Coopy
       cursor[x] = val
     end
     
-  haxe_me
+  haxe_me ["coopy", "SparseSheet"]
   end
 
 end

data/lib/lib/coopy/sql_column.rb

@@ -29,7 +29,7 @@ module Coopy
       return result
     end
     
-  haxe_me
+  haxe_me ["coopy", "SqlColumn"]
   end
 
 end

data/lib/lib/coopy/sql_compare.rb

@@ -239,7 +239,7 @@ module Coopy
       return @align
     end
     
-  haxe_me
+  haxe_me ["coopy", "SqlCompare"]
   end
 
 end

data/lib/lib/coopy/sql_database.rb

@@ -13,7 +13,7 @@ module Coopy
     def end() puts "Abstract SqlDatabase.end called" end
     def width() puts "Abstract SqlDatabase.width called" end
     def rowid() puts "Abstract SqlDatabase.rowid called" end
-  haxe_me
+  haxe_me ["coopy", "SqlDatabase"]
   end
 
 end

data/lib/lib/coopy/sql_helper.rb

@@ -6,7 +6,7 @@ module Coopy
     def getTableNames(db) puts "Abstract SqlHelper.getTableNames called" end
     def countRows(db,name) puts "Abstract SqlHelper.countRows called" end
     def getRowIDs(db,name) puts "Abstract SqlHelper.getRowIDs called" end
-  haxe_me
+  haxe_me ["coopy", "SqlHelper"]
   end
 
 end

data/lib/lib/coopy/sql_table.rb

@@ -210,7 +210,7 @@ module Coopy
       return nil
     end
     
-  haxe_me
+  haxe_me ["coopy", "SqlTable"]
   end
 
 end

data/lib/lib/coopy/sql_table_name.rb

@@ -17,7 +17,7 @@ module Coopy
       return _hx_str(@prefix) + "." + _hx_str(@name)
     end
     
-  haxe_me
+  haxe_me ["coopy", "SqlTableName"]
   end
 
 end

data/lib/lib/coopy/sqlite_helper.rb

@@ -41,7 +41,7 @@ module Coopy
       return result
     end
     
-  haxe_me
+  haxe_me ["coopy", "SqliteHelper"]
   end
 
 end

data/lib/lib/coopy/table.rb

@@ -16,7 +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
-  haxe_me
+  haxe_me ["coopy", "Table"]
   end
 
 end

data/lib/lib/coopy/table_comparison_state.rb

@@ -29,7 +29,7 @@ module Coopy
       @compare_flags = nil
     end
     
-  haxe_me
+  haxe_me ["coopy", "TableComparisonState"]
   end
 
 end

data/lib/lib/coopy/table_diff.rb

@@ -89,7 +89,7 @@ module Coopy
           score+=1
         end
       end
-      str = "_" + _hx_str(str) if HxOverrides.substr(str,score,nil) == _nil
+      str = "_" + _hx_str(str) if str[score..-1] == _nil
       return str
     end
     
@@ -808,7 +808,7 @@ module Coopy
       return true
     end
     
-  haxe_me
+  haxe_me ["coopy", "TableDiff"]
   end
 
 end

data/lib/lib/coopy/table_io.rb

@@ -49,7 +49,7 @@ module Coopy
       return nil
     end
     
-  haxe_me
+  haxe_me ["coopy", "TableIO"]
   end
 
 end

data/lib/lib/coopy/table_modifier.rb

@@ -34,7 +34,7 @@ module Coopy
       return @t.insert_or_delete_columns(fate,@t.get_width - 1)
     end
     
-  haxe_me
+  haxe_me ["coopy", "TableModifier"]
   end
 
 end

data/lib/lib/coopy/terminal_diff_render.rb

@@ -164,7 +164,7 @@ module Coopy
       return sizes
     end
     
-  haxe_me
+  haxe_me ["coopy", "TerminalDiffRender"]
   end
 
 end

data/lib/lib/coopy/unit.rb

@@ -67,7 +67,7 @@ module Coopy
       end
     end
     
-  haxe_me
+  haxe_me ["coopy", "Unit"]
   end
 
 end

data/lib/lib/coopy/view.rb

@@ -11,7 +11,7 @@ module Coopy
     def isHash(h) puts "Abstract View.isHash called" end
     def hashExists(h,str) puts "Abstract View.hashExists called" end
     def hashGet(h,str) puts "Abstract View.hashGet called" end
-  haxe_me
+  haxe_me ["coopy", "View"]
   end
 
 end

data/lib/lib/coopy/viterbi.rb

@@ -171,7 +171,7 @@ module Coopy
       return @best_cost
     end
     
-  haxe_me
+  haxe_me ["coopy", "Viterbi"]
   end
 
 end

data/lib/lib/haxe/ds/int_map.rb

@@ -12,7 +12,7 @@ module Ds
       return self[key]
     end
     
-  haxe_me
+  haxe_me ["haxe", "ds", "IntMap"]
   end
 
 end

data/lib/lib/haxe/ds/string_map.rb

@@ -12,7 +12,7 @@ module Ds
       return self[key]
     end
     
-  haxe_me
+  haxe_me ["haxe", "ds", "StringMap"]
   end
 
 end

data/lib/lib/haxe/format/json_parser.rb

@@ -183,7 +183,7 @@ module Format
           end
           f = nil
           begin
-            x = HxOverrides.substr(@str,start,@pos - start)
+            x = @str[start,@pos - start]
             f = x.to_f
           end
           i = f.to_i
@@ -210,7 +210,7 @@ module Format
         end
         break if c == 34
         if c == 92 
-          buf_b += HxOverrides.substr(@str,start,@pos - start - 1)
+          buf_b += @str[start,@pos - start - 1]
           begin
             index1 = @pos
             @pos+=1
@@ -232,7 +232,7 @@ module Format
           when 117
             uc = nil
             begin
-              x = "0x" + _hx_str(HxOverrides.substr(@str,@pos,4))
+              x = "0x" + _hx_str(@str[@pos,4])
               uc = x.to_i
             end
             @pos += 4
@@ -245,7 +245,7 @@ module Format
           raise hx_raise("Unclosed string")
         end
       end
-      buf_b += HxOverrides.substr(@str,start,@pos - start - 1)
+      buf_b += @str[start,@pos - start - 1]
       return buf_b
     end
     
@@ -255,10 +255,10 @@ module Format
     end
     
     def invalid_number(start)
-      raise hx_raise("Invalid number at position " + _hx_str(start) + ": " + _hx_str(HxOverrides.substr(@str,start,@pos - start)))
+      raise hx_raise("Invalid number at position " + _hx_str(start) + ": " + _hx_str(@str[start,@pos - start]))
     end
     
-  haxe_me
+  haxe_me ["haxe", "format", "JsonParser"]
   end
 
 end

data/lib/lib/haxe/format/json_printer.rb

@@ -233,7 +233,7 @@ module Format
       return printer.buf.b
     end
     
-  haxe_me
+  haxe_me ["haxe", "format", "JsonPrinter"]
   end
 
 end

data/lib/lib/haxe/imap.rb

@@ -4,7 +4,7 @@
 module Haxe
   class IMap 
     def get(k) puts "Abstract IMap.get called" end
-  haxe_me
+  haxe_me ["haxe", "IMap"]
   end
 
 end

data/lib/lib/haxe/io/bytes.rb

@@ -27,7 +27,7 @@ module Io
       return ::Haxe::Io::Bytes.new(s.bytesize,s)
     end
     
-  haxe_me
+  haxe_me ["haxe", "io", "Bytes"]
   end
 
 end

data/lib/lib/haxe/io/eof.rb

@@ -11,7 +11,7 @@ module Io
       return "Eof"
     end
     
-  haxe_me
+  haxe_me ["haxe", "io", "Eof"]
   end
 
 end

data/lib/lib/haxe/io/error.rb

@@ -15,7 +15,7 @@ module Io
     def Error.outside_bounds() Error.new("OutsideBounds",2) end
     def Error.overflow() Error.new("Overflow",1) end
     CONSTRUCTS__ = ["Blocked","Overflow","OutsideBounds","Custom"]
-    def ==(a) a.tag === @tag && a.index === @index && a.params == @params end
+    def ==(a) (!a.nil?) && (a.respond_to? 'ISENUM__') && a.tag === @tag && a.index === @index && a.params == @params end
   end
 
 end

data/lib/lib/haxe/io/output.rb

@@ -34,7 +34,7 @@ module Io
       self.write_full_bytes(b,0,b.length)
     end
     
-  haxe_me
+  haxe_me ["haxe", "io", "Output"]
   end
 
 end

data/lib/lib/hx_overrides.rb

@@ -14,18 +14,6 @@
       return _hx_str(date.get_full_year) + "-" + _hx_str((((m < 10) ? "0" + _hx_str(m) : "" + _hx_str(m)))) + "-" + _hx_str((((d < 10) ? "0" + _hx_str(d) : "" + _hx_str(d)))) + " " + _hx_str((((h < 10) ? "0" + _hx_str(h) : "" + _hx_str(h)))) + ":" + _hx_str((((mi < 10) ? "0" + _hx_str(mi) : "" + _hx_str(mi)))) + ":" + _hx_str((((s < 10) ? "0" + _hx_str(s) : "" + _hx_str(s))))
     end
     
-    def HxOverrides.substr(s,pos,len = nil)
-      return "" if pos != nil && pos != 0 && len != nil && len < 0
-      len = s.length if len == nil
-      if pos < 0 
-        pos = s.length + pos
-        pos = 0 if pos < 0
-      elsif len < 0 
-        len = s.length + len - pos
-      end
-      return s[pos,len]
-    end
-    
-  haxe_me
+  haxe_me ["HxOverrides"]
   end
 

data/lib/lib/hx_sys.rb

@@ -22,7 +22,7 @@
           when 32,34
             ok = false
           when 0,13,10
-            arg = HxOverrides.substr(arg,0,i)
+            arg = arg[0,i]
           end if _g2 != nil
         end
       end
@@ -61,6 +61,6 @@
       return ::Sys::Io::FileOutput.new(STDERR)
     end
     
-  haxe_me
+  haxe_me ["Sys"]
   end
 

data/lib/lib/lambda.rb

@@ -32,6 +32,6 @@
       return false
     end
     
-  haxe_me
+  haxe_me ["Lambda"]
   end
 

data/lib/lib/list.rb

@@ -31,6 +31,6 @@
       return ::X_List::ListIterator.new(@h)
     end
     
-  haxe_me
+  haxe_me ["List"]
   end
 

data/lib/lib/rb/boot.rb

@@ -14,7 +14,7 @@ module Rb
       end
     end
     
-  haxe_me
+  haxe_me ["rb", "Boot"]
   end
 
 end

data/lib/lib/rb/ruby_iterator.rb

@@ -44,7 +44,7 @@ module Rb
       return @ref.next
     end
     
-  haxe_me
+  haxe_me ["rb", "RubyIterator"]
   end
 
 end

data/lib/lib/reflect.rb

@@ -26,6 +26,6 @@
       return f.respond_to?("call")
     end
     
-  haxe_me
+  haxe_me ["Reflect"]
   end
 

data/lib/lib/string_buf.rb

@@ -14,6 +14,6 @@
     public
     
     attr_accessor :length
-  haxe_me
+  haxe_me ["StringBuf"]
   end
 

data/lib/lib/sys/io/file_handle.rb

@@ -11,7 +11,7 @@ module Io
     def initialize(t,index,p = nil ) @tag = t; @index = index; @params = p; end
     
     CONSTRUCTS__ = []
-    def ==(a) a.tag === @tag && a.index === @index && a.params == @params end
+    def ==(a) (!a.nil?) && (a.respond_to? 'ISENUM__') && a.tag === @tag && a.index === @index && a.params == @params end
   end
 
 end

data/lib/lib/sys/io/file_output.rb

@@ -29,7 +29,7 @@ module Io
       return r
     end
     
-  haxe_me
+  haxe_me ["sys", "io", "FileOutput"]
   end
 
 end

data/lib/lib/sys/io/hx_file.rb

@@ -13,7 +13,7 @@ module Io
       IO.write(path,content)
     end
     
-  haxe_me
+  haxe_me ["sys", "io", "File"]
   end
 
 end

data/lib/lib/type.rb

@@ -4,30 +4,34 @@
   class Type 
     
     def Type._typeof(v)
-      _g = v.class.to_s
-      case(_g)
-      when "TrueClass"
-        return ValueType.tbool
-      when "FalseClass"
-        return ValueType.tbool
-      when "String"
-        return ValueType.tclass(String)
-      when "Fixnum"
-        return ValueType.tint
-      when "Float"
-        return ValueType.tfloat
-      when "Proc"
-        return ValueType.tfunction
-      when "NilClass"
-        return ValueType.tnull
-      when "Hash"
-        return ValueType.tobject
-      else
-        return ValueType.tclass(v.class) if v.respond_to?("class")
-        return ValueType.tunknown
+      return ValueType.tnull if v == nil
+      begin
+        _g = v.class.to_s
+        case(_g)
+        when "TrueClass"
+          return ValueType.tbool
+        when "FalseClass"
+          return ValueType.tbool
+        when "String"
+          return ValueType.tclass(String)
+        when "Fixnum"
+          return ValueType.tint
+        when "Float"
+          return ValueType.tfloat
+        when "Proc"
+          return ValueType.tfunction
+        when "Array"
+          return ValueType.tclass(Array)
+        when "Hash"
+          return ValueType.tobject
+        else
+          return ValueType.tenum(v.class) if v.respond_to?("ISENUM__")
+          return ValueType.tclass(v.class) if v.respond_to?("class")
+          return ValueType.tunknown
+        end
       end
     end
     
-  haxe_me
+  haxe_me ["Type"]
   end
 

data/lib/lib/value_type.rb

@@ -18,6 +18,6 @@
     def ValueType.tobject() ValueType.new("TObject",4) end
     def ValueType.tunknown() ValueType.new("TUnknown",8) end
     CONSTRUCTS__ = ["TNull","TInt","TFloat","TBool","TObject","TFunction","TClass","TEnum","TUnknown"]
-    def ==(a) a.tag === @tag && a.index === @index && a.params == @params end
+    def ==(a) (!a.nil?) && (a.respond_to? 'ISENUM__') && a.tag === @tag && a.index === @index && a.params == @params end
   end
 

data/lib/lib/x_list/list_iterator.rb

@@ -26,7 +26,7 @@ module X_List
       return @val
     end
     
-  haxe_me
+  haxe_me ["_List", "ListIterator"]
   end
 
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daff
 version: !ruby/object:Gem::Version
-  version: 1.2.4
-  prerelease: 
+  version: 1.2.6
 platform: ruby
 authors:
 - James Smith
@@ -10,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies: []
 description: Diff and patch tables
 email:
@@ -21,103 +20,102 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
+- bin/daff.rb
 - lib/daff.rb
-- lib/lib/type.rb
-- lib/lib/hx_sys.rb
-- lib/lib/lambda.rb
-- lib/lib/reflect.rb
-- lib/lib/rb/boot.rb
-- lib/lib/rb/ruby_iterator.rb
-- lib/lib/value_type.rb
-- lib/lib/hx_overrides.rb
-- lib/lib/coopy/simple_table.rb
+- lib/lib/coopy/alignment.rb
 - lib/lib/coopy/cell_builder.rb
+- lib/lib/coopy/cell_info.rb
+- lib/lib/coopy/compare_flags.rb
 - lib/lib/coopy/compare_table.rb
-- lib/lib/coopy/table_io.rb
-- lib/lib/coopy/sql_compare.rb
+- lib/lib/coopy/coopy.rb
+- lib/lib/coopy/cross_match.rb
+- lib/lib/coopy/csv.rb
+- lib/lib/coopy/diff_render.rb
 - lib/lib/coopy/flat_cell_builder.rb
-- lib/lib/coopy/nested_cell_builder.rb
+- lib/lib/coopy/highlight_patch.rb
+- lib/lib/coopy/highlight_patch_unit.rb
+- lib/lib/coopy/index.rb
 - lib/lib/coopy/index_item.rb
 - lib/lib/coopy/index_pair.rb
+- lib/lib/coopy/merger.rb
+- lib/lib/coopy/mover.rb
+- lib/lib/coopy/ndjson.rb
+- lib/lib/coopy/nested_cell_builder.rb
+- lib/lib/coopy/ordering.rb
+- lib/lib/coopy/row.rb
+- lib/lib/coopy/simple_table.rb
+- lib/lib/coopy/simple_view.rb
+- lib/lib/coopy/sparse_sheet.rb
 - lib/lib/coopy/sql_column.rb
-- lib/lib/coopy/diff_render.rb
-- lib/lib/coopy/cross_match.rb
-- lib/lib/coopy/table_diff.rb
-- lib/lib/coopy/alignment.rb
-- lib/lib/coopy/terminal_diff_render.rb
+- lib/lib/coopy/sql_compare.rb
+- lib/lib/coopy/sql_database.rb
+- lib/lib/coopy/sql_helper.rb
 - lib/lib/coopy/sql_table.rb
-- lib/lib/coopy/table_modifier.rb
-- lib/lib/coopy/highlight_patch.rb
-- lib/lib/coopy/table_text.rb
-- lib/lib/coopy/simple_view.rb
-- lib/lib/coopy/row.rb
-- lib/lib/coopy/index.rb
-- lib/lib/coopy/coopy.rb
-- lib/lib/coopy/cell_info.rb
-- lib/lib/coopy/view.rb
 - lib/lib/coopy/sql_table_name.rb
-- lib/lib/coopy/highlight_patch_unit.rb
-- lib/lib/coopy/compare_flags.rb
-- lib/lib/coopy/unit.rb
-- lib/lib/coopy/mover.rb
-- lib/lib/coopy/table_comparison_state.rb
-- lib/lib/coopy/sql_database.rb
-- lib/lib/coopy/csv.rb
 - lib/lib/coopy/sqlite_helper.rb
-- lib/lib/coopy/ordering.rb
-- lib/lib/coopy/merger.rb
-- lib/lib/coopy/sql_helper.rb
-- lib/lib/coopy/sparse_sheet.rb
-- lib/lib/coopy/ndjson.rb
 - lib/lib/coopy/table.rb
+- lib/lib/coopy/table_comparison_state.rb
+- lib/lib/coopy/table_diff.rb
+- lib/lib/coopy/table_io.rb
+- lib/lib/coopy/table_modifier.rb
+- lib/lib/coopy/table_text.rb
+- lib/lib/coopy/terminal_diff_render.rb
+- lib/lib/coopy/unit.rb
+- lib/lib/coopy/view.rb
 - lib/lib/coopy/viterbi.rb
-- lib/lib/math.rb
-- lib/lib/list.rb
-- lib/lib/sys/io/hx_file.rb
-- lib/lib/sys/io/file_output.rb
-- lib/lib/sys/io/file_handle.rb
-- lib/lib/x_list/list_iterator.rb
-- lib/lib/string_buf.rb
+- lib/lib/haxe/ds/int_map.rb
+- lib/lib/haxe/ds/string_map.rb
+- lib/lib/haxe/format/json_parser.rb
+- lib/lib/haxe/format/json_printer.rb
 - lib/lib/haxe/imap.rb
+- lib/lib/haxe/io/bytes.rb
 - lib/lib/haxe/io/bytes_buffer.rb
-- lib/lib/haxe/io/input.rb
-- lib/lib/haxe/io/eof.rb
 - lib/lib/haxe/io/bytes_input.rb
 - lib/lib/haxe/io/bytes_output.rb
-- lib/lib/haxe/io/bytes.rb
+- lib/lib/haxe/io/eof.rb
 - lib/lib/haxe/io/error.rb
+- lib/lib/haxe/io/input.rb
 - lib/lib/haxe/io/output.rb
-- lib/lib/haxe/ds/int_map.rb
-- lib/lib/haxe/ds/string_map.rb
-- lib/lib/haxe/format/json_parser.rb
-- lib/lib/haxe/format/json_printer.rb
-- bin/daff.rb
-- README.md
+- lib/lib/hx_overrides.rb
+- lib/lib/hx_sys.rb
+- lib/lib/lambda.rb
+- lib/lib/list.rb
+- lib/lib/math.rb
+- lib/lib/rb/boot.rb
+- lib/lib/rb/ruby_iterator.rb
+- lib/lib/reflect.rb
+- lib/lib/string_buf.rb
+- lib/lib/sys/io/file_handle.rb
+- lib/lib/sys/io/file_output.rb
+- lib/lib/sys/io/hx_file.rb
+- lib/lib/type.rb
+- lib/lib/value_type.rb
+- lib/lib/x_list/list_iterator.rb
 homepage: https://github.com/paulfitz/daff
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: ! '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=master)](https://travis-ci.org/paulfitz/daff)
+specification_version: 4
+summary: '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=master)](https://travis-ci.org/paulfitz/daff)
   [![NPM version](https://badge.fury.io/js/daff.svg)](http://badge.fury.io/js/daff)
   [![Gem Version](https://badge.fury.io/rb/daff.svg)](http://badge.fury.io/rb/daff)
   [![PyPI version](https://badge.fury.io/py/daff.svg)](http://badge.fury.io/py/daff)
@@ -129,8 +127,9 @@ summary: ! '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=mast
   of the "same" table.  For a live demo, see: > http://paulfitz.github.com/daff/  Install
   the library for your favorite language: ````sh npm install daff -g  # node/javascript
   pip install daff     # python gem install daff     # ruby composer require paulfitz/daff-php  #
-  php ````  Other translations are available here: > https://github.com/paulfitz/daff/releases  Or
-  use the library to view csv diffs on github via a chrome extension: > https://github.com/theodi/csvhub  The
+  php install.packages(''daff'') # R wrapper by Edwin de Jonge ````  Other translations
+  are available here: > https://github.com/paulfitz/daff/releases  Or use the library
+  to view csv diffs on github via a chrome extension: > https://github.com/theodi/csvhub  The
   diff format used by `daff` is specified here: > http://dataprotocols.org/tabular-diff-format/  This
   library is a stripped down version of the coopy toolbox (see http://share.find.coop).  To
   compare tables from different origins,  or with automatically generated IDs, or
@@ -194,8 +193,16 @@ summary: ! '[![Build Status](https://travis-ci.org/paulfitz/daff.svg?branch=mast
   java make cs make cpp ```  For each language, the `daff` library expects to be handed
   an interface to tables you create, rather than creating them itself.  This is to
   avoid inefficient copies from one format to another.  You''ll find a `SimpleTable`
-  class you can use if you find this awkward.  API documentation -----------------  *
-  You can browse the `daff` classes at http://paulfitz.github.io/daff-doc/  Reading
+  class you can use if you find this awkward.  Other possibilities:  * There''s a
+  daff wrapper for R written by [Edwin de Jonge](https://github.com/edwindj), see
+  https://github.com/edwindj/daff and http://cran.r-project.org/web/packages/daff
+  * There''s a hand-written ruby port by [James Smith](https://github.com/Floppy),
+  see https://github.com/theodi/coopy-ruby  API documentation -----------------  *
+  You can browse the `daff` classes at http://paulfitz.github.io/daff-doc/  Sponsors
+  --------  The [Data Commons Co-op](http://datacommons.coop),  "perhaps the geekiest
+  of all cooperative organizations on the planet," has given great moral support during
+  the initial development of `daff`. There''s currently no financial support for `daff`.
+  You could change that! [![tips](https://img.shields.io/gratipay/paulfitz.svg)](https://gratipay.com/paulfitz/)  Reading
   material ----------------  * http://dataprotocols.org/tabular-diff-format/ : a specification
   of the diff format we use. * http://theodi.org/blog/csvhub-github-diffs-for-csv-files
   : using this library with github. * http://theodi.org/blog/adapting-git-simple-data