haskell 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e555bd13822ba64ac40eefd7874334266b76527b
-  data.tar.gz: 1203cdd7568b53f6931a59a0d5fecf0b754dbc3f
+  metadata.gz: 4091853a74cb3916531770c015d74a1846249825
+  data.tar.gz: abacdf2cda587ffc59f0103163ce1bda1e235f79
 SHA512:
-  metadata.gz: aca2299d010c4264f693a13dce7ce27c213363824838ba80312fd21ee5fdee7fafff60779ddb6fb0349a8ca6a71c146b08b8fe5c898843588009e00bea0178e7
-  data.tar.gz: edcaa3d3fb1be593d1ce45b5baebe1329419232b114fada299b20c4dbe047039d0c25c956e0cb942fd203bbc2433d530e7661c1b269b6780bf6e0703c15845b7
+  metadata.gz: 8688fce196d3cff82e187f6cc5979386016855cc0658aed2617861e6be3e45ea0a1cfcf1f9f32c2cd0bd6957be817efd306817b363e4826c885f2d62c8b4125e
+  data.tar.gz: 86ee71cc6c0ccdf30763bdb58a466e0384b977468ab44532c496dbdcb8a5b783587b8d5264f3520b835962c99d7d39b85e587c5f51ded646e3a62181825e789c

data/README.md

@@ -9,11 +9,11 @@ require 'haskell'
 
 # ex1: (Ruby 2.1.0+)
 class MyClass
-  type Numeric >= Numeric >= Numeric, def sum(x, y)
+  type Numeric, Numeric >= Numeric, def sum(x, y)
     x + y
   end
 
-  type Numeric >= Numeric >= Numeric, def wrong_sum(x, y)
+  type Numeric, Numeric >= Numeric, def wrong_sum(x, y)
     'string'
   end
 end
@@ -47,7 +47,7 @@ class MyClass
   def sum(x, y)
     x + y
   end
-  type Numeric >= Numeric >= Numeric, :sum
+  type Numeric, Numeric >= Numeric, :sum
 end
 ```
 
@@ -57,7 +57,7 @@ end
 ```ruby
 # It's totally OK!!
 class MyClass
-  type Numeric >= Numeric >= Numeric, def sum(x, y)
+  type Numeric, Numeric >= Numeric, def sum(x, y)
     x + y
   end
 
@@ -99,14 +99,24 @@ Or install it yourself as:
 
     $ gem install haskell
 
-## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/haskell/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+### Contributing
 
+Fork it ( https://github.com/[my-github-username]/haskell/fork )
+
+Create your feature branch (`git checkout -b my-new-feature`)
+
+    $ bundle install --path vendor/bundle
+
+Commit your changes (`git commit -am 'Add some feature'`)
+
+    $ bundle exec rake test
+
+    > 5 runs, 39 assertions, 0 failures, 0 errors, 0 skips
+
+Push to the branch (`git push origin my-new-feature`)
+
+Create a new Pull Request
 
 ## Credits
 [@chancancode](https://github.com/chancancode) first brought this to my attention. I've stolen some idea from him.

data/lib/haskell/type_pair.rb

@@ -0,0 +1,7 @@
+class TypePair < Struct.new(:last_arg_type, :rtn_type); end
+
+class Module
+  def >=(r)
+    TypePair.new(self, r)
+  end
+end

data/lib/haskell/version.rb

@@ -1,3 +1,3 @@
 module Haskell
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/haskell.rb

@@ -1,11 +1,6 @@
-require 'haskell/type_list'
-require 'haskell/base'
-require 'haskell/assert_arg_type'
-require 'haskell/assert_rtn_type'
+require 'haskell/type_pair'
 
-module Haskell; end
-
-# New Class(Type)
+# Builtin Contracts
 class  Any;     end
 module Boolean; end
 TrueClass.send(:include, Boolean)
@@ -13,18 +8,42 @@ FalseClass.send(:include, Boolean)
 
 class Module
   private
-    def __haskell__
-      prepend (@__haskell__ = Module.new) unless @__haskell__
-      @__haskell__
+  def __haskell__
+    prepend (@__haskell__ = Module.new) unless @__haskell__
+    @__haskell__
+  end
+
+  def type(*arguments)
+    *arg_types, type_pair, meth = arguments
+
+    __haskell__.send(:define_method, meth) do |*args, &block|
+      ::Haskell.assert_arg_type(meth, args, arg_types << type_pair.last_arg_type)
+      rtn = super(*args, &block)
+      ::Haskell.assert_trn_type(meth, rtn, type_pair.rtn_type)
+      rtn
     end
+    self
+  end
+end
 
-    def type(type_list, meth)
-      __haskell__.send(:define_method, meth) do |*args, &block|
-        ::Haskell::AssertArgType.execute(meth, args, type_list.args)
-        rtn = super(*args, &block)
-        ::Haskell::AssertRtnType.execute(meth, rtn, type_list.rtn)
-        rtn
+module Haskell
+  class << self
+    def assert_arg_type(meth, args, klasses)
+      args.each_with_index do |arg, i|
+        if wrong_type?(arg, klasses[i])
+          raise ArgumentError, "Wrong type of argument, type of #{arg.inspect} should be #{klasses[i]}"
+        end
       end
-      self
     end
+
+    def assert_trn_type(meth, rtn, klass)
+      if wrong_type?(rtn, klass)
+        raise TypeError, "Expected #{meth} to return #{klass} but got #{rtn.inspect} instead"
+      end
+    end
+
+    def wrong_type?(obj, klass)
+      !(obj.is_a?(klass) || klass == Any)
+    end
+  end
 end

data/test/test_haskell.rb

@@ -1,5 +1,9 @@
 require 'minitest_helper'
-
+class TypePair
+  def to_s
+    "#{last_arg_type} >= #{rtn_type}"
+  end
+end
 class TestHaskell < MiniTest::Unit::TestCase
   def setup
     @string  = 'str'
@@ -10,61 +14,65 @@ class TestHaskell < MiniTest::Unit::TestCase
   end
 
   def test_type_list
-    assert_equal_to_s "Numeric -> Numeric", Numeric >= Numeric
-    assert_equal_to_s "Numeric -> Numeric -> Array", Numeric >= Numeric >= Array
-    assert_equal_to_s "Hash -> Symbol -> Numeric -> Array -> String", Hash >= Symbol >= Numeric >= Array >= String
+    assert_equal_to_s "Numeric >= Numeric", Numeric >= Numeric
+    assert_equal_to_s "Numeric >= Array", Numeric >= Array
+    assert_equal_to_s "Array >= String", Array >= String
   end
 
   def test_correct_type
-    assert_correct_type Numeric >= Numeric, [@numeric], @numeric
-    assert_correct_type Numeric >= Array,   [@numeric], @array
-    assert_correct_type Numeric >= String,  [@numeric], @string
-    assert_correct_type Numeric >= Hash,    [@numeric], @hash
-    assert_correct_type Numeric >= Symbol,  [@numeric], @symbol
-    assert_correct_type Numeric >= Boolean, [@numeric], true
-    assert_correct_type Numeric >= Boolean, [@numeric], false
-
-    assert_correct_type Boolean >= Numeric >= Numeric, [true, @numeric], @numeric
-    assert_correct_type Boolean >= Array   >= Array,   [true, @array  ], @array
-    assert_correct_type Boolean >= String  >= String,  [true, @string ], @string
-    assert_correct_type Boolean >= Hash    >= Hash,    [true, @hash   ], @hash
-    assert_correct_type Boolean >= Symbol  >= Symbol,  [true, @symbol ], @symbol
+    assert_correct_type [Numeric >= Numeric], [@numeric], @numeric
+    assert_correct_type [Numeric >= Array  ], [@numeric], @array
+    assert_correct_type [Numeric >= String ], [@numeric], @string
+    assert_correct_type [Numeric >= Hash   ], [@numeric], @hash
+    assert_correct_type [Numeric >= Symbol ], [@numeric], @symbol
+    assert_correct_type [Numeric >= Boolean], [@numeric], true
+    assert_correct_type [Numeric >= Boolean], [@numeric], false
+
+    assert_correct_type [Boolean, Numeric >= Numeric], [true, @numeric], @numeric
+    assert_correct_type [Boolean, Array   >= Array  ], [true, @array  ], @array
+    assert_correct_type [Boolean, String  >= String ], [true, @string ], @string
+    assert_correct_type [Boolean, Hash    >= Hash   ], [true, @hash   ], @hash
+    assert_correct_type [Boolean, Symbol  >= Symbol ], [true, @symbol ], @symbol
   end
 
   def test_wrong_return_type
-    assert_wrong_rtn Numeric >= Numeric, [@numeric], @array
-    assert_wrong_rtn Numeric >= Numeric, [@numeric], @string
-    assert_wrong_rtn Numeric >= Numeric, [@numeric], @hash
-    assert_wrong_rtn Numeric >= Numeric, [@numeric], @symbol
-
-    assert_wrong_rtn Numeric >= Numeric >= Numeric, [@numeric, @numeric], @array
-    assert_wrong_rtn Numeric >= Numeric >= Numeric, [@numeric, @numeric], @string
-    assert_wrong_rtn Numeric >= Numeric >= Numeric, [@numeric, @numeric], @hash
-    assert_wrong_rtn Numeric >= Numeric >= Numeric, [@numeric, @numeric], @symbol
+    assert_wrong_rtn [Numeric >= Numeric], [@numeric], @array
+    assert_wrong_rtn [Numeric >= Numeric], [@numeric], @string
+    assert_wrong_rtn [Numeric >= Numeric], [@numeric], @hash
+    assert_wrong_rtn [Numeric >= Numeric], [@numeric], @symbol
+    assert_wrong_rtn [Numeric >= Numeric], [@numeric], true
+
+    assert_wrong_rtn [Numeric, Numeric >= Numeric], [@numeric, @numeric], @array
+    assert_wrong_rtn [Numeric, Numeric >= Numeric], [@numeric, @numeric], @string
+    assert_wrong_rtn [Numeric, Numeric >= Numeric], [@numeric, @numeric], @hash
+    assert_wrong_rtn [Numeric, Numeric >= Numeric], [@numeric, @numeric], @symbol
+    assert_wrong_rtn [Numeric, Numeric >= Numeric], [@numeric, @numeric], true
   end
 
   def test_wrong_args_type
-    assert_wrong_arg Numeric >= Numeric, [@array ], @numeric
-    assert_wrong_arg Numeric >= Numeric, [@string], @numeric
-    assert_wrong_arg Numeric >= Numeric, [@hash  ], @numeric
-    assert_wrong_arg Numeric >= Numeric, [@symbol], @numeric
-
-    assert_wrong_arg Numeric >= Numeric >= Numeric, [@numeric, @array ], @numeric
-    assert_wrong_arg Numeric >= Numeric >= Numeric, [@numeric, @string], @numeric
-    assert_wrong_arg Numeric >= Numeric >= Numeric, [@numeric, @hash  ], @numeric
-    assert_wrong_arg Numeric >= Numeric >= Numeric, [@numeric, @symbol], @numeric
+    assert_wrong_arg [Numeric >= Numeric], [@array ], @numeric
+    assert_wrong_arg [Numeric >= Numeric], [@string], @numeric
+    assert_wrong_arg [Numeric >= Numeric], [@hash  ], @numeric
+    assert_wrong_arg [Numeric >= Numeric], [@symbol], @numeric
+    assert_wrong_arg [Numeric >= Numeric], [true   ], @numeric
+
+    assert_wrong_arg [Numeric, Numeric >= Numeric], [@numeric, @array ], @numeric
+    assert_wrong_arg [Numeric, Numeric >= Numeric], [@numeric, @string], @numeric
+    assert_wrong_arg [Numeric, Numeric >= Numeric], [@numeric, @hash  ], @numeric
+    assert_wrong_arg [Numeric, Numeric >= Numeric], [@numeric, @symbol], @numeric
+    assert_wrong_arg [Numeric, Numeric >= Numeric], [@numeric, true   ], @numeric
   end
 
   def test_any
-    assert_correct_type Any >= Any, [@array ], @numeric
-    assert_correct_type Any >= Any, [@string], @numeric
-    assert_correct_type Any >= Any, [@hash  ], @numeric
-    assert_correct_type Any >= Any, [@symbol], @numeric
-
-    assert_correct_type Any >= Any >= Any, [@numeric, @array ], @numeric
-    assert_correct_type Any >= Any >= Any, [@numeric, @string], @numeric
-    assert_correct_type Any >= Any >= Any, [@numeric, @hash  ], @numeric
-    assert_correct_type Any >= Any >= Any, [@numeric, @symbol], @numeric
+    assert_correct_type [Any >= Any], [@array ], @numeric
+    assert_correct_type [Any >= Any], [@string], @numeric
+    assert_correct_type [Any >= Any], [@hash  ], @numeric
+    assert_correct_type [Any >= Any], [@symbol], @numeric
+
+    assert_correct_type [Any, Any >= Any], [@numeric, @array ], @numeric
+    assert_correct_type [Any, Any >= Any], [@numeric, @string], @numeric
+    assert_correct_type [Any, Any >= Any], [@numeric, @hash  ], @numeric
+    assert_correct_type [Any, Any >= Any], [@numeric, @symbol], @numeric
   end
 
   private
@@ -89,7 +97,7 @@ class TestHaskell < MiniTest::Unit::TestCase
         def call(#{arg_literal(args.count)})
           #{obj_literal(val)}
         end
-        type #{obj_literal(type_list)}, :call
+        type #{type_list.map(&:to_s).join(',')}, :call
       RUBY_CODE
 
       klass.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haskell
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - gogotanaka
@@ -87,10 +87,7 @@ files:
 - ext/haskell/haskell.h
 - haskell.gemspec
 - lib/haskell.rb
-- lib/haskell/assert_arg_type.rb
-- lib/haskell/assert_rtn_type.rb
-- lib/haskell/base.rb
-- lib/haskell/type_list.rb
+- lib/haskell/type_pair.rb
 - lib/haskell/version.rb
 - test/minitest_helper.rb
 - test/test_haskell.rb

data/lib/haskell/assert_arg_type.rb

@@ -1,14 +0,0 @@
-module Haskell
-  module AssertArgType
-    extend Base
-
-    def self.execute(meth, args, klasses)
-      args.each_with_index do |arg, i|
-        if wrong_type?(arg, klasses[i])
-          raise ArgumentError, "Wrong type of argument, type of #{arg.inspect} should be #{klasses[i]}"
-        end
-      end
-    end
-
-  end
-end

data/lib/haskell/assert_rtn_type.rb

@@ -1,16 +0,0 @@
-module Haskell
-  module AssertRtnType
-    extend Base
-
-    def self.execute(meth, rtn, klass)
-      if wrong_type?(rtn, klass)
-        raise TypeError, "Expected #{meth} to return #{klass} but got #{rtn.inspect} instead"
-      end
-    end
-
-    def self.wrong_type?(obj, klass)
-      !(obj.is_a?(klass) || klass == Any)
-    end
-
-  end
-end

data/lib/haskell/base.rb

@@ -1,7 +0,0 @@
-module Haskell
-  module Base
-    def wrong_type?(obj, klass)
-      !(obj.is_a?(klass) || klass == Any)
-    end
-  end
-end

data/lib/haskell/type_list.rb

@@ -1,32 +0,0 @@
-# '>=' is left-associative ...
-# List like LISP or Hash may be better.
-class TypeList
-  attr_accessor :list
-
-  def initialize(l, r)
-    @list = [l, r]
-  end
-
-  def >=(r)
-    @list << r
-    self
-  end
-
-  def args
-    @list[0..-2]
-  end
-
-  def rtn
-    @list.last
-  end
-
-  def to_s
-    @list.map(&:to_s).join(' -> ')
-  end
-end
-
-class Module
-  def >=(r)
-    TypeList.new(self, r)
-  end
-end