rtype 0.5.0 → 0.5.1

data/Rakefile

@@ -1,12 +1,12 @@
-require "rspec/core/rake_task"
-
-# Default pattern is 'spec/**{,/*/**}/*_spec.rb'
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
-
-# Benchmark
-desc "Compare with pure ruby and other gems"
-task :benchmark do
-  ruby "benchmark/benchmark.rb"
+require "rspec/core/rake_task"
+
+# Default pattern is 'spec/**{,/*/**}/*_spec.rb'
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+
+# Benchmark
+desc "Compare with pure ruby and other gems"
+task :benchmark do
+  ruby "benchmark/benchmark.rb"
 end

data/benchmark/benchmark.rb

@@ -1,192 +1,192 @@
-require 'benchmark/ips'
-
-is_mri = RUBY_ENGINE == 'ruby'
-
-require "rtype"
-require "rubype" if is_mri
-require "sig"
-require "contracts"
-require "contracts/version"
-require "typecheck"
-
-puts "Ruby version: #{RUBY_VERSION}"
-puts "Ruby engine: #{RUBY_ENGINE}"
-puts "Ruby description: #{RUBY_DESCRIPTION}"
-
-puts "Rtype version: #{Rtype::VERSION}"
-puts "Rubype version: #{Rubype::VERSION}" if is_mri
-puts "Sig version: #{Sig::VERSION}"
-puts "Contracts version: #{Contracts::VERSION}"
-puts "Typecheck version: #{Typecheck::VERSION}"
-
-class PureTest
-	def sum(x, y)
-		x + y
-	end
-
-	def mul(x, y)
-		x * y
-	end
-
-	def args(a, b, c, d)
-	end
-end
-pure_obj = PureTest.new
-
-class RtypeTest
-	rtype [Numeric, Numeric] => Numeric
-	def sum(x, y)
-		x + y
-	end
-
-	rtype [:to_i, :to_i] => Numeric
-	def mul(x, y)
-		x * y
-	end
-
-	rtype [Integer, Numeric, String, :to_i] => Any
-	def args(a, b, c, d)
-	end
-end
-rtype_obj = RtypeTest.new
-
-if is_mri
-	class RubypeTest
-		def sum(x, y)
-			x + y
-		end
-		typesig :sum, [Numeric, Numeric] => Numeric
-
-		def mul(x, y)
-			x * y
-		end
-		typesig :mul, [:to_i, :to_i] => Numeric
-
-		def args(a, b, c, d)
-		end
-		typesig :args, [Integer, Numeric, String, :to_i] => Any
-	end
-	rubype_obj = RubypeTest.new
-end
-
-class SigTest
-	sig [Numeric, Numeric], Numeric,
-	def sum(x, y)
-		x + y
-	end
-
-	sig [:to_i, :to_i], Numeric,
-	def mul(x, y)
-		x * y
-	end
-
-	# nil means wildcard
-	sig [Integer, Numeric, String, :to_i], nil,
-	def args(a, b, c, d)
-	end
-end
-sig_obj = SigTest.new
-
-class ContractsTest
-	include Contracts
-
-	Contract Num, Num => Num
-	def sum(x, y)
-		x + y
-	end
-
-	Contract RespondTo[:to_i], RespondTo[:to_i] => Num
-	def mul(x, y)
-		x * y
-	end
-
-	Contract Int, Num, String, RespondTo[:to_i] => Any
-	def args(a, b, c, d)
-	end
-end
-contracts_obj = ContractsTest.new
-
-class TypecheckTest
-	extend Typecheck
-
-	typecheck 'Numeric, Numeric -> Numeric',
-	def sum(x, y)
-		x + y
-	end
-
-	typecheck '#to_i, #to_i -> Numeric',
-	def mul(x, y)
-		x * y
-	end
-
-	typecheck 'Integer, Numeric, String, #to_i -> BasicObject',
-	def args(a, b, c, d)
-	end
-end
-typecheck_obj = TypecheckTest.new
-
-Benchmark.ips do |x|
-	x.report("pure") do |times|
-		i = 0
-		while i < times
-			pure_obj.sum(1, 2)
-			pure_obj.mul(1, 2)
-			pure_obj.args(1, 2, "c", 4)
-			i += 1
-		end
-	end
-
-	x.report("rtype") do |times|
-		i = 0
-		while i < times
-			rtype_obj.sum(1, 2)
-			rtype_obj.mul(1, 2)
-			rtype_obj.args(1, 2, "c", 4)
-			i += 1
-		end
-	end
-
-	if is_mri
-		x.report("rubype") do |times|
-			i = 0
-			while i < times
-				rubype_obj.sum(1, 2)
-				rubype_obj.mul(1, 2)
-				rubype_obj.args(1, 2, "c", 4)
-				i += 1
-			end
-		end
-	end
-	
-	x.report("sig") do |times|
-		i = 0
-		while i < times
-			sig_obj.sum(1, 2)
-			sig_obj.mul(1, 2)
-			sig_obj.args(1, 2, "c", 4)
-			i += 1
-		end
-	end
-
-	x.report("contracts") do |times|
-		i = 0
-		while i < times
-			contracts_obj.sum(1, 2)
-			contracts_obj.mul(1, 2)
-			contracts_obj.args(1, 2, "c", 4)
-			i += 1
-		end
-	end
-
-	x.report("typecheck") do |times|
-		i = 0
-		while i < times
-			typecheck_obj.sum(1, 2)
-			typecheck_obj.mul(1, 2)
-			typecheck_obj.args(1, 2, "c", 4)
-			i += 1
-		end
-	end
-
-	x.compare!
+require 'benchmark/ips'
+
+is_mri = RUBY_ENGINE == 'ruby'
+
+require "rtype"
+require "rubype" if is_mri
+require "sig"
+require "contracts"
+require "contracts/version"
+require "typecheck"
+
+puts "Ruby version: #{RUBY_VERSION}"
+puts "Ruby engine: #{RUBY_ENGINE}"
+puts "Ruby description: #{RUBY_DESCRIPTION}"
+
+puts "Rtype version: #{Rtype::VERSION}"
+puts "Rubype version: #{Rubype::VERSION}" if is_mri
+puts "Sig version: #{Sig::VERSION}"
+puts "Contracts version: #{Contracts::VERSION}"
+puts "Typecheck version: #{Typecheck::VERSION}"
+
+class PureTest
+	def sum(x, y)
+		x + y
+	end
+
+	def mul(x, y)
+		x * y
+	end
+
+	def args(a, b, c, d)
+	end
+end
+pure_obj = PureTest.new
+
+class RtypeTest
+	rtype [Numeric, Numeric] => Numeric
+	def sum(x, y)
+		x + y
+	end
+
+	rtype [:to_i, :to_i] => Numeric
+	def mul(x, y)
+		x * y
+	end
+
+	rtype [Integer, Numeric, String, :to_i] => Any
+	def args(a, b, c, d)
+	end
+end
+rtype_obj = RtypeTest.new
+
+if is_mri
+	class RubypeTest
+		def sum(x, y)
+			x + y
+		end
+		typesig :sum, [Numeric, Numeric] => Numeric
+
+		def mul(x, y)
+			x * y
+		end
+		typesig :mul, [:to_i, :to_i] => Numeric
+
+		def args(a, b, c, d)
+		end
+		typesig :args, [Integer, Numeric, String, :to_i] => Any
+	end
+	rubype_obj = RubypeTest.new
+end
+
+class SigTest
+	sig [Numeric, Numeric], Numeric,
+	def sum(x, y)
+		x + y
+	end
+
+	sig [:to_i, :to_i], Numeric,
+	def mul(x, y)
+		x * y
+	end
+
+	# nil means wildcard
+	sig [Integer, Numeric, String, :to_i], nil,
+	def args(a, b, c, d)
+	end
+end
+sig_obj = SigTest.new
+
+class ContractsTest
+	include Contracts
+
+	Contract Num, Num => Num
+	def sum(x, y)
+		x + y
+	end
+
+	Contract RespondTo[:to_i], RespondTo[:to_i] => Num
+	def mul(x, y)
+		x * y
+	end
+
+	Contract Int, Num, String, RespondTo[:to_i] => Any
+	def args(a, b, c, d)
+	end
+end
+contracts_obj = ContractsTest.new
+
+class TypecheckTest
+	extend Typecheck
+
+	typecheck 'Numeric, Numeric -> Numeric',
+	def sum(x, y)
+		x + y
+	end
+
+	typecheck '#to_i, #to_i -> Numeric',
+	def mul(x, y)
+		x * y
+	end
+
+	typecheck 'Integer, Numeric, String, #to_i -> BasicObject',
+	def args(a, b, c, d)
+	end
+end
+typecheck_obj = TypecheckTest.new
+
+Benchmark.ips do |x|
+	x.report("pure") do |times|
+		i = 0
+		while i < times
+			pure_obj.sum(1, 2)
+			pure_obj.mul(1, 2)
+			pure_obj.args(1, 2, "c", 4)
+			i += 1
+		end
+	end
+
+	x.report("rtype") do |times|
+		i = 0
+		while i < times
+			rtype_obj.sum(1, 2)
+			rtype_obj.mul(1, 2)
+			rtype_obj.args(1, 2, "c", 4)
+			i += 1
+		end
+	end
+
+	if is_mri
+		x.report("rubype") do |times|
+			i = 0
+			while i < times
+				rubype_obj.sum(1, 2)
+				rubype_obj.mul(1, 2)
+				rubype_obj.args(1, 2, "c", 4)
+				i += 1
+			end
+		end
+	end
+	
+	x.report("sig") do |times|
+		i = 0
+		while i < times
+			sig_obj.sum(1, 2)
+			sig_obj.mul(1, 2)
+			sig_obj.args(1, 2, "c", 4)
+			i += 1
+		end
+	end
+
+	x.report("contracts") do |times|
+		i = 0
+		while i < times
+			contracts_obj.sum(1, 2)
+			contracts_obj.mul(1, 2)
+			contracts_obj.args(1, 2, "c", 4)
+			i += 1
+		end
+	end
+
+	x.report("typecheck") do |times|
+		i = 0
+		while i < times
+			typecheck_obj.sum(1, 2)
+			typecheck_obj.mul(1, 2)
+			typecheck_obj.args(1, 2, "c", 4)
+			i += 1
+		end
+	end
+
+	x.compare!
 end

data/lib/rtype/argument_type_error.rb

@@ -1,4 +1,4 @@
-module Rtype
-	class ArgumentTypeError < ArgumentError
-	end
+module Rtype
+	class ArgumentTypeError < ArgumentError
+	end
 end

data/lib/rtype/behavior/and.rb

@@ -1,24 +1,24 @@
-module Rtype
-	module Behavior
-		class And < Base
-			def initialize(*types)
-				@types = types
-			end
-
-			def valid?(value)
-				@types.all? do |e|
-					Rtype::valid? e, value
-				end
-			end
-
-			def error_message(value)
-				arr = @types.map { |e| Rtype::type_error_message(e, value) }
-				arr.join "\nAND "
-			end
-		end
-	end
-
-	def self.and(*args)
-		Behavior::And[*args]
-	end
+module Rtype
+	module Behavior
+		class And < Base
+			def initialize(*types)
+				@types = types
+			end
+
+			def valid?(value)
+				@types.all? do |e|
+					Rtype::valid? e, value
+				end
+			end
+
+			def error_message(value)
+				arr = @types.map { |e| Rtype::type_error_message(e, value) }
+				arr.join "\nAND "
+			end
+		end
+	end
+
+	def self.and(*args)
+		Behavior::And[*args]
+	end
 end

data/lib/rtype/behavior/base.rb

@@ -1,17 +1,17 @@
-module Rtype
-	module Behavior
-		class Base
-			def self.[](*vals)
-				new(*vals)
-			end
-
-			def valid?(value)
-				raise NotImplementedError, "Abstract method"
-			end
-
-			def error_message(value)
-				raise NotImplementedError, "Abstract method"
-			end
-		end
-	end
+module Rtype
+	module Behavior
+		class Base
+			def self.[](*vals)
+				new(*vals)
+			end
+
+			def valid?(value)
+				raise NotImplementedError, "Abstract method"
+			end
+
+			def error_message(value)
+				raise NotImplementedError, "Abstract method"
+			end
+		end
+	end
 end

data/lib/rtype/behavior/core_ext.rb

@@ -1,22 +1,22 @@
-class Object
-	def and(*others)
-		::Rtype::and(self, *others)
-	end
-
-	def nilable
-		::Rtype::nilable(self)
-	end
-	alias_method :or_nil, :nilable
-
-	def not
-		::Rtype::not(self)
-	end
-
-	def or(*others)
-		::Rtype::or(self, *others)
-	end
-
-	def xor(*others)
-		::Rtype::xor(self, *others)
-	end
+class Object
+	def and(*others)
+		::Rtype::and(self, *others)
+	end
+
+	def nilable
+		::Rtype::nilable(self)
+	end
+	alias_method :or_nil, :nilable
+
+	def not
+		::Rtype::not(self)
+	end
+
+	def or(*others)
+		::Rtype::or(self, *others)
+	end
+
+	def xor(*others)
+		::Rtype::xor(self, *others)
+	end
 end

data/lib/rtype/behavior/nilable.rb

@@ -1,21 +1,21 @@
-module Rtype
-	module Behavior
-		class Nilable < Base
-			def initialize(type)
-				@type = type
-			end
-
-			def valid?(value)
-				value.nil? || Rtype::valid?(@type, value)
-			end
-
-			def error_message(value)
-				Rtype::type_error_message(@type, value) + "\nOR " + Rtype::type_error_message(nil, value)
-			end
-		end
-	end
-
-	def nilable(*args)
-		Behavior::Nilable[*args]
-	end
+module Rtype
+	module Behavior
+		class Nilable < Base
+			def initialize(type)
+				@type = type
+			end
+
+			def valid?(value)
+				value.nil? || Rtype::valid?(@type, value)
+			end
+
+			def error_message(value)
+				Rtype::type_error_message(@type, value) + "\nOR " + Rtype::type_error_message(nil, value)
+			end
+		end
+	end
+
+	def nilable(*args)
+		Behavior::Nilable[*args]
+	end
 end

data/lib/rtype/behavior/not.rb

@@ -1,24 +1,24 @@
-module Rtype
-	module Behavior
-		class Not < Base
-			def initialize(*types)
-				@types = types
-			end
-
-			def valid?(value)
-				@types.all? do |e|
-					!Rtype::valid?(e, value)
-				end
-			end
-
-			def error_message(value)
-				arr = @types.map { |e| "NOT " + Rtype::type_error_message(e, value) }
-				arr.join "\nAND "
-			end
-		end
-	end
-
-	def not(*args)
-		Behavior::Not[*args]
-	end
+module Rtype
+	module Behavior
+		class Not < Base
+			def initialize(*types)
+				@types = types
+			end
+
+			def valid?(value)
+				@types.all? do |e|
+					!Rtype::valid?(e, value)
+				end
+			end
+
+			def error_message(value)
+				arr = @types.map { |e| "NOT " + Rtype::type_error_message(e, value) }
+				arr.join "\nAND "
+			end
+		end
+	end
+
+	def not(*args)
+		Behavior::Not[*args]
+	end
 end

data/lib/rtype/behavior/or.rb

@@ -1,24 +1,24 @@
-module Rtype
-	module Behavior
-		class Or < Base
-			def initialize(*types)
-				@types = types
-			end
-
-			def valid?(value)
-				@types.any? do |e|
-					Rtype::valid? e, value
-				end
-			end
-
-			def error_message(value)
-				arr = @types.map { |e| Rtype::type_error_message(e, value) }
-				arr.join "\nOR "
-			end
-		end
-	end
-
-	def or(*args)
-		Behavior::Or[*args]
-	end
+module Rtype
+	module Behavior
+		class Or < Base
+			def initialize(*types)
+				@types = types
+			end
+
+			def valid?(value)
+				@types.any? do |e|
+					Rtype::valid? e, value
+				end
+			end
+
+			def error_message(value)
+				arr = @types.map { |e| Rtype::type_error_message(e, value) }
+				arr.join "\nOR "
+			end
+		end
+	end
+
+	def or(*args)
+		Behavior::Or[*args]
+	end
 end