algebrick 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c01f50d4cf102467631891110b1ee7df7d90375e
-  data.tar.gz: ff62352d8e0893a2bc6f4c2d71e183aa6bfbcdb2
+  metadata.gz: 3afd890330088870db253424a7296f619666dbe5
+  data.tar.gz: 6660ee990c34420c9599f5cb2f43a80c1d33ae4e
 SHA512:
-  metadata.gz: 7b0ac037c8e10a26de02a2194085248f18947034713db0a9cb4d0b687052df3160f73e86ea3715c74f570cd41987e4f99b6bde87e630d96cc4be23f9edc1c9e3
-  data.tar.gz: 2ba7c6fb2338c87d9fb51a8e5890d321742e6878ae7e1b10cff9da409b5b4054484340d0f3a6c598f5c22be94fddf6da20e881bebffaf85da74ef0ffd8d72e10
+  metadata.gz: d737796cb0b2ece44f606cf2d5cc9c6273893b23de0c355ebb290f09e6e35e997d33af220298bded254281ffe71cfed4abd5680c3646a004f385c7240b306980
+  data.tar.gz: baeb8506f6f66ee19891b1f2921b8fe45e4aa5efeecb22b2e2b3b6c23ad4e421ebad7f7c2c035d88b6563028adadcd7b9805d67c2a9b8ae72715b0e6afb70f96

data/README.md

@@ -20,11 +20,9 @@ Let's define a Tree
 
 ```ruby
 Tree = Algebrick.type do |tree|
-  Empty = type
-  Leaf  = type { fields Integer }
-  Node  = type { fields tree, tree }
-
-  variants Empty, Leaf, Node
+  variants Empty = atom,
+           Leaf  = type { fields Integer },
+           Node  = type { fields tree, tree }
 end
 ```
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/algebrick.rb

@@ -18,6 +18,8 @@
 # TODO add method matcher (:size, matcher)
 # TODO Menu modeling example, add TypedArray
 # TODO update actor pattern example when gem is done
+# TODO gemmify reclude
+# TODO gemmify typecheck
 
 require 'monitor'
 
@@ -32,40 +34,90 @@ module Algebrick
     @version ||= Gem::Version.new File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))
   end
 
+  # fix module to re-include itself to where it was already included when a module is included into it
+  module Reclude
+    def included(base)
+      included_into << base
+      super base
+    end
+
+    def include(*modules)
+      super(*modules)
+      modules.reverse.each do |module_being_included|
+        included_into.each do |mod|
+          mod.send :include, module_being_included
+        end
+      end
+    end
+
+    private
+
+    def included_into
+      @included_into ||= []
+    end
+  end
+
   module TypeCheck
-    def is_kind_of?(value, *types)
-      a_type_check :kind_of?, false, value, *types
+    def Type?(value, *types)
+      types.any? { |t| value.is_a? t }
     end
 
-    def is_kind_of!(value, *types)
-      a_type_check :kind_of?, true, value, *types
+    def Type!(value, *types)
+      Type?(value, *types) or
+          TypeCheck.error(value, 'is not', types)
+      value
     end
 
-    def is_matching?(value, *types)
-      a_type_check :===, false, value, *types
+    def Match?(value, *types)
+      types.any? { |t| t === value }
     end
 
-    def is_matching!(value, *types)
-      a_type_check :===, true, value, *types
+    def Match!(value, *types)
+      Match?(value, *types) or
+          TypeCheck.error(value, 'is not matching', types)
+      value
+    end
+
+    def Child?(value, *types)
+      Type?(value, Class) &&
+          types.any? { |t| value <= t }
+    end
+
+    def Child!(value, *types)
+      Child?(value, *types) or
+          TypeCheck.error(value, 'is not child', types)
+      value
     end
 
     private
 
-    def a_type_check(which, bang, value, *types)
-      ok = types.any? do |t|
-        case which
-        when :===
-          t === value
-        when :kind_of?
-          value.kind_of? t
-        else
-          raise ArgumentError
-        end
-      end
-      bang && !ok and
-          raise TypeError,
-                "value (#{value.class}) '#{value}' is not ##{which} any of #{types.join(', ')}"
-      bang ? value : ok
+    def self.error(value, message, types)
+      raise TypeError,
+            "value (#{value.class}) '#{value}' #{message} any of #{types.join(', ')}"
+    end
+
+    public
+
+    raise 'remove deprecations' if Algebrick.version >= Gem::Version.new('0.4')
+
+    def is_kind_of?(value, *types)
+      warn "is_kind_of? is deprecated use Type?\n#{caller[0]}"
+      Type? value, *types
+    end
+
+    def is_kind_of!(value, *types)
+      warn "Type! is deprecated use Type!\n#{caller[0]}"
+      Type! value, *types
+    end
+
+    def is_matching?(value, *types)
+      warn "is_matching? is deprecated use Match?\n#{caller[0]}"
+      Match? value, *types
+    end
+
+    def is_matching!(value, *types)
+      warn "is_matching! is deprecated use Match!\n#{caller[0]}"
+      Match! value, *types
     end
   end
 
@@ -90,6 +142,8 @@ module Algebrick
       raise "no match for (#{value.class}) '#{value}' by any of #{cases.map(&:first).join ', '}"
     end
 
+    # TODO #match! raise when match is not complete on a given type
+
     private
 
     def self.match_value(matcher, block)
@@ -147,6 +201,7 @@ module Algebrick
     include TypeCheck
     include Matching
     include MatcherDelegations
+    include Reclude
 
     def initialize(name, &definition)
       super &definition
@@ -258,9 +313,7 @@ module Algebrick
       if fields.size == 1 && fields.first.is_a?(Hash)
         fields = type.field_names.map { |k| fields.first[k] }
       end
-      @fields = fields.zip(self.class.type.fields).map do |field, type|
-        is_kind_of! field, type
-      end.freeze
+      @fields = fields.zip(self.class.type.fields).map { |field, type| Type! field, type }.freeze
     end
 
     def to_s
@@ -336,9 +389,9 @@ module Algebrick
                        raise ArgumentError
                      end
 
-      set_field_names keys if keys
+      add_field_names keys if keys
 
-      fields.all? { |f| is_kind_of! f, Type, Class, Module }
+      fields.all? { |f| Type! f, Type, Class, Module }
       raise TypeError, 'there is no product with zero fields' unless fields.size > 0
       define_method(:value) { @fields.first } if fields.size == 1
       @fields      = fields
@@ -378,7 +431,7 @@ module Algebrick
 
     def set_variants(variants)
       raise TypeError, 'can be set only once' if @variants
-      variants.all? { |v| is_kind_of! v, Type, Class }
+      variants.all? { |v| Type! v, Type, Class }
       @variants = variants
       apply_be_kind_of
       variants.each do |v|
@@ -500,9 +553,9 @@ module Algebrick
       "#{name}(#{fields_str.join ', '})"
     end
 
-    def set_field_names(names)
+    def add_field_names(names)
       @field_names = names
-      names.all? { |k| is_kind_of! k, Symbol }
+      names.all? { |k| Type! k, Symbol }
       dict = @field_indexes =
           Hash.new { |h, k| raise ArgumentError, "unknown field #{k.inspect} in #{self}" }.
               update names.each_with_index.inject({}) { |h, (k, i)| h.update k => i }
@@ -516,7 +569,7 @@ module Algebrick
 
       fields = hash[FIELDS_KEY] || hash[FIELDS_KEY.to_s] ||
           hash.reject { |k, _| k.to_s == TYPE_KEY.to_s }
-      is_kind_of! fields, Hash, Array
+      Type! fields, Hash, Array
 
       case fields
       when Array
@@ -555,7 +608,7 @@ module Algebrick
     attr_reader :variables, :fields, :variants
 
     def initialize(variables)
-      @variables     = variables.each { |v| is_kind_of! v, Symbol }
+      @variables     = variables.each { |v| Type! v, Symbol }
       @fields        = nil
       @variants      = nil
       @cache         = {}
@@ -563,7 +616,7 @@ module Algebrick
     end
 
     def set_fields(fields)
-      @fields = is_kind_of! fields, Hash, Array
+      @fields = Type! fields, Hash, Array
     end
 
     def field_names
@@ -578,7 +631,7 @@ module Algebrick
     end
 
     def set_variants(variants)
-      @variants = is_kind_of! variants, Array
+      @variants = Type! variants, Array
     end
 
     def [](*assigned_types)
@@ -664,7 +717,7 @@ module Algebrick
       attr_reader :new_type
 
       def initialize(new_type, &block)
-        @new_type = is_kind_of! new_type, ProductVariant, ParametrizedType
+        @new_type = Type! new_type, ProductVariant, ParametrizedType
         instance_exec @new_type, &block
         @new_type.kind if @new_type.is_a? ProductVariant
       end
@@ -1039,7 +1092,7 @@ module Algebrick
 
       def initialize(algebraic_type, *field_matchers)
         super()
-        @algebraic_type = is_kind_of! algebraic_type, Algebrick::ProductVariant, Algebrick::ParametrizedType
+        @algebraic_type = Type! algebraic_type, Algebrick::ProductVariant, Algebrick::ParametrizedType
         raise ArgumentError unless algebraic_type.fields
         @field_matchers = case
 
@@ -1102,7 +1155,7 @@ module Algebrick
     class Variant < Wrapper
       def initialize(something)
         raise ArgumentError unless something.variants
-        is_kind_of! something, Algebrick::ProductVariant
+        Type! something, Algebrick::ProductVariant
         super something
       end
 
@@ -1113,7 +1166,7 @@ module Algebrick
 
     class Atom < Wrapper
       def initialize(something)
-        is_kind_of! something, Algebrick::Atom
+        Type! something, Algebrick::Atom
         super something
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: algebrick
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Petr Chalupa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest