daff 1.2.6 → 1.3.1

data/lib/lib/coopy/table_io.rb

@@ -8,16 +8,16 @@ module Coopy
     end
     
     def get_content(name)
-      return ::Sys::Io::HxFile.get_content(name)
+      ::Sys::Io::HxFile.get_content(name)
     end
     
     def save_content(name,txt)
       ::Sys::Io::HxFile.save_content(name,txt)
-      return true
+      true
     end
     
     def args 
-      return HxSys.args
+      HxSys.args
     end
     
     def write_stdout(txt)
@@ -38,15 +38,28 @@ module Coopy
     end
     
     def async 
-      return false
+      false
     end
     
     def exists(path)
-      return File.exist?(path)
+      File.exist?(path)
+    end
+    
+    def is_tty_known 
+      false
+    end
+    
+    def is_tty 
+      return true if HxSys.get_env("GIT_PAGER_IN_USE") == "true"
+      false
     end
     
     def open_sqlite_database(path)
-      return nil
+      nil
+    end
+    
+    def send_to_browser(html)
+      puts "do not know how to send to browser in this language"
     end
     
   haxe_me ["coopy", "TableIO"]

data/lib/lib/coopy/table_modifier.rb

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

data/lib/lib/coopy/table_stream.rb

@@ -0,0 +1,102 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class TableStream 
+    
+    def initialize(t)
+      @t = t
+      @at = -1
+      @h = t.get_height
+      @src = nil
+      if @h < 0 
+        meta = t.get_meta
+        raise hx_raise("Cannot get meta information for table") if meta == nil
+        @src = meta.get_row_stream
+        raise hx_raise("Cannot iterate table") if @src == nil
+      end
+    end
+    
+    protected
+    
+    attr_accessor :t
+    attr_accessor :at
+    attr_accessor :h
+    attr_accessor :src
+    attr_accessor :columns
+    attr_accessor :row
+    
+    public
+    
+    def fetch_columns 
+      return @columns if @columns != nil
+      if @src != nil 
+        @columns = @src.fetch_columns
+        return @columns
+      end
+      @columns = Array.new
+      begin
+        _g1 = 0
+        _g = @t.get_width
+        while(_g1 < _g) 
+          i = _g1
+          _g1+=1
+          @columns.push(@t.get_cell(i,0))
+        end
+      end
+      @columns
+    end
+    
+    def fetch_row 
+      return @src.fetch_row if @src != nil
+      return nil if @at >= @h
+      row = {}
+      begin
+        _g1 = 0
+        _g = @columns.length
+        while(_g1 < _g) 
+          i = _g1
+          _g1+=1
+          begin
+            v = @t.get_cell(i,@at)
+            begin
+              value = v
+              row[@columns[i]] = value
+            end
+            v
+          end
+        end
+      end
+      row
+    end
+    
+    def fetch 
+      if @at == -1 
+        @at+=1
+        self.fetch_columns if @src != nil
+        return true
+      end
+      if @src != nil 
+        @at = 1
+        @row = self.fetch_row
+        return @row != nil
+      end
+      @at+=1
+      @at < @h
+    end
+    
+    def get_cell(x)
+      return @columns[x] if @at == 0
+      return @row[@columns[x]] if @row != nil
+      @t.get_cell(x,@at)
+    end
+    
+    def width 
+      self.fetch_columns
+      @columns.length
+    end
+    
+  haxe_me ["coopy", "TableStream"]
+  end
+
+end

data/lib/lib/coopy/terminal_diff_render.rb

@@ -32,6 +32,7 @@ module Coopy
       @v = t.get_cell_view
       @codes = {}
       @codes["header"] = "\x1B[0;1m"
+      @codes["meta"] = "\x1B[0;1m"
       @codes["spec"] = "\x1B[35;1m"
       @codes["add"] = "\x1B[32;1m"
       @codes["conflict"] = "\x1B[33;1m"
@@ -74,7 +75,7 @@ module Coopy
       @v = nil
       @csv = nil
       @codes = nil
-      return txt
+      txt
     end
     
     protected
@@ -101,7 +102,7 @@ module Coopy
       else 
         val = cell.pretty_value
       end
-      return @csv.render_cell(@v,val)
+      @csv.render_cell(@v,val)
     end
     
     def pick_sizes(t)
@@ -161,7 +162,7 @@ module Coopy
         end
       end
       return nil if total > 130
-      return sizes
+      sizes
     end
     
   haxe_me ["coopy", "TerminalDiffRender"]

data/lib/lib/coopy/unit.rb

@@ -24,7 +24,7 @@ module Coopy
     
     def to_s 
       return _hx_str(::Coopy::Unit.describe(@p)) + "|" + _hx_str(::Coopy::Unit.describe(@l)) + ":" + _hx_str(::Coopy::Unit.describe(@r)) if @p >= -1
-      return _hx_str(::Coopy::Unit.describe(@l)) + ":" + _hx_str(::Coopy::Unit.describe(@r))
+      _hx_str(::Coopy::Unit.describe(@l)) + ":" + _hx_str(::Coopy::Unit.describe(@r))
     end
     
     def from_string(txt)
@@ -54,7 +54,27 @@ module Coopy
           end
         end
       end
-      return false
+      false
+    end
+    
+    # protected - in ruby this doesn't play well with static/inline methods
+    
+    def base26(num)
+      alpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+      return "-" if num < 0
+      out = ""
+      begin 
+        out = _hx_str(out) + _hx_str(alpha[num.remainder(26)])
+        num = (num / 26).floor - 1
+      end while(num >= 0)
+      out
+    end
+    
+    public
+    
+    def to_base26string 
+      return _hx_str(self.base26(@p)) + "|" + _hx_str(self.base26(@l)) + ":" + _hx_str(self.base26(@r)) if @p >= -1
+      _hx_str(self.base26(@l)) + ":" + _hx_str(self.base26(@r))
     end
     
     # protected - in ruby this doesn't play well with static/inline methods

data/lib/lib/coopy/viterbi.rb

@@ -153,22 +153,22 @@ module Coopy
         end
       end
       txt += " costs " + _hx_str(self.get_cost)
-      return txt
+      txt
     end
     
     def length 
       self.calculate_path if @index > 0
-      return @index
+      @index
     end
     
     def get(i)
       self.calculate_path
-      return @path.get(0,i)
+      @path.get(0,i)
     end
     
     def get_cost 
       self.calculate_path
-      return @best_cost
+      @best_cost
     end
     
   haxe_me ["coopy", "Viterbi"]

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

@@ -9,7 +9,7 @@ module Ds
     end
     
     def get(key)
-      return self[key]
+      self[key]
     end
     
   haxe_me ["haxe", "ds", "IntMap"]

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

@@ -9,7 +9,7 @@ module Ds
     end
     
     def get(key)
-      return self[key]
+      self[key]
     end
     
   haxe_me ["haxe", "ds", "StringMap"]

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

@@ -246,7 +246,7 @@ module Format
         end
       end
       buf_b += @str[start,@pos - start - 1]
-      return buf_b
+      buf_b
     end
     
     def invalid_char 

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

@@ -230,7 +230,7 @@ module Format
     def JsonPrinter._print(o,replacer = nil,space = nil)
       printer = ::Haxe::Format::JsonPrinter.new(replacer,space)
       printer.write("",o)
-      return printer.buf.b
+      printer.buf.b
     end
     
   haxe_me ["haxe", "format", "JsonPrinter"]

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

@@ -20,11 +20,11 @@ module Io
     
     def get_string(pos,len)
       raise hx_raise(::Haxe::Io::Error.outside_bounds) if pos < 0 || len < 0 || pos + len > @length
-      return @b.byteslice(pos,len)
+      @b.byteslice(pos,len)
     end
     
     def Bytes.of_string(s)
-      return ::Haxe::Io::Bytes.new(s.bytesize,s)
+      ::Haxe::Io::Bytes.new(s.bytesize,s)
     end
     
   haxe_me ["haxe", "io", "Bytes"]

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

@@ -8,7 +8,7 @@ module Io
     protected
     
     def to_s 
-      return "Eof"
+      "Eof"
     end
     
   haxe_me ["haxe", "io", "Eof"]

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

@@ -18,7 +18,7 @@ module Io
         pos+=1
         k-=1
       end
-      return len
+      len
     end
     
     def write_full_bytes(s,pos,len)

data/lib/lib/hx_overrides.rb

@@ -11,7 +11,7 @@
       h = date.get_hours
       mi = date.get_minutes
       s = date.get_seconds
-      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))))
+      _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
     
   haxe_me ["HxOverrides"]

data/lib/lib/hx_sys.rb

@@ -4,7 +4,11 @@
   class HxSys 
     
     def HxSys.args 
-      return ARGV
+      ARGV
+    end
+    
+    def HxSys.get_env(s)
+      getenv(s)
     end
     
     # protected - in ruby this doesn't play well with static/inline methods
@@ -27,7 +31,7 @@
         end
       end
       return arg if ok
-      return "\"" + _hx_str(arg.split("\"").join("\\\"")) + "\""
+      "\"" + _hx_str(arg.split("\"").join("\\\"")) + "\""
     end
     
     public
@@ -50,15 +54,15 @@
       else 
         result = 1
       end
-      return result
+      result
     end
     
     def HxSys.stdout 
-      return ::Sys::Io::FileOutput.new(STDOUT)
+      ::Sys::Io::FileOutput.new(STDOUT)
     end
     
     def HxSys.stderr 
-      return ::Sys::Io::FileOutput.new(STDERR)
+      ::Sys::Io::FileOutput.new(STDERR)
     end
     
   haxe_me ["Sys"]

data/lib/lib/lambda.rb

@@ -10,7 +10,7 @@
         i = _it._next
         a.push(i)
       end
-      return a
+      a
     end
     
     def Lambda.map(it,f)
@@ -20,7 +20,7 @@
         x = _it._next
         l.add((f).call(x))
       end
-      return l
+      l
     end
     
     def Lambda.has(it,elt)
@@ -29,7 +29,7 @@
         x = _it._next
         return true if x == elt
       end
-      return false
+      false
     end
     
   haxe_me ["Lambda"]

data/lib/lib/list.rb

@@ -28,7 +28,7 @@
     end
     
     def iterator 
-      return ::X_List::ListIterator.new(@h)
+      ::X_List::ListIterator.new(@h)
     end
     
   haxe_me ["List"]

data/lib/lib/rb/ruby_iterator.rb

@@ -34,14 +34,14 @@ module Rb
     def has_next 
       return @ref[:has_next].call if @at == -1
       return @ref[:has_next][:call].call if @at == -2
-      return @at < @len
+      @at < @len
     end
     
     def _next 
       return @ref[:_next].call if @at == -1
       return @ref[:_next][:call].call if @at == -2
       @at+=1
-      return @ref.next
+      @ref.next
     end
     
   haxe_me ["rb", "RubyIterator"]

data/lib/lib/reflect.rb

@@ -23,7 +23,7 @@
     end
     
     def Reflect.is_function(f)
-      return f.respond_to?("call")
+      f.respond_to?("call")
     end
     
   haxe_me ["Reflect"]