rdl 1.1.1 → 2.0.0.rc1

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

@@ -2,8 +2,8 @@ class Regexp
   rdl_nowrap
 
   type 'self.escape', '(String or Symbol) -> String'
-  type 'self.last_match', '() -> MatchData' # Can't wrap or screws up MatchData
-  type 'self.last_match', '(Fixnum) -> String'
+  type 'self.last_match', '() -> MatchData', wrap: false # Can't wrap or messes up MatchData
+  type 'self.last_match', '(Fixnum) -> String', wrap: false
   type 'self.new', '(String, ?%any options, ?String kcode) -> Regexp'
   type 'self.new', '(Regexp) -> Regexp'
   rdl_alias 'self.compile', 'self.new'
@@ -12,8 +12,8 @@ class Regexp
   type 'self.union', '(*(Regexp or String) pats) -> Regexp'
   type 'self.union', '(Array<Regexp or String> pats) -> Regexp'
   type :==, '(%any other) -> %bool'
-  # type :===, '(%any other) -> %bool' # Can't wrap this of it messes with $1, $2, etc as well!
-  # type :=~, '(String str) -> Fixnum or nil' # Can't wrap this or it will mess with $1, $2, etc
+  type :===, '(%any other) -> %bool', wrap: false # Can't wrap this of it messes with $1, $2, etc as well!
+  type :=~, '(String str) -> Fixnum or nil', wrap: false # Can't wrap this or it will mess with $1, $2, etc
   type :casefold?, '() -> %bool'
   type :encoding, '() -> Encoding'
   rdl_alias :eql?, :==

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

@@ -10,7 +10,7 @@ class String
   type :<=>, '(String other) -> Fixnum or nil ret'
   type :==, '(%any) -> %bool'
   type :===, '(%any) -> %bool'
-#  type :=~, '(Object) -> Fixnum or nil' # TODO: Wrapping this messes up $1 etc
+  type :=~, '(Object) -> Fixnum or nil', wrap: false # Wrapping this messes up $1 etc
   type :[], '(Fixnum, ?Fixnum) -> String or nil'
   type :[], '(Range<Fixnum> or Regexp) -> String or nil'
   type :[], '(Regexp, Fixnum) -> String or nil'
@@ -59,15 +59,14 @@ class String
   type :eql?, '(String) -> %bool'
   type :force_encoding, '(String or Encoding) -> String'
   type :getbyte, '(Fixnum) -> Fixnum or nil'
-# Can't wrap these, since they mess with $1 etc
-  type :gsub, '(Regexp or String, String) -> String'
-  type :gsub, '(Regexp or String, Hash) -> String'
-  type :gsub, '(Regexp or String) {(String) -> %any } -> String'
-  type :gsub, '(Regexp or String) ->  Enumerator'
-  type :gsub, '(Regexp or String) -> String'
-  type :gsub!, '(Regexp or String, String) -> String or nil'
-  type :gsub!, '(Regexp or String) {(String) -> %any } -> String or nil'
-  type :gsub!, '(Regexp or String) -> Enumerator'
+  type :gsub, '(Regexp or String, String) -> String', wrap: false # Can't wrap these, since they mess with $1 etc
+  type :gsub, '(Regexp or String, Hash) -> String', wrap: false
+  type :gsub, '(Regexp or String) {(String) -> %any } -> String', wrap: false
+  type :gsub, '(Regexp or String) ->  Enumerator', wrap: false
+  type :gsub, '(Regexp or String) -> String', wrap: false
+  type :gsub!, '(Regexp or String, String) -> String or nil', wrap: false
+  type :gsub!, '(Regexp or String) {(String) -> %any } -> String or nil', wrap: false
+  type :gsub!, '(Regexp or String) -> Enumerator', wrap: false
   type :hash, '() -> Fixnum'
   type :hex, '() -> Fixnum'
   type :include?, '(String) -> %bool'
@@ -95,8 +94,8 @@ class String
   type :rpartition, '(String or Regexp) -> Array<String>'
   type :rstrip, '() -> String'
   type :rstrip!, '() -> String'
-#  type :scan, '(Regexp or String) -> Array<String or Array<String>>' # Can't wrap or screws up last_match
-#  type :scan, '(Regexp or String) {(*%any) -> %any} -> Array<String or Array<String>>'
+  type :scan, '(Regexp or String) -> Array<String or Array<String>>', wrap: false # Can't wrap or screws up last_match
+  type :scan, '(Regexp or String) {(*%any) -> %any} -> Array<String or Array<String>>', wrap: false
   type :scrub, '(?String) -> String'
   type :scrub, '(?String) {(%any) -> %any} -> String'
   type :scrub!, '(?String) -> String'
@@ -116,11 +115,10 @@ class String
   type :start_with?, '(* String) -> %bool'
   type :strip, '() -> String'
   type :strip!, '() -> String'
-# Can't wrap these, since they mess with $1 etc
-   type :sub, '(Regexp or String, String or Hash) -> String'
-   type :sub, '(Regexp or String) {(String) -> %any} -> String'
-   type :sub!, '(Regexp or String, String) -> String' # TODO: Does this really not allow Hash?
-   type :sub!, '(Regexp or String) {(String) -> %any} -> String'
+  type :sub, '(Regexp or String, String or Hash) -> String', wrap: false # Can't wrap these, since they mess with $1 etc
+  type :sub, '(Regexp or String) {(String) -> %any} -> String', wrap: false
+  type :sub!, '(Regexp or String, String) -> String', wrap: false # TODO: Does this really not allow Hash?
+  type :sub!, '(Regexp or String) {(String) -> %any} -> String', wrap: false
   type :succ, '() -> String'
   type :sum, '(?Fixnum) -> Fixnum'
   type :swapcase, '() -> String'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdl
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Jeffrey S. Foster
@@ -12,34 +12,32 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-21 00:00:00.000000000 Z
+date: 2016-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: require_all
+  name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 2.3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 2.3.1.2
 description: |
-  RDL is a gem that allows contracts (pre- and postconditions) to be added to methods.
-  Preconditions are checked at run time when the method is called, and
-  postconditions are checked at run time when the method returns.
-  RDL also includes extensive support for type contracts, which check the types of arguments and returns
-  when the method is called and when it returns, respectively.
+  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
+  contracts or statically checked.
 email:
 - rdl-users@googlegroups.com
 executables:
@@ -121,10 +119,12 @@ files:
 - lib/rdl/contracts/flat.rb
 - lib/rdl/contracts/or.rb
 - lib/rdl/contracts/proc.rb
+- lib/rdl/info.rb
 - lib/rdl/query.rb
 - lib/rdl/switch.rb
-- lib/rdl/types/.#lexer.rex
+- lib/rdl/typecheck.rb
 - lib/rdl/types/annotated_arg.rb
+- lib/rdl/types/bot.rb
 - lib/rdl/types/dependent_arg.rb
 - lib/rdl/types/dots_query.rb
 - lib/rdl/types/finitehash.rb
@@ -133,7 +133,6 @@ files:
 - lib/rdl/types/lexer.rex
 - lib/rdl/types/lexer.rex.rb
 - lib/rdl/types/method.rb
-- lib/rdl/types/nil.rb
 - lib/rdl/types/nominal.rb
 - lib/rdl/types/optional.rb
 - lib/rdl/types/parser.racc
@@ -168,6 +167,7 @@ files:
 - test/test_rdl.rb
 - test/test_rdl_type.rb
 - test/test_type_contract.rb
+- test/test_typecheck.rb
 - test/test_types.rb
 - test/test_wrap.rb
 - types/rails-4.2.1/fixnum.rb
@@ -206,6 +206,7 @@ files:
 - types/ruby-2.x/marshal.rb
 - types/ruby-2.x/matchdata.rb
 - types/ruby-2.x/math.rb
+- types/ruby-2.x/nil.rb
 - types/ruby-2.x/numeric.rb
 - types/ruby-2.x/object.rb
 - types/ruby-2.x/pathname.rb
@@ -236,9 +237,9 @@ 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.5.1

data/lib/rdl/types/.#lexer.rex

@@ -1 +0,0 @@
-milod@ubuntu.47783:1458260004