rdl 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b6df831f327b7589e40ffedbd3bc38e4e314bf0
-  data.tar.gz: 7e540623bf270ff3c2dfa8152aa09b43f501cb92
+  metadata.gz: a08748b1afa6ca7710e6bf7c31e1162aa034de66
+  data.tar.gz: 104e8ede0573645fcd3c571000e402875ba94fa8
 SHA512:
-  metadata.gz: daf3b07c5d3cb7d4efcc67ffb3306da05eaa63e6ed9175547dc8c42975f4aac967180fea3fca4f195b10375bce8e2d12c4b1c916476cab2634c43b8b3313a03b
-  data.tar.gz: 6128fc47b326e48e36632df96268ec76f8fedcecfb0853c85221ac10fdfb77b9f71d59817fd8fda367d09a04a25ec38a5c0f49c6d1f594f1c0344bcfb31a5a85
+  metadata.gz: 341fc4e02d341179c93cea2a94c4f60c451a3ff4b5f1b1d7fb7ff01218e5309182e0d421cdbe6eaae1d4d04b00a7dca26f9650d0f8fff55157cf256881a50241
+  data.tar.gz: f38cd8208c3b22ef65ecc317521a28dc03a068b7425d875be9d8df91946a3f5b5caec55cf3940a9a871b76215251305effea50f2b8cf8a448d0f3e221bfde962

data/CHANGES.md

@@ -2,6 +2,15 @@
 
 ## [Unreleased]
 
+## [2.0.1] - 2016-11-11
+
+### Fixed
+- Improved support for modules (still incomplete)
+- Fix a bug with typing self.new
+- Fix bug with annotated return types
+- Fix bug with rdl_query
+- Fix bug with running under Rails where type files don't exist (Joel Holdbrooks)
+
 ## [2.0.0] - 2016-08-24
 ### Added
 - Static type checking!

data/README.md

@@ -884,9 +884,7 @@ In Object-Oriented Program Languages and Systems (OOPS) Track at ACM Symposium o
 
 Copyright (c) 2014-2016, University of Maryland, College Park. All rights reserved.
 
-# Contributors
-
-## Authors
+# Authors
 
 * [Jeffrey S. Foster](http://www.cs.umd.edu/~jfoster/)
 * [Brianna M. Ren](https://www.cs.umd.edu/~bren/)
@@ -894,6 +892,10 @@ Copyright (c) 2014-2016, University of Maryland, College Park. All rights reserv
 * Alexander T. Yu
 * Milod Kazerounian
 
+# Contributors
+
+* [Joel Holdbrooks](https://github.com/noprompt)
+
 # Discussion group
 
 [RDL Users](https://groups.google.com/forum/#!forum/rdl-users)

data/bin/rdl_query

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require_relative '../lib/rdl.rb'
-require_relative '../lib/rdl_types.rb'
+require_relative '../lib/types/core.rb'
 
 if ARGV.length != 1 then
 print <<EOF

data/lib/rdl/boot_rails.rb

@@ -2,9 +2,14 @@ if Rails.env.development? || Rails.env.test?
   require 'rdl/boot'
   require 'types/core'
 
-  dir = Rails::VERSION::STRING.split('.')[0] + ".x"
-  require_relative "../types/rails-#{dir}/_helpers.rb" # load type aliases first
-  Dir[File.dirname(__FILE__) + "/../types/rails-#{dir}/**/*.rb"].each { |f| require f }
+  version = Rails::VERSION::STRING.split('.')[0] + ".x"
+
+  begin
+    require_relative "../types/rails-#{version}/_helpers.rb" # load type aliases first
+    Dir[File.dirname(__FILE__) + "/../types/rails-#{version}/**/*.rb"].each { |f| require f }
+  rescue LoadError
+    $stderr.puts("rdl could not load type definitions for Rails v#{version}")
+  end
 elsif Rails.env.production?
   require 'rdl_disable'
   class ActionController::Base

data/lib/rdl/typecheck.rb

@@ -549,6 +549,9 @@ module RDL::Typecheck
       case c
       when TrueClass, FalseClass, Complex, Rational, Fixnum, Bignum, Float, Symbol, Class
         [env, RDL::Type::SingletonType.new(c)]
+      when Module
+        t = RDL::Type::SingletonType.new(const_get(e.children[1]))
+        [env, t]
       else
         [env, RDL::Type::NominalType.new(const_get(e.children[1]).class)]
       end
@@ -659,10 +662,10 @@ RUBY
           envguards << envi
         }
         initial_env = Env.join(e, *envguards)
-        if (tguards.all? { |t| t.is_a?(RDL::Type::SingletonType) && t.val.is_a?(Class) }) && (e.children[0].type == :lvar)
+        if (tguards.all? { |typ| typ.is_a?(RDL::Type::SingletonType) && typ.val.is_a?(Class) }) && (e.children[0].type == :lvar)
           # Special case! We're branching on the type of the guard, which is a local variable.
           # So rebind that local variable to have the union of the guard types
-          new_typ = RDL::Type::UnionType.new(*(tguards.map { |t| RDL::Type::NominalType.new(t.val) })).canonical
+          new_typ = RDL::Type::UnionType.new(*(tguards.map { |typ| RDL::Type::NominalType.new(typ.val) })).canonical
           # TODO adjust following for generics!
           if tcontrol.is_a? RDL::Type::GenericType
             if new_typ == tcontrol.base
@@ -761,19 +764,19 @@ RUBY
         end
         teaches = lookup(scope, tcollect.base.name, :each, e.children[1])
         inst = tcollect.to_inst.merge(self: tcollect)
-        teaches = teaches.map { |t| t.instantiate(inst) }
+        teaches = teaches.map { |typ| typ.instantiate(inst) }
       else
         error :for_collection, [tcollect], e.children[1]
       end
       teach = nil
-      teaches.each { |t|
+      teaches.each { |typ|
         # find `each` method with right type signature:
         #    () { (t1) -> t2 } -> t3
-        next unless t.args.empty?
-        next if t.block.nil?
-        next unless t.block.args.size == 1
-        next unless t.block.block.nil?
-        teach = t
+        next unless typ.args.empty?
+        next if typ.block.nil?
+        next unless typ.block.args.size == 1
+        next unless typ.block.block.nil?
+        teach = typ
         break
       }
       error :no_each_type, [tcollect.name], e.children[1] if teach.nil?
@@ -1006,6 +1009,7 @@ RUBY
     trecvs.each { |trecv|
       trets.concat(tc_send_one_recv(scope, env, trecv, meth, tactuals, block, e))
     }
+    trets.map! {|t| t.is_a?(RDL::Type::AnnotatedArgType) ? t.type : t}
     return RDL::Type::UnionType.new(*trets)
   end
 
@@ -1015,9 +1019,8 @@ RUBY
     tmeth_inter = [] # Array<MethodType>, i.e., an intersection types
     case trecv
     when RDL::Type::SingletonType
-      if trecv.val.is_a? Class
-        if meth == :new then name = :initialize else name = meth end
-        ts = lookup(scope, RDL::Util.add_singleton_marker(trecv.val.to_s), name, e)
+      if trecv.val.is_a? Class or trecv.val.is_a? Module
+        ts = lookup(scope, RDL::Util.add_singleton_marker(trecv.val.to_s), meth, e)
         ts = [RDL::Type::MethodType.new([], nil, RDL::Type::NominalType.new(trecv.val))] if (meth == :new) && (ts.nil?) # there's always a nullary new if initialize is undefined
         error :no_singleton_method_type, [trecv.val, meth], e unless ts
         inst = {self: trecv}
@@ -1243,6 +1246,8 @@ RUBY
           klass = RDL::Util.remove_singleton_marker klass
           klass = '(singleton) ' + klass
         end
+
+        return nil if the_klass.to_s.start_with?('#<Class:') and name ==:new
         error :missing_ancestor_type, [ancestor, klass, name], e
       end
     }

data/rdl.gemspec

@@ -4,8 +4,8 @@
 
 Gem::Specification.new do |s|
   s.name        = 'rdl'
-  s.version     = '2.0.0'
-  s.date        = '2016-08-24'
+  s.version     = '2.0.1'
+  s.date        = '2016-11-11'
   s.summary     = 'Ruby type and contract system'
   s.description = <<-EOF
 RDL is a gem that adds types and contracts to Ruby. RDL includes extensive
@@ -18,5 +18,5 @@ EOF
   s.executables << 'rdl_query'
   s.homepage    = 'https://github.com/plum-umd/rdl'
   s.license     = 'BSD-3-Clause'
-  s.add_runtime_dependency 'parser', '~>2.3', '>= 2.3.1.2'
+  s.add_runtime_dependency 'parser', '~>2.3', '>= 2.3.1.4'
 end

data/test/test_typecheck.rb

@@ -3,8 +3,20 @@ $LOAD_PATH << File.dirname(__FILE__) + "/../lib"
 require 'rdl'
 require 'types/core'
 
-class TestTypecheck < Minitest::Test
+class TestTypecheckC
+  type 'self.bar', '() -> Fixnum or String ret'
+  type 'self.foo', '() -> :A'
+  type 'self.new', '(:D) -> :E'
+end
+
+class TestTypecheckD
+end
 
+module TestTypecheckM
+  type 'self.foo', '() -> :B'
+end
+
+class TestTypecheck < Minitest::Test
   type :_any_object, "() -> Object" # a method that could return true or false
 
   def setup
@@ -960,7 +972,7 @@ class TestTypecheck < Minitest::Test
     assert_equal @t34, do_tc("begin puts 'foo'; 3; rescue; 4; end", env: @env)
     assert_equal tt("StandardError or 3"), do_tc("begin puts 'foo'; 3; rescue => e; e; end", env: @env)
     assert_equal tt("RuntimeError or 3"), do_tc("begin puts 'foo'; 3; rescue RuntimeError => e; e; end", env: @env)
-    assert_equal tt("3"), do_tc("begin puts 'foo'; 3; else; 4; end", env: @env) # parser discards else clause!
+    assert_equal tt("4"), do_tc("begin puts 'foo'; 3; else; 4; end", env: @env) # parser discards else clause!
     assert_equal tt("RuntimeError or ArgumentError or 3"), do_tc("begin puts 'foo'; 3; rescue RuntimeError => e; e; rescue ArgumentError => x; x; end", env: @env)
     assert_equal tt("RuntimeError or ArgumentError or 42 or 3"), do_tc("begin puts 'foo'; 3; rescue RuntimeError => e; e; rescue ArgumentError => x; x; else 42; end", env: @env)
     assert_equal tt("RuntimeError or ArgumentError or 3"), do_tc("begin puts 'foo'; 3; rescue RuntimeError, ArgumentError => e; e; end", env: @env)
@@ -1259,4 +1271,22 @@ class TestTypecheck < Minitest::Test
 
   end
 
+  def test_singleton
+    assert_equal ':A', do_tc("TestTypecheckC.foo", env: @env).to_s
+    assert_equal ':B', do_tc("TestTypecheckM.foo", env: @env).to_s
+  end
+
+  def test_annotated_ret
+    t = $__rdl_parser.scan_str '#T Fixnum or String'
+    assert_equal t, do_tc("TestTypecheckC.bar", env: @env)
+  end
+
+  def test_constructor
+    t = do_tc("TestTypecheckC.new(:D)", env: @env)
+    assert_equal ':E', t.to_s
+
+    t = do_tc("TestTypecheckD.new", env: @env)
+    t2 = RDL::Type::NominalType.new TestTypecheckD
+    assert_equal t2, t
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdl
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jeffrey S. Foster
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -23,7 +23,7 @@ dependencies:
         version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1.2
+        version: 2.3.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -33,7 +33,7 @@ dependencies:
         version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1.2
+        version: 2.3.1.4
 description: |
   RDL is a gem that adds types and contracts to Ruby. RDL includes extensive
   support for specifying method types, which can either be enforced as