haskell 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4091853a74cb3916531770c015d74a1846249825
-  data.tar.gz: abacdf2cda587ffc59f0103163ce1bda1e235f79
+  metadata.gz: d3c9ffa1d1b36cb7926952b21760fbf551702a43
+  data.tar.gz: 74e7d0eefc40f2d5564b3adc4cb484f4ce9e6135
 SHA512:
-  metadata.gz: 8688fce196d3cff82e187f6cc5979386016855cc0658aed2617861e6be3e45ea0a1cfcf1f9f32c2cd0bd6957be817efd306817b363e4826c885f2d62c8b4125e
-  data.tar.gz: 86ee71cc6c0ccdf30763bdb58a466e0384b977468ab44532c496dbdcb8a5b783587b8d5264f3520b835962c99d7d39b85e587c5f51ded646e3a62181825e789c
+  metadata.gz: 013a5b1881c581a93a8075974edcf3aa3f12d175cfd4957b87948b41599181ed484579053b9b7683a4b699c30e97d94256ef333d49d8de099b339162bb388355
+  data.tar.gz: 16ddb4cb6b778cfad27173c79809063c9d6856d15628aac70cba9d1405a177872389f6f6551d1cb16c015d249934e12d4cebe0d5769ae2dab7007ceb16eb725d

data/README.md

@@ -5,17 +5,19 @@ Matz has mentioned Ruby3.0 with static type at some confluences. But almost all
 But it's worth thinking more. This gem is kind of trial without so much side-effect.
 
 ```rb
-require 'haskell'
+require 'rubype'
 
-# ex1: (Ruby 2.1.0+)
+# ex1
 class MyClass
-  type Numeric, Numeric >= Numeric, def sum(x, y)
+  def sum(x, y)
     x + y
   end
+  typesig sum: [Numeric, Numeric => Numeric]
 
-  type Numeric, Numeric >= Numeric, def wrong_sum(x, y)
+  def wrong_sum(x, y)
     'string'
   end
+  typesig wrong_sum: [Numeric, Numeric => Numeric]
 end
 
 MyClass.new.sum(1, 2)
@@ -28,27 +30,19 @@ MyClass.new.wrong_sum(1, 2)
 #=> TypeError: Expected wrong_sum to return Numeric but got "str" instead
 
 
-# ex2: (Ruby 2.1.0+)
+# ex2
 class People
   type People >= Any, def marry(people)
     # Your Ruby code as usual
   end
 end
+typesig marry: [People => Any]
 
 People.new.marry(People.new)
 #=> no error
 
 People.new.marry('non people')
 #=> ArgumentError: Wrong type of argument, type of "non people" should be People
-
-
-# ex3: (Ruby 1.8.0+)
-class MyClass
-  def sum(x, y)
-    x + y
-  end
-  type Numeric, Numeric >= Numeric, :sum
-end
 ```
 
 ## Feature
@@ -57,11 +51,12 @@ end
 ```ruby
 # It's totally OK!!
 class MyClass
-  type Numeric, Numeric >= Numeric, def sum(x, y)
+  def sum(x, y)
     x + y
   end
+  typesig sum: [Numeric, Numeric => Numeric]
 
-  def wrong_sum(x, y)
+  def sum_without_type(x, y)
     'string'
   end
 end
@@ -72,9 +67,10 @@ end
 ```ruby
 
 class MyClass
-  type Any >= Numeric, def foo(any_obj)
+  def foo(any_obj)
     1
   end
+  typesig sum: [Any => Numeric]
 end
 
 # It's totally OK!!
@@ -85,24 +81,13 @@ MyClass.new.foo('str')
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'haskell'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install haskell
+gem install rubype or add gem 'rubype' to your Gemfile.
 
+This gem requires Ruby 2.0.0+.
 
 ### Contributing
 
-Fork it ( https://github.com/[my-github-username]/haskell/fork )
+Fork it ( https://github.com/[my-github-username]/rubype/fork )
 
 Create your feature branch (`git checkout -b my-new-feature`)
 

data/Rakefile

@@ -5,10 +5,15 @@ Rake::TestTask.new(:test) do |t|
   t.libs << "test"
 end
 
-task :default => :test
-
 require "rake/extensiontask"
 
-Rake::ExtensionTask.new("haskell") do |ext|
-  ext.lib_dir = "lib/haskell"
+Rake::ExtensionTask.new("rubype") do |ext|
+  ext.lib_dir = "lib/rubype"
+end
+
+task :compile_and_test do
+  Rake::Task['compile'].invoke
+  Rake::Task['test'].invoke
 end
+
+task default: :compile_and_test

data/bin/{haskell → rubype}

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 
-require 'haskell'
+require 'rubype'

data/ext/rubype/extconf.rb

@@ -0,0 +1,3 @@
+require "mkmf"
+
+create_makefile("rubype/rubype")

data/ext/rubype/rubype.c

@@ -0,0 +1,38 @@
+#include "rubype.h"
+
+VALUE rb_mRubype, rb_cAny, rb_mBoolean, rb_cTypePair;
+
+#define STR2SYM(x) ID2SYM(rb_intern(x))
+
+static VALUE
+rb_mod_prepend(int argc, VALUE *argv, VALUE module)
+{
+  int i;
+  ID id_prepend_features, id_prepended;
+
+  CONST_ID(id_prepend_features, "prepend_features");
+  CONST_ID(id_prepended, "prepended");
+  for (i = 0; i < argc; i++)
+    Check_Type(argv[i], T_MODULE);
+    while (argc--) {
+      rb_funcall(argv[argc], id_prepend_features, 1, module);
+      rb_funcall(argv[argc], id_prepended, 1, module);
+    }
+
+  return module;
+}
+
+void
+Init_rubype(void)
+{
+  // rb_mRubype  = rb_define_module("Rubype");
+  // rb_cAny     = rb_define_class("Any", rb_cObject);
+  // rb_mBoolean = rb_define_module("Boolean");
+  // rb_include_module(rb_cTrueClass, rb_mBoolean);
+  // rb_include_module(rb_cFalseClass, rb_mBoolean);
+  // rb_define_class(
+  //   "TypePair",
+  //   rb_funcall(rb_cStruct, rb_intern("new"), 2, STR2SYM("last_arg_type"), STR2SYM("rtn_type"))
+  // );
+  rb_define_method(rb_cModule, "prepend", rb_mod_prepend, -1);
+}

data/ext/rubype/rubype.h

@@ -0,0 +1,6 @@
+#ifndef RUBYPE_H
+#define RUBYPE_H 1
+
+#include "ruby.h"
+
+#endif /* RUBYPE_H */

data/lib/rubype/version.rb

@@ -0,0 +1,3 @@
+module Rubype
+  VERSION = "0.2.0"
+end

data/lib/{haskell.rb → rubype.rb}

@@ -1,4 +1,4 @@
-require 'haskell/type_pair'
+require "rubype/rubype"
 
 # Builtin Contracts
 class  Any;     end
@@ -8,25 +8,26 @@ FalseClass.send(:include, Boolean)
 
 class Module
   private
-  def __haskell__
-    prepend (@__haskell__ = Module.new) unless @__haskell__
-    @__haskell__
+  def __rubype__
+    prepend (@__rubype__ = Module.new) unless @__rubype__
+    @__rubype__
   end
 
-  def type(*arguments)
-    *arg_types, type_pair, meth = arguments
+  def typesig(hash)
+    meth = hash.keys.first
+    *arg_types, type_pair = hash.values.first
 
-    __haskell__.send(:define_method, meth) do |*args, &block|
-      ::Haskell.assert_arg_type(meth, args, arg_types << type_pair.last_arg_type)
+    __rubype__.send(:define_method, meth) do |*args, &block|
+      ::Rubype.assert_arg_type(meth, args, arg_types << type_pair.keys.first)
       rtn = super(*args, &block)
-      ::Haskell.assert_trn_type(meth, rtn, type_pair.rtn_type)
+      ::Rubype.assert_trn_type(meth, rtn, type_pair.values.first)
       rtn
     end
     self
   end
 end
 
-module Haskell
+module Rubype
   class << self
     def assert_arg_type(meth, args, klasses)
       args.each_with_index do |arg, i|

data/{haskell.gemspec → rubype.gemspec}

@@ -1,17 +1,17 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'haskell/version'
+require 'rubype/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "haskell"
-  spec.version       = Haskell::VERSION
+  spec.version       = Rubype::VERSION
   spec.authors       = ["gogotanaka"]
   spec.email         = ["mail@tanakakazuki.com"]
-  spec.extensions    = ["ext/haskell/extconf.rb"]
+  spec.extensions    = ["ext/rubype/extconf.rb"]
   spec.summary       = %q{Ruby with type.}
   spec.description   = %q{Ruby with type.}
-  spec.homepage      = "http://azabuhs.org/"
+  spec.homepage      = "http://gogotanaka.me/"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/test/minitest_helper.rb

@@ -1,4 +1,4 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'haskell'
+require 'rubype'
 
 require 'minitest/autorun'

data/test/test_rubype.rb

@@ -0,0 +1,107 @@
+require 'minitest_helper'
+class TypePair
+  def to_s
+    "#{last_arg_type} => #{rtn_type}"
+  end
+end
+class TestRubype < MiniTest::Unit::TestCase
+  def setup
+    @string  = 'str'
+    @numeric = 1
+    @symbol  = :test
+    @array   = [1, 2, 3]
+    @hash    = { test: :hash }
+  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
+  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], 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], [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
+  end
+
+  private
+    def assert_equal_to_s(str, val)
+      assert_equal str, val.to_s
+    end
+
+    def assert_correct_type(type_list, args, val)
+      assert_equal val, define_test_method(type_list, args, val).call(*args)
+    end
+
+    def assert_wrong_arg(type_list, args, val)
+      assert_raises(ArgumentError) { define_test_method(type_list, args, val).call(*args) }
+    end
+
+    def assert_wrong_rtn(type_list, args, val)
+      assert_raises(TypeError) { define_test_method(type_list, args, val).call(*args) }
+    end
+
+    def define_test_method(type_list, args, val)
+      klass = Class.new.class_eval <<-RUBY_CODE
+        def call(#{arg_literal(args.count)})
+          #{obj_literal(val)}
+        end
+        typesig call: #{obj_literal(type_list)}
+      RUBY_CODE
+
+      klass.new
+    end
+
+    def obj_literal(obj)
+      "ObjectSpace._id2ref(#{obj.__id__})"
+    end
+
+    def arg_literal(count)
+      ('a'..'z').to_a[0..count-1].join(',')
+    end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haskell
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,9 +70,9 @@ description: Ruby with type.
 email:
 - mail@tanakakazuki.com
 executables:
-- haskell
+- rubype
 extensions:
-- ext/haskell/extconf.rb
+- ext/rubype/extconf.rb
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -81,17 +81,16 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/haskell
-- ext/haskell/extconf.rb
-- ext/haskell/haskell.c
-- ext/haskell/haskell.h
-- haskell.gemspec
-- lib/haskell.rb
-- lib/haskell/type_pair.rb
-- lib/haskell/version.rb
+- bin/rubype
+- ext/rubype/extconf.rb
+- ext/rubype/rubype.c
+- ext/rubype/rubype.h
+- lib/rubype.rb
+- lib/rubype/version.rb
+- rubype.gemspec
 - test/minitest_helper.rb
-- test/test_haskell.rb
-homepage: http://azabuhs.org/
+- test/test_rubype.rb
+homepage: http://gogotanaka.me/
 licenses:
 - MIT
 metadata: {}
@@ -117,4 +116,4 @@ specification_version: 4
 summary: Ruby with type.
 test_files:
 - test/minitest_helper.rb
-- test/test_haskell.rb
+- test/test_rubype.rb

data/ext/haskell/extconf.rb

@@ -1,3 +0,0 @@
-require "mkmf"
-
-create_makefile("haskell/haskell")

data/ext/haskell/haskell.c

@@ -1,9 +0,0 @@
-#include "haskell.h"
-
-VALUE rb_mHaskell;
-
-void
-Init_haskell(void)
-{
-  rb_mHaskell = rb_define_module("Haskell");
-}

data/ext/haskell/haskell.h

@@ -1,6 +0,0 @@
-#ifndef HASKELL_H
-#define HASKELL_H 1
-
-#include "ruby.h"
-
-#endif /* HASKELL_H */

data/lib/haskell/type_pair.rb

@@ -1,7 +0,0 @@
-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 +0,0 @@
-module Haskell
-  VERSION = "0.1.0"
-end

data/test/test_haskell.rb

@@ -1,113 +0,0 @@
-require 'minitest_helper'
-class TypePair
-  def to_s
-    "#{last_arg_type} >= #{rtn_type}"
-  end
-end
-class TestHaskell < MiniTest::Unit::TestCase
-  def setup
-    @string  = 'str'
-    @numeric = 1
-    @symbol  = :test
-    @array   = [1, 2, 3]
-    @hash    = { test: :hash }
-  end
-
-  def test_type_list
-    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
-  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], 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], [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
-  end
-
-  private
-    def assert_equal_to_s(str, val)
-      assert_equal str, val.to_s
-    end
-
-    def assert_correct_type(type_list, args, val)
-      assert_equal val, define_test_method(type_list, args, val).call(*args)
-    end
-
-    def assert_wrong_arg(type_list, args, val)
-      assert_raises(ArgumentError) { define_test_method(type_list, args, val).call(*args) }
-    end
-
-    def assert_wrong_rtn(type_list, args, val)
-      assert_raises(TypeError) { define_test_method(type_list, args, val).call(*args) }
-    end
-
-    def define_test_method(type_list, args, val)
-      klass = Class.new.class_eval <<-RUBY_CODE
-        def call(#{arg_literal(args.count)})
-          #{obj_literal(val)}
-        end
-        type #{type_list.map(&:to_s).join(',')}, :call
-      RUBY_CODE
-
-      klass.new
-    end
-
-    def obj_literal(obj)
-      "ObjectSpace._id2ref(#{obj.__id__})"
-    end
-
-    def arg_literal(count)
-      ('a'..'z').to_a[0..count-1].join(',')
-    end
-end