rubype 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d3acd50cc84b3a88ae2270111796825a1d7b916
-  data.tar.gz: 53745d33a11a70db20b39199df8cd54115cf3e6e
+  metadata.gz: 6c7e1779556b1e9829b3b5043bc96aba5caaacb1
+  data.tar.gz: b2c48bd090e006e27a176803c0833d3a39883226
 SHA512:
-  metadata.gz: 28374048f7e03c8611d69d1cc6ee842ed93e0cda775968f0e9f4d1e7da31f29a6694fd136445d8c93864403fa0ed97001bc08cdbeb14d85447326c81070829e8
-  data.tar.gz: b0faae01aa81746ca428efd63993969b6f4c4d4f8437b5a4fd76051b7bd7ecf48f1cd78bed70bb2470a140c57dcbe8dd161c0b27bc41bc023a282c799f4ccc51
+  metadata.gz: 165eeb9c15017ab93dfefcf66236ff8096274bbd65e87fa082e0ae0fd62c10712c6636085fdd46dc96d06a59b1ddf318f9e97dcacd7df7bb78052441459bbcd6
+  data.tar.gz: 5983be0188e80c963ce8994949ff461abc99ea9217e8cde4265c088b2c4f565b58ee4146762e29a2ed76ac8b098436b3203c0b7caef1f7b4fea2be74ad45f2b9

data/README.md

@@ -12,12 +12,12 @@ class MyClass
   def sum(x, y)
     x + y
   end
-  type Numeric, Numeric >= Numeric, :sum
+  typesig sum: [Numeric, Numeric => Numeric]
 
   def wrong_sum(x, y)
     'string'
   end
-  type Numeric, Numeric >= Numeric, :sum
+  typesig wrong_sum: [Numeric, Numeric => Numeric]
 end
 
 MyClass.new.sum(1, 2)
@@ -29,23 +29,14 @@ MyClass.new.sum(1, 'string')
 MyClass.new.wrong_sum(1, 2)
 #=> TypeError: Expected wrong_sum to return Numeric but got "str" instead
 
-# ex2: (Ruby 2.1.0+)
-class MyClass
-  type Numeric, Numeric >= Numeric, def sum(x, y)
-    x + y
-  end
-
-  type Numeric, Numeric >= Numeric, def wrong_sum(x, y)
-    'string'
-  end
-end
 
-# ex3: (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
@@ -63,9 +54,9 @@ class MyClass
   def sum(x, y)
     x + y
   end
-  type Numeric, Numeric >= Numeric, :sum
+  typesig sum: [Numeric, Numeric => Numeric]
 
-  def wrong_sum(x, y)
+  def sum_without_type(x, y)
     'string'
   end
 end
@@ -79,7 +70,7 @@ class MyClass
   def foo(any_obj)
     1
   end
-  type Any >= Numeric, :foo
+  typesig sum: [Any => Numeric]
 end
 
 # It's totally OK!!

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("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/ext/rubype/rubype.c

@@ -1,9 +1,38 @@
 #include "rubype.h"
 
-VALUE rb_mRubype;
+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_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/lib/rubype/version.rb

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

data/lib/rubype.rb

@@ -1,4 +1,4 @@
-require 'rubype/type_pair'
+require "rubype/rubype"
 
 # Builtin Contracts
 class  Any;     end
@@ -13,13 +13,14 @@ class Module
     @__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
 
     __rubype__.send(:define_method, meth) do |*args, &block|
-      ::Rubype.assert_arg_type(meth, args, arg_types << type_pair.last_arg_type)
+      ::Rubype.assert_arg_type(meth, args, arg_types << type_pair.keys.first)
       rtn = super(*args, &block)
-      ::Rubype.assert_trn_type(meth, rtn, type_pair.rtn_type)
+      ::Rubype.assert_trn_type(meth, rtn, type_pair.values.first)
       rtn
     end
     self

data/rubype.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   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/test_rubype.rb

@@ -1,7 +1,7 @@
 require 'minitest_helper'
 class TypePair
   def to_s
-    "#{last_arg_type} >= #{rtn_type}"
+    "#{last_arg_type} => #{rtn_type}"
   end
 end
 class TestRubype < MiniTest::Unit::TestCase
@@ -13,66 +13,60 @@ class TestRubype < MiniTest::Unit::TestCase
     @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
+    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
+    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
+    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
@@ -97,7 +91,7 @@ class TestRubype < MiniTest::Unit::TestCase
         def call(#{arg_literal(args.count)})
           #{obj_literal(val)}
         end
-        type #{type_list.map(&:to_s).join(',')}, :call
+        typesig call: #{obj_literal(type_list)}
       RUBY_CODE
 
       klass.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubype
 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
@@ -86,12 +86,11 @@ files:
 - ext/rubype/rubype.c
 - ext/rubype/rubype.h
 - lib/rubype.rb
-- lib/rubype/type_pair.rb
 - lib/rubype/version.rb
 - rubype.gemspec
 - test/minitest_helper.rb
 - test/test_rubype.rb
-homepage: http://azabuhs.org/
+homepage: http://gogotanaka.me/
 licenses:
 - MIT
 metadata: {}

data/lib/rubype/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