daff 1.1.11 → 1.1.12

data/lib/daff.rb

@@ -12,7 +12,7 @@ require 'date'
 require_relative 'lib/hx_overrides'
 require_relative 'lib/lambda'
 require_relative 'lib/list'
-require_relative 'lib/imap'
+require_relative 'lib/_list/list_iterator'
 require_relative 'lib/reflect'
 require_relative 'lib/string_buf'
 require_relative 'lib/sys'
@@ -56,13 +56,18 @@ require_relative 'lib/coopy/unit'
 require_relative 'lib/coopy/viewed_datum'
 require_relative 'lib/coopy/viterbi'
 require_relative 'lib/coopy/workspace'
+require_relative 'lib/haxe/imap'
 require_relative 'lib/haxe/log'
 require_relative 'lib/haxe/ds/int_map'
 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/_list/list_iterator.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module X_List
+  class ListIterator 
+    
+    def initialize(head)
+      @head = head
+      @val = nil
+    end
+    
+    # protected - in ruby this doesn't play well with static/inline methods
+    
+    attr_accessor :head
+    attr_accessor :val
+    
+    public
+    
+    def has_next 
+      return @head != nil
+    end
+    
+    def _next 
+      @val = @head[0]
+      @head = @head[1]
+      return @val
+    end
+    
+  end
+
+end

data/lib/lib/coopy/bag.rb

@@ -3,6 +3,7 @@
 
 module Coopy
   class Bag 
+    def get_size() puts "Abstract Bag.get_size called" end
     def getItem(x) puts "Abstract Bag.getItem called" end
     def getItemView() puts "Abstract Bag.getItemView called" end
   end

data/lib/lib/coopy/coopy.rb

@@ -550,7 +550,7 @@ module Coopy
     class << self
     attr_accessor :version
     end
-    @version = "1.1.11"
+    @version = "1.1.12"
     
     def Coopy.compare_tables(local,remote,flags = nil)
       ct = ::Coopy::CompareTable.new

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

@@ -200,7 +200,7 @@ module Format
     
     def parse_string 
       start = @pos
-      buf = StringBuf.new
+      buf_b = ""
       while(true) 
         c = nil
         begin
@@ -210,7 +210,7 @@ module Format
         end
         break if c == 34
         if c == 92 
-          buf.b += @str[start,@pos - start - 1]
+          buf_b += @str[start,@pos - start - 1]
           begin
             index1 = @pos
             @pos+=1
@@ -218,17 +218,17 @@ module Format
           end
           case(c)
           when 114
-            buf.b += [13].pack("U")
+            buf_b += [13].pack("U")
           when 110
-            buf.b += [10].pack("U")
+            buf_b += [10].pack("U")
           when 116
-            buf.b += [9].pack("U")
+            buf_b += [9].pack("U")
           when 98
-            buf.b += [8].pack("U")
+            buf_b += [8].pack("U")
           when 102
-            buf.b += [12].pack("U")
+            buf_b += [12].pack("U")
           when 47,92,34
-            buf.b += [c].pack("U")
+            buf_b += [c].pack("U")
           when 117
             uc = nil
             begin
@@ -236,7 +236,7 @@ module Format
               uc = x.to_i
             end
             @pos += 4
-            buf.b += [uc].pack("U")
+            buf_b += [uc].pack("U")
           else
             raise "Invalid escape sequence \\" + _hx_str([c].pack("U")) + " at position " + _hx_str((@pos - 1))
           end
@@ -245,8 +245,8 @@ module Format
           raise "Unclosed string"
         end
       end
-      buf.b += @str[start,@pos - start - 1]
-      return buf.b
+      buf_b += @str[start,@pos - start - 1]
+      return buf_b
     end
     
     def invalid_char 

data/lib/lib/{imap.rb → haxe/imap.rb}

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
+module Haxe
   class IMap 
   end
 
+end

data/lib/lib/haxe/io/bytes_buffer.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Haxe
+module Io
+  class BytesBuffer 
+    
+    # protected - in ruby this doesn't play well with static/inline methods
+    
+    attr_accessor :b
+    
+    public
+    
+    attr_accessor :length
+  end
+
+end
+end

data/lib/lib/haxe/io/bytes_input.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Haxe
+module Io
+  class BytesInput < ::Haxe::Io::Input 
+    attr_accessor :position
+    attr_accessor :length
+  end
+
+end
+end

data/lib/lib/haxe/io/bytes_output.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Haxe
+module Io
+  class BytesOutput < ::Haxe::Io::Output 
+    
+    # protected - in ruby this doesn't play well with static/inline methods
+    
+    attr_accessor :b
+    
+    public
+    
+    attr_accessor :length 
+    
+    def write_byte(c)
+      @b.b.concat(c)
+    end
+     
+    
+    def write_bytes(buf,pos,len)
+      begin
+        raise ::Haxe::Io::Error.outside_bounds if pos < 0 || len < 0 || pos + len > buf.length
+        @b.b += buf.b.byteslice(pos,len)
+      end
+      return len
+    end
+    
+  end
+
+end
+end

data/lib/lib/haxe/io/input.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Haxe
+module Io
+  class Input 
+  end
+
+end
+end

data/lib/lib/list.rb

@@ -7,7 +7,7 @@
       @length = 0
     end
     
-    protected
+    # protected - in ruby this doesn't play well with static/inline methods
     
     attr_accessor :h
     attr_accessor :q
@@ -28,14 +28,7 @@
     end
     
     def iterator 
-      return { h: @h, has_next: lambda {
-        return @h != nil
-      }, _next: lambda {
-        return nil if @h == nil
-        x = @h[0]
-        @h = @h[1]
-        return x
-      }}
+      return ::X_List::ListIterator.new(@h)
     end
     
   end

data/lib/lib/string_buf.rb

@@ -10,5 +10,9 @@
     # protected - in ruby this doesn't play well with static/inline methods
     
     attr_accessor :b
+    
+    public
+    
+    attr_accessor :length
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daff
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.12
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies: []
 description: Diff and patch tables
 email:
@@ -25,7 +25,6 @@ files:
 - lib/lib/type.rb
 - lib/lib/lambda.rb
 - lib/lib/reflect.rb
-- lib/lib/imap.rb
 - lib/lib/rb/boot.rb
 - lib/lib/rb/ruby_iterator.rb
 - lib/lib/value_type.rb
@@ -72,8 +71,14 @@ files:
 - lib/lib/sys/io/file_output.rb
 - lib/lib/sys/io/file.rb
 - lib/lib/sys/io/file_handle.rb
+- lib/lib/_list/list_iterator.rb
 - lib/lib/string_buf.rb
+- lib/lib/haxe/imap.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/error.rb
 - lib/lib/haxe/io/output.rb