finitio 0.7.0.pre.rc2 → 0.7.0.pre.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b4c180986cc7160e2b3f76c23e37d23237cbaaf
-  data.tar.gz: b26dd47b86792ad28524e5e8f8df0ab5d56d0071
+  metadata.gz: bceafae3cf07b42eeafcd42847e29426ee8b9694
+  data.tar.gz: 947dd8fccf1bc29439a8948e18850f7e53f502b9
 SHA512:
-  metadata.gz: b19ef54ca53c5e463aa6b4557d0ecd6ea537e6cdaa9349f960356b1b31525908be7d1a196cc2be9ab4985f70eea4133d2c54c03d3ee57b14cf48175efe7aaf02
-  data.tar.gz: 14d1db5a7285d522ce1ab093a5dc712f52b0c846b84e582e86fedbdfbd1320e6eafa7741b907f553aabdb29094bc7ebecf0b1a54a6358cc2ac9b761ae2289238
+  metadata.gz: 541944fb0f9e729886145707c46f88c70677a9ea63272021e9fa67d083b867a2ec35c24e1035763c04c21ab8006cccd111717c144c40ed297c06e0b8b6b7ec4a
+  data.tar.gz: 297ce451632080bd09e888c2e16fe1991722485375348ce08b06225c2a15b3f34220a805e05f22fcb623e37aba26e982629c89709b1c643ee8af13f8f63a733e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    finitio (0.7.0.pre.rc2)
+    finitio (0.7.0.pre.rc3)
       citrus (>= 2.4, < 4.0)
 
 GEM

data/lib/finitio/support.rb

@@ -1,3 +1,4 @@
+require_relative 'support/proc_with_code'
 require_relative 'support/metadata'
 require_relative 'support/attribute'
 require_relative 'support/constraint'

data/lib/finitio/support/contract.rb

@@ -29,5 +29,20 @@ module Finitio
       @undresser = clazz.instance_method(:"to_#{name}")
     end
 
+    def hash
+      [infotype, dresser, undresser].hash
+    end
+
+    def ==(other)
+      super || (
+        other.is_a?(Contract) &&
+        name == other.name &&
+        infotype == other.infotype &&
+        dresser == other.dresser && 
+        undresser == other.undresser
+      )
+    end
+    alias :eql? :==
+
   end # class Contract
 end # module Finitio

data/lib/finitio/support/proc_with_code.rb

@@ -0,0 +1,34 @@
+module Finitio
+  class ProcWithCode < Proc
+
+    def self.new(*args, &bl)
+      return Proc.new(*args, &bl) unless args.size == 2 && bl.nil?
+
+      p = Kernel.eval("->(#{args.first}){ #{args.last} }")
+      p.instance_variable_set(:@_finitio_src, args)
+
+      def p.finitio_src
+        @_finitio_src
+      end
+
+      def p.hash
+        @_finitio_src.hash
+      end
+
+      def p.==(other)
+        super || (
+          other.is_a?(Proc) &&
+          other.respond_to?(:finitio_src) &&
+          other.finitio_src == self.finitio_src
+        )
+      end
+
+      def p.eql?(other)
+        self.==(other)
+      end
+
+      p
+    end
+
+  end # module ProcWithCode
+end # module Finitio

data/lib/finitio/syntax/type/expression.rb

@@ -4,8 +4,7 @@ module Finitio
       include Node
 
       def compile(var_name)
-        expr = "->(#{var_name}){ #{to_str} }"
-        ::Kernel.eval(expr)
+        ProcWithCode.new(var_name, to_str)
       end
 
     end # module Expression

data/lib/finitio/type/ad_type.rb

@@ -131,5 +131,18 @@ module Finitio
       handler.failed!(self, value, error)
     end
 
+    def hash
+      [ ruby_type, contracts ].hash
+    end
+
+    def ==(other)
+      super || (
+        other.is_a?(AdType) &&
+        ruby_type == other.ruby_type &&
+        contracts == other.contracts
+      )
+    end
+    alias :eql? :==
+
   end # class AdType
 end # module Finitio

data/lib/finitio/version.rb

@@ -3,7 +3,7 @@ module Finitio
 
     MAJOR = 0
     MINOR = 7
-    TINY  = "0-rc2"
+    TINY  = "0-rc3"
 
     def self.to_s
       [ MAJOR, MINOR, TINY ].join('.')

data/spec/finitio/test_system.rb

@@ -30,8 +30,11 @@ describe Finitio, "system" do
   end
 
   context "feedback about duplicate types" do
+    before {
+      Finitio.stdlib_path(Path.dir.parent)
+    }
     subject{
-      Finitio.system(Path.dir/"with-duplicates.fio")
+      Finitio.system(Path.dir/"with-duplicates.fio").check_and_warn
     }
 
     it{ should be_a(Finitio::System) }

data/spec/finitio/with-duplicates.fio

@@ -1,3 +1,5 @@
 @import finitio/data
+@import finitio/system
 
 NilClass = .NilClass
+Posint = .Integer( i | i >= 0 )

data/spec/support/test_proc_with_code.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+module Finitio
+  describe ProcWithCode do
+
+    it 'acts like a proc' do
+      p = ProcWithCode.new{|t| t>0 }
+      expect(p).to be_a(Proc)
+      expect(p.call(2)).to eq(true)
+      expect(p.call(-2)).to eq(false)
+    end
+
+    it 'lets compile from source code' do
+      p = ProcWithCode.new("t", "t>0")
+      expect(p).to be_a(Proc)
+      expect(p.call(2)).to eq(true)
+      expect(p.call(-2)).to eq(false)
+    end
+
+    it 'yields equal procs for same source code' do
+      p1 = ProcWithCode.new("t", "t>0")
+      p2 = ProcWithCode.new("t", "t>0")
+      expect(p1).to eql(p2)
+      expect(p1.hash).to eql(p2.hash)
+    end
+
+  end
+end

data/spec/syntax/nodes/test_ad_type.rb

@@ -43,6 +43,7 @@ module Finitio
           ]
         ])
       end
+
     end
 
     context 'Two contracts' do
@@ -160,6 +161,11 @@ module Finitio
           ]
         ])
       end
+
+      it 'is equal to itself' do
+        j = Syntax.parse(input, root: "ad_type").compile(type_factory)
+        expect(j).to eql(compiled)
+      end
     end
 
   end

data/spec/syntax/nodes/test_contract.rb

@@ -96,6 +96,11 @@ module Finitio
           ]
         ])
       end
+
+      it 'is equal to itself by code' do
+        j = Syntax.parse(input, root: "contract").compile(type_factory, nil)
+        expect(j).to eql(compiled)
+      end
     end
 
     context 'A contract with external dressers' do

data/spec/syntax/nodes/test_expression.rb

@@ -21,6 +21,11 @@ module Finitio
         expect(compiled.call(12)).to eq(true)
         expect(compiled.call(9)).to eq(false)
       end
+
+      it 'is equal to itself' do
+        j = Syntax.parse(input, root: "expression").compile("a")
+        expect(j).to eq(compiled)
+      end
     end
 
     context '(a >= 10)' do

data/spec/syntax/nodes/test_sub_type.rb

@@ -30,6 +30,11 @@ module Finitio
           [:constraint, "default", [:fn, [:parameters, "i"], [:source, "i >= 0"]]]
         ])
       end
+
+      it 'is equal to the same type' do
+        j = Syntax.parse(input, root: "sub_type").compile(type_factory)
+        expect(j).to eq(compiled)
+      end
     end
 
     context '.Integer( i | positive: i >= 0 )' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finitio
 version: !ruby/object:Gem::Version
-  version: 0.7.0.pre.rc2
+  version: 0.7.0.pre.rc3
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -59,6 +59,7 @@ files:
 - lib/finitio/support/dress_helper.rb
 - lib/finitio/support/heading.rb
 - lib/finitio/support/metadata.rb
+- lib/finitio/support/proc_with_code.rb
 - lib/finitio/support/type_factory.rb
 - lib/finitio/syntax.rb
 - lib/finitio/syntax/definitions.rb
@@ -163,6 +164,7 @@ files:
 - spec/heading/test_size.rb
 - spec/heading/test_to_name.rb
 - spec/spec_helper.rb
+- spec/support/test_proc_with_code.rb
 - spec/syntax/expr/test_free_variables.rb
 - spec/syntax/expr/test_to_proc_source.rb
 - spec/syntax/nodes/imported.fio
@@ -446,6 +448,7 @@ test_files:
 - spec/type/multi_tuple_type/test_include.rb
 - spec/type/multi_tuple_type/test_default_name.rb
 - spec/type/multi_tuple_type/test_dress.rb
+- spec/support/test_proc_with_code.rb
 - spec/syntax/nodes/test_tuple_type.rb
 - spec/syntax/nodes/test_set_type.rb
 - spec/syntax/nodes/test_union_type.rb