rdl 1.0.0 → 1.0.1.rc1

data/test/test_query.rb

@@ -0,0 +1,108 @@
+require 'minitest/autorun'
+require_relative '../lib/rdl.rb'
+
+class TestQuery < Minitest::Test
+  include RDL::Type
+
+  def setup
+    @p = Parser.new
+    @tfixnum = NominalType.new Fixnum
+    @tarray = NominalType.new Array
+    @qwild = WildQuery.new
+    @qwildopt = OptionalType.new @qwild
+    @qwildvararg = VarargType.new @qwild
+    @qwildx = AnnotatedArgType.new("x", @qwild)
+    @qdots = DotsQuery.new
+  end
+
+  def test_parse
+    q1 = @p.scan_str "#Q (.) -> ."
+    assert_equal (MethodType.new [@qwild], nil, @qwild), q1
+    q2 = @p.scan_str "#Q (., Fixnum) -> Fixnum"
+    assert_equal (MethodType.new [@qwild, @tfixnum], nil, @tfixnum), q2
+    q3 = @p.scan_str "#Q (Fixnum, ?.) -> Fixnum"
+    assert_equal (MethodType.new [@tfixnum, @qwildopt], nil, @tfixnum), q3
+    q4 = @p.scan_str "#Q (*.) -> Fixnum"
+    assert_equal (MethodType.new [@qwildvararg], nil, @tfixnum), q4
+    q5 = @p.scan_str "#Q (. or Fixnum) -> Fixnum"
+    assert_equal (MethodType.new [UnionType.new(@qwild, @tfixnum)], nil, @tfixnum), q5
+    q6 = @p.scan_str "#Q (. x, Fixnum) -> Fixnum"
+    assert_equal (MethodType.new [@qwildx, @tfixnum], nil, @tfixnum), q6
+    q7 = @p.scan_str "#Q (Array<.>) -> Fixnum"
+    assert_equal (MethodType.new [GenericType.new(@tarray, @qwild)], nil, @tfixnum), q7
+#    q8 = @p.scan_str "#Q (.<Fixnum>) -> Fixnum"
+#    assert_equal (MethodType.new [GenericType.new(@twild, @tfixnum)], nil, @tfixnum), q8
+    q9 = @p.scan_str "#Q ([Fixnum, .]) -> Fixnum"
+    assert_equal (MethodType.new [TupleType.new(@tfixnum, @qwild)], nil, @tfixnum), q9
+    q10 = @p.scan_str "#Q ([to_str: () -> .]) -> Fixnum"
+    assert_equal (MethodType.new [StructuralType.new(to_str: (MethodType.new [], nil, @qwild))], nil, @tfixnum), q10
+    q11 = @p.scan_str "#Q ({a: Fixnum, b: .}) -> Fixnum"
+    assert_equal (MethodType.new [FiniteHashType.new({a: @tfixnum, b: @qwild})], nil, @tfixnum), q11
+    q12 = @p.scan_str "#Q (Fixnum, x: .) -> Fixnum"
+    assert_equal (MethodType.new [@tfixnum, FiniteHashType.new(x: @qwild)], nil, @tfixnum), q12
+    q13 = @p.scan_str "#Q (Fixnum, ..., Fixnum) -> Fixnum"
+    assert_equal (MethodType.new [@tfixnum, @qdots, @tfixnum], nil, @tfixnum), q13
+    q14 = @p.scan_str "#Q (Fixnum, ...) -> Fixnum"
+    assert_equal (MethodType.new [@tfixnum, @qdots], nil, @tfixnum), q14
+    q15 = @p.scan_str "#Q (...) -> Fixnum"
+    assert_equal (MethodType.new [@qdots], nil, @tfixnum), q15
+  end
+
+  def test_match
+    t1 = @p.scan_str "(Fixnum, Fixnum) -> Fixnum"
+    assert (@p.scan_str "#Q (Fixnum, Fixnum) -> Fixnum").match(t1)
+    assert (@p.scan_str "#Q (., .) -> .").match(t1)
+    assert (@p.scan_str "#Q (..., Fixnum) -> Fixnum").match(t1)
+    assert (@p.scan_str "#Q (Fixnum, ...) -> Fixnum").match(t1)
+    assert (@p.scan_str "#Q (...) -> Fixnum").match(t1)
+    assert (not (@p.scan_str "#Q (Fixnum, String) -> Fixnum").match(t1))
+    assert (not (@p.scan_str "#Q (String, Fixnum) -> Fixnum").match(t1))
+    assert (not (@p.scan_str "#Q (Fixnum, String) -> String").match(t1))
+    assert (not (@p.scan_str "#Q (..., String) -> String").match(t1))
+    assert (not (@p.scan_str "#Q (String, ...) -> String").match(t1))
+    t2 = @p.scan_str "(String or Fixnum) -> Fixnum"
+    assert (@p.scan_str "#Q (String or Fixnum) -> Fixnum").match(t2)
+    assert (@p.scan_str "#Q (String or .) -> Fixnum").match(t2)
+    assert (@p.scan_str "#Q (. or Fixnum) -> Fixnum").match(t2)
+    assert (@p.scan_str "#Q (Fixnum or String) -> Fixnum").match(t2)
+    assert (@p.scan_str "#Q (Fixnum or .) -> Fixnum").match(t2)
+    assert (@p.scan_str "#Q (. or String) -> Fixnum").match(t2)
+    t3 = @p.scan_str "(Array<Fixnum>) -> Fixnum"
+    assert (@p.scan_str "#Q (Array<Fixnum>) -> Fixnum").match(t3)
+    assert (@p.scan_str "#Q (Array<.>) -> Fixnum").match(t3)
+    t4 = @p.scan_str "([Fixnum, String]) -> Fixnum"
+    assert (@p.scan_str "#Q ([Fixnum, String]) -> Fixnum").match(t4)
+    assert (@p.scan_str "#Q ([Fixnum, .]) -> Fixnum").match(t4)
+    assert (@p.scan_str "#Q ([., String]) -> Fixnum").match(t4)
+    t5 = @p.scan_str "([to_str: () -> Fixnum]) -> Fixnum"
+    assert (@p.scan_str "#Q ([to_str: () -> Fixnum]) -> Fixnum").match(t5)
+    assert (@p.scan_str "#Q ([to_str: () -> .]) -> Fixnum").match(t5)
+    t6 = @p.scan_str "(Fixnum, ?Fixnum) -> Fixnum"
+    assert (@p.scan_str "#Q (Fixnum, ?Fixnum) -> Fixnum").match(t6)
+    assert (@p.scan_str "#Q (Fixnum, ?.) -> Fixnum").match(t6)
+    assert (@p.scan_str "#Q (Fixnum, .) -> Fixnum").match(t6)
+    t7 = @p.scan_str "(*Fixnum) -> Fixnum"
+    assert (@p.scan_str "#Q (*Fixnum) -> Fixnum").match(t7)
+    assert (@p.scan_str "#Q (*.) -> Fixnum").match(t7)
+    assert (@p.scan_str "#Q (.) -> Fixnum").match(t7)
+    t8 = @p.scan_str "({a: Fixnum, b: String}) -> Fixnum"
+    assert (@p.scan_str "#Q ({a: Fixnum, b: String}) -> Fixnum").match(t8)
+    assert (@p.scan_str "#Q ({a: Fixnum, b: .}) -> Fixnum").match(t8)
+    assert (@p.scan_str "#Q ({a: ., b: String}) -> Fixnum").match(t8)
+    assert (@p.scan_str "#Q ({a: ., b: .}) -> Fixnum").match(t8)
+    assert (@p.scan_str "#Q ({b: String, a: Fixnum}) -> Fixnum").match(t8)
+    assert (@p.scan_str "#Q ({b: ., a: Fixnum}) -> Fixnum").match(t8)
+    assert (@p.scan_str "#Q ({b: String, a: .}) -> Fixnum").match(t8)
+    assert (@p.scan_str "#Q ({b: ., a: .}) -> Fixnum").match(t8)
+    assert (@p.scan_str "#Q (.) -> Fixnum").match(t8)
+    t9 = @p.scan_str "(Fixnum, x: String) -> Fixnum"
+    assert (@p.scan_str "#Q (Fixnum, x: String) -> Fixnum").match(t9)
+    assert (@p.scan_str "#Q (Fixnum, x: .) -> Fixnum").match(t9)
+    assert (@p.scan_str "#Q (Fixnum, .) -> Fixnum").match(t9)
+    t10 = @p.scan_str "(String x, Fixnum) -> Fixnum"
+    assert (@p.scan_str "#Q (String x, Fixnum) -> Fixnum").match(t10)
+    assert (@p.scan_str "#Q (. x, Fixnum) -> Fixnum").match(t10)
+    assert (@p.scan_str "#Q (String, Fixnum) -> Fixnum").match(t10)
+    assert (@p.scan_str "#Q (., Fixnum) -> Fixnum").match(t10)
+  end
+end

data/test/test_rdl.rb

@@ -31,7 +31,7 @@ class TestRDL < Minitest::Test
     ppos = RDL::Contract::FlatContract.new("Positive") { |x| x > 0 }
     assert_equal ["TestRDL", :m1, ppos], RDL::Wrap.process_pre_post_args(self.class, "C", TestRDL, :m1, ppos)
     assert_equal ["TestRDL", :m1, ppos], RDL::Wrap.process_pre_post_args(self.class, "C", TestRDL, "m1", ppos)
-    assert_equal ["[singleton]TestRDL", :m1, ppos], RDL::Wrap.process_pre_post_args(self.class, "C", TestRDL, "self.m1", ppos)
+    assert_equal ["#{RDL::Util::SINGLETON_MARKER}TestRDL", :m1, ppos], RDL::Wrap.process_pre_post_args(self.class, "C", TestRDL, "self.m1", ppos)
     assert_equal ["TestRDL", :m1, ppos], RDL::Wrap.process_pre_post_args(self.class, "C", :m1, ppos)
     assert_equal ["TestRDL", nil, ppos], RDL::Wrap.process_pre_post_args(self.class, "C", ppos)
     klass1, meth1, c1 = RDL::Wrap.process_pre_post_args(self.class, "C", TestRDL, :m1) { |x| x > 0 }
@@ -45,7 +45,7 @@ class TestRDL < Minitest::Test
     klass3, meth3, c3 = RDL::Wrap.process_pre_post_args(self.class, "C") { |x| x > 0 }
     assert_equal ["TestRDL", nil], [klass3, meth3]
     assert (c3.is_a? RDL::Contract::FlatContract)
-    
+
     assert_raises(ArgumentError) { RDL::Wrap.process_pre_post_args(self.class, "C") }
     assert_raises(ArgumentError) { RDL::Wrap.process_pre_post_args(self.class, "C", 42) }
     assert_raises(ArgumentError) { RDL::Wrap.process_pre_post_args(self.class, "C", 42) { |x| x > 0} }
@@ -297,5 +297,5 @@ RUBY
     }
     assert_equal 3, m23(3)
   end
-  
-end
+
+end

data/types/ruby-2.x/file.rb

@@ -77,6 +77,8 @@ class File
   type :truncate, '(Fixnum) -> 0'
 
   class Stat
+    rdl_nowrap
+
     type 'self.new', '(String file) -> File::Stat'
     type :<=>, '(File::Stat other) -> -1 or 0 or 1 or nil'
     type :atime, '() -> Time'
@@ -89,7 +91,7 @@ class File
     type :dev, '() -> Fixnum'
     type :dev_major, '() -> Fixnum'
     type :dev_minor, '() -> Fixnum'
-    type :directory?, '(String file) -> %bool'
+    type :directory?, '() -> %bool'
     type :executable?, '() -> %bool'
     type :executable_real?, '() -> %bool'
     type :file?, '() -> %bool'

data/types/ruby-2.x/fileutils.rb

@@ -1,6 +1,6 @@
 module FileUtils
   rdl_nowrap
 
-  type('self.cp_r', '(String or Pathname, String or Pathname, ?Hash<:preserve or :noop or :verbose or :dereference_root or :remove_destination, %bool>) -> Array<String>')
-  type('self.mkdir_p', '(String or Pathname, ?Hash<:mode or :noop or :verbose, %bool>) -> Array<String>')
+  type 'self.cp_r', '(String or Pathname, String or Pathname, ?Hash<:preserve or :noop or :verbose or :dereference_root or :remove_destination, %bool>) -> Array<String>'
+  type 'self.mkdir_p', '(String or Pathname, ?Hash<:mode or :noop or :verbose, %bool>) -> Array<String>'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdl
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1.rc1
 platform: ruby
 authors:
 - Jeffrey S. Foster
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -41,7 +41,8 @@ description: |
   when the method is called and when it returns, respectively.
 email:
 - rdl-users@googlegroups.com
-executables: []
+executables:
+- rdl_query
 extensions: []
 extra_rdoc_files: []
 files:
@@ -50,6 +51,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/rdl_query
 - gemfiles/Gemfile.travis
 - lib/rails_types.rb
 - lib/rdl.rb
@@ -59,8 +61,10 @@ files:
 - lib/rdl/contracts/flat.rb
 - lib/rdl/contracts/or.rb
 - lib/rdl/contracts/proc.rb
+- lib/rdl/query.rb
 - lib/rdl/switch.rb
 - lib/rdl/types/annotated_arg.rb
+- lib/rdl/types/dots_query.rb
 - lib/rdl/types/finitehash.rb
 - lib/rdl/types/generic.rb
 - lib/rdl/types/intersection.rb
@@ -78,9 +82,11 @@ files:
 - lib/rdl/types/tuple.rb
 - lib/rdl/types/type.rb
 - lib/rdl/types/type_inferencer.rb
+- lib/rdl/types/type_query.rb
 - lib/rdl/types/union.rb
 - lib/rdl/types/var.rb
 - lib/rdl/types/vararg.rb
+- lib/rdl/types/wild_query.rb
 - lib/rdl/util.rb
 - lib/rdl/wrap.rb
 - lib/rdl_types.rb
@@ -96,6 +102,7 @@ files:
 - test/test_lib_types.rb
 - test/test_member.rb
 - test/test_parser.rb
+- test/test_query.rb
 - test/test_rdl.rb
 - test/test_rdl_type.rb
 - test/test_type_contract.rb
@@ -166,12 +173,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby type and contract system