algebrick 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c10eb07ed10cdcc7fd01fda3b2dccf42786db60f
-  data.tar.gz: 72b0ecfd3d3ce1bc20c5683adeabb3d2b5915bfe
+  metadata.gz: 2f929febec0436c6ff1ddacdefe7936cd29be50d
+  data.tar.gz: 929a7fad56a10ef56de4dd09c9309d138fc92b85
 SHA512:
-  metadata.gz: 3d1dfceee22b44ed971953d37d3cb9e8e5caf03a2cdbda3be251c9e778f1a5e3ae7be41f2dfc17f3ea1ba7dc63f5a908ff481571957fe18b6267d4670f8d8be7
-  data.tar.gz: a0ed769069be44d01001a2657a07db0aa3ad3d184afb290d38bc2a82c0c72237737867f972380cc496689f4ee9169f1b3b6081eea7a6a792976c1a10b1621f7c
+  metadata.gz: f2c50e7f1fc3777edb0743ba8da7ed2096424576701f16236f41e9aef8efd60a234f2a587d2b97dbd1fffc0953d8242cb0880688c0b2922af4a25c3da1a8d537
+  data.tar.gz: eb8666dbb9f3908dec24a4e300a9cfe6a00bb7d7ef2d4ae1c3bf1f4a6f992f760a4904748f5ab44a6da866c94754aad810cec7987cd67505f2ff39374424f439

data/README.md

@@ -6,7 +6,7 @@ It's a gem providing **algebraic types** and **pattern matching** seamlessly int
 
 -   Documentation: <http://blog.pitr.ch/algebrick>
 -   Source: <https://github.com/pitr-ch/algebrick>
--   Blog: <http://blog.pitr.ch/blog/categories/algebrick/>
+-   Blog: <http://blog.pitr.ch/tag/algebrick.html>
 
 ## What is it good for?
 

data/README_FULL.md

@@ -80,6 +80,11 @@ They use standard `#===` method to match against values.
 
 ## What is it good for?
 
+### TODO
+
+-  record like structures
+-  creating new types by summing existing
+
 ### Defining data structures
 
 <!-- {include:file:doc/data.out.rb} -->

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/doc/format.rb

@@ -3,9 +3,8 @@ require 'bundler/setup'
 require 'pry'
 require 'pp'
 
-root        = File.dirname(File.expand_path(Process.argv0))
 input_paths = if ARGV.empty?
-                Dir.glob("#{root}/*.in.rb")
+                Dir.glob("#{File.dirname(__FILE__)}/*.in.rb")
               else
                 ARGV
               end.map { |p| File.expand_path p }
@@ -13,7 +12,7 @@ input_paths = if ARGV.empty?
 input_paths.each_with_index do |input_path, i|
 
   pid = fork do
-    require File.join(root, 'init.rb')
+    require_relative 'init.rb'
 
     begin
       output_path = input_path.gsub /\.in\.rb$/, '.out.rb'

data/doc/json.out.rb

@@ -20,7 +20,7 @@ require 'algebrick/serializer'                     # => true
 require 'multi_json'                               # => true
 
 # Prepare a message for sending.
-serializer   = Algebrick::Serializer.new           # => #<Algebrick::Serializer:0x007fafcc96f6a8>
+serializer   = Algebrick::Serializer.new           # => #<Algebrick::Serializer:0x007fab42bdf6d8>
 request      = CreateUser[User['root', 'lajDh4']]
     # => CreateUser[User[login: root, password: lajDh4]]
 raw_request  = MultiJson.dump serializer.dump(request)

data/lib/algebrick.rb

@@ -39,9 +39,6 @@
 
 # TODO maybe should behave as monad
 
-# TODO anonymous types ? missing tests
-
-
 # Provides Algebraic types and pattern matching
 #
 # **Quick example**

data/lib/algebrick/atom.rb

@@ -39,7 +39,7 @@ module Algebrick
     end
 
     def to_s
-      name
+      name || 'nameless-atom'
     end
 
     def pretty_print(q)

data/lib/algebrick/matching.rb

@@ -20,6 +20,12 @@ module Algebrick
     end
 
     def match(value, *cases)
+      success, result = match? value, *cases
+      raise "no match for (#{value.class}) '#{value}' by any of #{cases.map(&:first).join ', '}" unless success
+      result
+    end
+
+    def match?(value, *cases)
       cases = if cases.size == 1 && cases.first.is_a?(Hash)
                 cases.first
               else
@@ -27,9 +33,9 @@ module Algebrick
               end
 
       cases.each do |matcher, block|
-        return Matching.match_value matcher, block if matcher === value
+        return true, Matching.match_value(matcher, block) if matcher === value
       end
-      raise "no match for (#{value.class}) '#{value}' by any of #{cases.map(&:first).join ', '}"
+      [false, nil]
     end
 
     def on(matcher, value = nil, &block)

data/lib/algebrick/product_variant.rb

@@ -25,8 +25,8 @@ module Algebrick
 
     def initialize(name, &definition)
       super(name, &definition)
-      @to_be_kind_of = []
-      @final_variants  = false
+      @to_be_kind_of  = []
+      @final_variants = false
     end
 
     def set_fields(fields_or_hash)
@@ -105,7 +105,7 @@ module Algebrick
     def apply_be_kind_of
       @to_be_kind_of.each do |type|
         @constructor.send :include, type if @constructor
-        variants.each { |v| v.be_kind_of type unless v == self } if @variants
+        variants.each { |v| v.be_kind_of type if v != self && v.respond_to?(:be_kind_of) } if @variants
       end
     end
 
@@ -137,12 +137,12 @@ module Algebrick
               if variant == self
                 product_to_s
               else
-                variant.name
+                sub_type variant
               end
             end.join(' | ') +
             ')'
       when :variant
-        "#{name}(#{variants.map(&:name).join ' | '})"
+        "#{name}(#{variants.map { |v| sub_type v }.join ' | '})"
       else
         raise
       end
@@ -182,6 +182,12 @@ module Algebrick
       "#{name}(#{fields_str.join ', '})"
     end
 
+    def sub_type(type)
+      return type.name unless type.name.nil?
+      return '(recursive)' if type == self # FIXME: will not catch deeper recursions
+      return type.to_s
+    end
+
     def add_field_names(names)
       @field_names = names
       names.all? { |k| Type! k, Symbol }

data/lib/algebrick/type.rb

@@ -26,7 +26,7 @@ module Algebrick
     end
 
     def name
-      super || @name || 'NoName'
+      super || @name || nil
     end
 
     def to_m(*args)

data/lib/algebrick/types.rb

@@ -32,27 +32,39 @@ module Algebrick
       variants TrueClass, FalseClass
     end
 
-    LinkedList = Algebrick.type(:value_type) do |list|
+    List = Algebrick.type(:value_type) do |list|
       fields! value: :value_type, next: list
-      variants EmptyLinkedList = atom, list
+      variants EmptyList = atom, list
     end
 
-    module LinkedList
+    module List
       include Enumerable
 
       def each(&block)
+        return to_enum unless block_given?
+
         it = self
         loop do
-          break if LinkedListEmpty === it
+          break if EmptyList === it
           block.call it.value
           it = it.next
         end
+
+        self
       end
 
       def next?
-        self.next != EmptyLinkedList
+        self.next != EmptyList
+      end
+
+      def empty?
+        !next?
       end
-     end
+
+      def self.build(type, *items)
+        items.reverse_each.reduce(EmptyList) { |list, item| self[type][item, list] }
+      end
+    end
   end
 
   include Types

data/spec/algebrick_test.rb

@@ -669,6 +669,31 @@ Named[
     it { List.(any, List) === List[1, Empty] }
   end
 
+  describe 'LinkedList' do
+    specify do
+      Algebrick::List.build(Integer, 1, 2).must_equal(
+          Algebrick::List[Integer][
+              value: 1,
+              next:  Algebrick::List[Integer][
+                         value: 2,
+                         next:  Algebrick::Types::EmptyList]]
+      )
+      assert_equal %w[1 2],
+                   Algebrick::List.build(Integer, 1, 2).map(&:to_s)
+    end
+
+    TreeList = Algebrick.type do
+      fields! tag: String, trees: Algebrick::List[Tree]
+    end
+
+    specify do
+      assert_equal 'TreeList(tag: String, trees: Algebrick::Types::List[Tree(Empty | Leaf | Node)])',
+                   TreeList.to_s
+      assert_equal 'TreeList[tag: tag, trees: Algebrick::Types::List[Tree(Empty | Leaf | Node)][value: Node[Empty, Empty], next: Algebrick::Types::EmptyList]]',
+                   TreeList['tag', Algebrick::List.build(Tree, Node[Empty, Empty])].to_s
+    end
+  end
+
   require 'algebrick/serializer'
 
   describe 'serializer' do
@@ -730,6 +755,26 @@ Named[
         serializer.load(from).must_equal to
       end
     end
+
+    describe 'no name types' do
+      WithNoName = Algebrick.type do |t|
+        fields a: String, v: t
+        variants t,
+                 type { |it| variants TrueClass, FalseClass, it },
+                 type { fields string: String },
+                 atom
+      end
+
+      it 'prints reasonably' do
+        assert_equal 'WithNoName(WithNoName(a: String, v: WithNoName) | (TrueClass | FalseClass | (recursive)) | (string: String) | nameless-atom)',
+                     WithNoName.to_s
+        assert_equal '(TrueClass | FalseClass | (recursive))', WithNoName.variants[1].to_s
+        assert_equal '(string: String)', WithNoName.variants[2].to_s
+        assert_equal 'nameless-atom', WithNoName.variants[3].to_s
+
+      end
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: algebrick
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Petr Chalupa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest