finitio 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46d8b55dce1f11c02ca0a953a8688fe6f6e66851
-  data.tar.gz: 9278c34a8fc3e05e89b05a9925539dabfbbc1ca5
+  metadata.gz: 2a0323f2adb7a1633153813167df123264370f86
+  data.tar.gz: 610d4134c0eb64b1b3b2c1b525ed70a87a86d2df
 SHA512:
-  metadata.gz: dfc507bf5246aa52b6d54743ff88aad279e2aa0c8bcef499740484e13c977ebfdc751e3d0a3ca2d1daa48fc50fe565b9e98e74b6ee28edea4b5892f2091d4f14
-  data.tar.gz: ac994264f34c3c161c7a1a962ce57c28be8fc18235737cd9000ba26ff3b661fcca6fe16ec0e9e382cfb228093b010f9637c25ecf886f9ac88705d3941140693f
+  metadata.gz: 67d9b094d0f0b18ace3261583232c560ef696d13d5651a378b7c84b938a9c4e253b29804c151ac7eb2c7a5e2ef933fae4372bec8e2c48439a99041e1894d346c
+  data.tar.gz: e4bfed73b3a3921cb288a0f43fd3109f1ba0afeecdfd8549d5c2e3aff4349fe7aef946e1511d79ffe023151af64bc5cc51127ec97f8d91443b60dc502ddf2d50

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-# 0.5.1 / 2017-01-08
+# 0.6.0 / 2018-02-17
+
+* Add support for typed extra attributes, e.g. { ...: Integer }
+
+# 0.5.2 / 2017-01-08
 
 * Disable memoization in parser because it leads to terrible performance
   issues on some schemas.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    finitio (0.5.1)
+    finitio (0.6.0)
       citrus (>= 2.4, < 4.0)
 
 GEM
@@ -66,3 +66,6 @@ DEPENDENCIES
   path (~> 1.3)
   rake (~> 10.0)
   rspec (~> 3.0)
+
+BUNDLED WITH
+   1.16.0

data/lib/finitio.rb

@@ -11,6 +11,8 @@ module Finitio
 
   IDENTITY = ->(object){ object }
 
+  ANY_TYPE = AnyType.new
+
   def parse(source)
     require "finitio/syntax"
     Syntax.parse(source)

data/lib/finitio/support/heading.rb

@@ -38,8 +38,13 @@ module Finitio
     end
 
     def allow_extra?
+      !!options[:allow_extra]
+    end
+
+    def allow_extra
       options[:allow_extra]
     end
+    alias :extra_type :allow_extra
 
     def each(&bl)
       return to_enum unless bl
@@ -51,6 +56,7 @@ module Finitio
       if allow_extra?
         name << ", " unless empty?
         name << "..."
+        name << ": #{allow_extra.name}" unless allow_extra == ANY_TYPE
       end
       name
     end
@@ -88,9 +94,16 @@ module Finitio
     end
 
     def normalize_options(opts)
-      options = DEFAULT_OPTIONS
-      options = options.merge(opts).freeze if opts
-      options
+      options = DEFAULT_OPTIONS.dup
+      options = options.merge(opts) if opts
+      options[:allow_extra] = case extra = options[:allow_extra]
+      when TrueClass            then ANY_TYPE
+      when NilClass, FalseClass then nil
+      when Type                 then extra
+      else
+        raise ArgumentError, "Unrecognized allow_extra: #{extra}"
+      end
+      options.freeze
     end
 
   end # class Heading

data/lib/finitio/syntax/type.rb

@@ -5,6 +5,7 @@ require_relative 'type/main_type'
 require_relative 'type/expression'
 require_relative 'type/attribute'
 require_relative 'type/heading'
+require_relative 'type/heading_extra'
 require_relative 'type/any_type'
 require_relative 'type/builtin_type'
 require_relative 'type/sub_type'

data/lib/finitio/syntax/type/heading.rb

@@ -18,11 +18,14 @@ module Finitio
       end
 
       def compile(factory)
-        Finitio::Heading.new(attributes(factory), allow_extra: allow_extra?)
+        options = allow_extra ? allow_extra.compile(factory) : {}
+        Finitio::Heading.new(attributes(factory), options)
       end
 
       def to_ast
-        captures[:attribute].map(&:to_ast).unshift(:heading)
+        ast = captures[:attribute].map(&:to_ast).unshift(:heading)
+        ast << allow_extra.to_ast if allow_extra
+        ast
       end
 
     end # module Heading

data/lib/finitio/syntax/type/heading_extra.rb

@@ -0,0 +1,18 @@
+module Finitio
+  module Syntax
+    module HeadingExtra
+      include Node
+
+      capture :extra_type
+
+      def compile(factory)
+        { allow_extra: extra_type ? extra_type.compile(factory) : true }
+      end
+
+      def to_ast
+        { allow_extra: extra_type ? extra_type.to_ast : true }
+      end
+
+    end # module HeadingExtra
+  end # module Syntax
+end # module Finitio

data/lib/finitio/syntax/types.citrus

@@ -72,10 +72,15 @@ grammar Finitio::Syntax::Types
   end
 
   rule heading
-    (attribute? (opt_comma attribute)* (opt_comma allow_extra:dots)? opt_comma?)
+    (attribute? (opt_comma attribute)* (opt_comma allow_extra:heading_extra)? opt_comma?)
     <Finitio::Syntax::Heading>
   end
 
+  rule heading_extra
+    (dots (':' spacing extra_type:type)?)
+    <Finitio::Syntax::HeadingExtra>
+  end
+
   rule attribute
     (metadata? attribute_name spacing multiplicity:(':?' | ':') spacing type)
     <Finitio::Syntax::Attribute>

data/lib/finitio/type/hash_based_type.rb

@@ -11,10 +11,11 @@ module Finitio
 
     def include?(value)
       value.is_a?(Hash) &&
-      valid_attrs?(value) &&
       heading.all?{|a|
         value.has_key?(a.name) ? a.type.include?(value[a.name]) : true
-      }
+      } &&
+      !missing_attr?(value) &&
+      valid_extra_attrs?(value)
     end
 
     # Convert `value` (supposed to be Hash) to a Tuple, by checking attributes
@@ -23,11 +24,6 @@ module Finitio
     def dress(value, handler = DressHelper.new)
       handler.failed!(self, value) unless looks_a_tuple?(value)
 
-      # Check for extra attributes
-      unless heading.allow_extra? or (extra = extra_attrs(value, true)).empty?
-        handler.fail!("Unrecognized attribute `#{extra.first}`")
-      end
-
       # Check for missing attributes
       unless (missing = missing_attrs(value, true)).empty?
         handler.fail!("Missing attribute `#{missing.first}`")
@@ -36,6 +32,21 @@ module Finitio
       # Uped values, i.e. tuple under construction
       uped = {}
 
+      # Check for extra attributes
+      extra = extra_attrs(value, true)
+      case extra_type = heading.extra_type
+      when NilClass
+        handler.fail!("Unrecognized attribute `#{extra.first}`") unless extra.empty?
+      when ANY_TYPE
+        # ok, nothing to do
+      else
+        extra.each do |attr|
+          handler.deeper(attr) do
+            uped[attr.to_sym] = extra_type.dress(value.fetch(attr), handler)
+          end
+        end
+      end
+
       # Up each attribute in turn now. Fail on missing ones.
       heading.each do |attribute|
         present = true
@@ -71,10 +82,6 @@ module Finitio
       attrs(value.keys, to_s) - attrs(attr_names, to_s)
     end
 
-    def extra_attr?(value, to_s = false)
-      !extra_attrs(value, to_s).empty?
-    end
-
     def missing_attrs(value, to_s = false)
       attrs(req_attr_names, to_s) - attrs(value.keys, to_s)
     end
@@ -83,8 +90,12 @@ module Finitio
       !missing_attrs(value, to_s).empty?
     end
 
-    def valid_attrs?(value, to_s = false)
-      (heading.allow_extra? || !extra_attr?(value, to_s)) && !missing_attr?(value)
+    def valid_extra_attrs?(value)
+      extra = self.extra_attrs(value)
+      return extra.empty? unless heading.allow_extra?
+      extra_type = heading.extra_type
+      return true if extra_type == ANY_TYPE
+      extra.all?{|attr| extra_type.include?(value[attr]) }
     end
 
   end # module HashBasedType

data/lib/finitio/version.rb

@@ -2,8 +2,8 @@ module Finitio
   module Version
 
     MAJOR = 0
-    MINOR = 5
-    TINY  = 2
+    MINOR = 6
+    TINY  = 0
 
     def self.to_s
       [ MAJOR, MINOR, TINY ].join('.')

data/spec/heading/test_allow_extra.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 module Finitio
-  describe Heading, "allow_extra" do
+  describe Heading, "allow_extra? and allow_extra" do
 
     let(:r){ Attribute.new(:r, intType) }
 
@@ -10,14 +10,26 @@ module Finitio
 
     it 'is false by default' do
       expect(heading([r])).not_to be_allow_extra
+      expect(heading([r]).allow_extra).to be_nil
+      expect(heading([r]).extra_type).to be_nil
     end
 
     it 'can be set to true' do
       expect(heading([r], allow_extra: true)).to be_allow_extra
+      expect(heading([r], allow_extra: true).allow_extra).to eq(anyType)
+      expect(heading([r], allow_extra: true).extra_type).to eq(anyType)
     end
 
     it 'can be set to false explicitely' do
       expect(heading([r], allow_extra: false)).not_to be_allow_extra
+      expect(heading([r]).allow_extra).to be_nil
+      expect(heading([r]).extra_type).to be_nil
+    end
+
+    it 'can be set to an explicit type' do
+      expect(heading([r], allow_extra: intType)).to be_allow_extra
+      expect(heading([r], allow_extra: intType).allow_extra).to eql(intType)
+      expect(heading([r], allow_extra: intType).extra_type).to eql(intType)
     end
 
   end

data/spec/heading/test_equality.rb

@@ -25,7 +25,13 @@ module Finitio
     it 'distinguishes between extra allowance' do
       h1 = heading([r], allow_extra: true)
       h2 = heading([r], allow_extra: false)
+      h3 = heading([r], allow_extra: anyType)
+      h4 = heading([r], allow_extra: intType)
+      h5 = heading([r], allow_extra: intType)
       expect(h1).not_to eq(h2)
+      expect(h1).to eq(h3)
+      expect(h1).not_to eq(h4)
+      expect(h4).to eq(h5)
     end
 
     it 'distinguishes between attribute types' do

data/spec/heading/test_hash.rb

@@ -25,7 +25,13 @@ module Finitio
     it 'is good enough to distinguish between extra allowance' do
       h1 = heading([r], allow_extra: true)
       h2 = heading([r], allow_extra: false)
+      h3 = heading([r], allow_extra: anyType)
+      h4 = heading([r], allow_extra: intType)
+      h5 = heading([r], allow_extra: intType)
       expect(h1.hash).not_to eq(h2.hash)
+      expect(h1.hash).to eq(h3.hash)
+      expect(h1.hash).not_to eq(h4.hash)
+      expect(h4.hash).to eq(h5.hash)
     end
 
     it 'is be good enough to distinguish between different headings' do

data/spec/heading/test_multi.rb

@@ -53,5 +53,16 @@ module Finitio
       it{ should eq(true) }
     end
 
+    context 'with allow_extra set to a type' do
+      let(:attributes){
+        [ red, blue ]
+      }
+      let(:options){
+        {allow_extra: intType}
+      }
+
+      it{ should eq(true) }
+    end
+
   end
 end

data/spec/heading/test_to_name.rb

@@ -48,6 +48,12 @@ module Finitio
       it{ should eq('red: intType, ...') }
     end
 
+    context 'when allowing extra to a type' do
+      let(:heading){ Heading.new([red], allow_extra: intType) }
+
+      it{ should eq('red: intType, ...: intType') }
+    end
+
     context 'when allowing extra only' do
       let(:heading){ Heading.new([], allow_extra: true) }
 

data/spec/spec_helper.rb

@@ -44,6 +44,10 @@ end
 
 module SpecHelpers
 
+  def anyType
+    Finitio::AnyType.new
+  end
+
   def intType
     Finitio::BuiltinType.new(Integer, "intType")
   end
@@ -72,10 +76,22 @@ module SpecHelpers
     @positive ||= Finitio::Constraint.new(->(i){ i>=0 }, :positive)
   end
 
+  def negative
+    @negative ||= Finitio::Constraint.new(->(i){ i<0 }, :negative)
+  end
+
   def byte
     Finitio::SubType.new(intType, [byte_full])
   end
 
+  def posInt
+    Finitio::SubType.new(intType, [positive])
+  end
+
+  def negInt
+    Finitio::SubType.new(intType, [negative])
+  end
+
   def type_factory
     Finitio::TypeFactory.new
   end

data/spec/syntax/nodes/test_heading.rb

@@ -55,22 +55,60 @@ module Finitio
           expect(compiled.to_name).to eq('a: Integer, ...')
         end
       end
+
+      context 'a: .Integer, ...: .String' do
+        let(:input){ 'a: .Integer, ...: .String' }
+
+        it 'compiles to a Heading' do
+          expect(compiled).to be_a(Heading)
+          expect(compiled.to_name).to eq('a: Integer, ...: String')
+        end
+      end
     end
 
     describe "AST" do
-      let(:input){ 'a: .Integer, b: .Float' }
 
       let(:ast){
         subject.to_ast
       }
 
-      it{
-        expect(ast).to eq([
-          :heading,
-          [ :attribute, "a", [:builtin_type, "Integer" ]],
-          [ :attribute, "b", [:builtin_type, "Float" ]]
-        ])
-      }
+      context 'when not using allow extra' do
+        let(:input){ 'a: .Integer, b: .Float' }
+
+        it{
+          expect(ast).to eq([
+            :heading,
+            [ :attribute, "a", [:builtin_type, "Integer" ]],
+            [ :attribute, "b", [:builtin_type, "Float" ]]
+          ])
+        }
+      end
+
+      context 'when specifying allow extra without type' do
+        let(:input){ 'a: .Integer, b: .Float, ...' }
+
+        it{
+          expect(ast).to eq([
+            :heading,
+            [ :attribute, "a", [:builtin_type, "Integer" ]],
+            [ :attribute, "b", [:builtin_type, "Float" ]],
+            { allow_extra: true }
+          ])
+        }
+      end
+
+      context 'when specifying allow extra type' do
+        let(:input){ 'a: .Integer, b: .Float, ...: .String' }
+
+        it{
+          expect(ast).to eq([
+            :heading,
+            [ :attribute, "a", [:builtin_type, "Integer" ]],
+            [ :attribute, "b", [:builtin_type, "Float" ]],
+            { allow_extra: [:builtin_type, "String"] }
+          ])
+        }
+      end
     end
   end
 end

data/spec/type/multi_tuple_type/test_dress.rb

@@ -122,7 +122,7 @@ module Finitio
       end
     end
 
-    context 'when not allowing extra' do
+    context 'when allow_extra is set to true' do
       let(:heading){
         Heading.new([r, g, maybe_b], allow_extra: true)
       }
@@ -142,5 +142,39 @@ module Finitio
       end
     end
 
+    context 'when allow_extra is set to a specific type' do
+      let(:heading){
+        Heading.new([r, g, maybe_b], allow_extra: negInt)
+      }
+
+      subject do
+        type.dress(arg) rescue $!
+      end
+
+      context 'with an invalid extra attribute' do
+        let(:arg){
+          { "r" => 12, "g" => 13, "extr" => 165 }
+        }
+
+        it 'should raise a TypeError' do
+          expect(subject).to be_a(TypeError)
+        end
+      end
+
+      context 'with a valid extra attribute' do
+        let(:arg){
+          { "r" => 12, "g" => 13, "extr" => -165 }
+        }
+
+        it 'should not raise a TypeError' do
+          expect(subject).not_to be_a(TypeError)
+        end
+
+        it 'should return a coerced/projection' do
+          expect(subject).to eq(r: 12, g: 13, extr: -165)
+        end
+      end
+    end
+
   end
 end

data/spec/type/multi_tuple_type/test_include.rb

@@ -51,7 +51,7 @@ module Finitio
       end
     end
 
-    context 'with extra allowed' do
+    context 'with allow_extra set to true' do
       let(:heading){
         Heading.new([a, maybe_b], allow_extra: true)
       }
@@ -69,5 +69,35 @@ module Finitio
       end
     end
 
+    context 'with allow_extra set to a specific type' do
+      let(:heading){
+        Heading.new([a, maybe_b], allow_extra: negInt)
+      }
+
+      context 'when valid hash, yet with no extra attribute' do
+        let(:arg){ {a: 12} }
+
+        it{ should eq(true) }
+      end
+
+      context 'when a valid b' do
+        let(:arg){ {a: 12, b: 15} }
+
+        it{ should eq(true) }
+      end
+
+      context 'when a valid c' do
+        let(:arg){ {a: 12, b: 15, c: -120} }
+
+        it{ should eq(true) }
+      end
+
+      context 'when an invalid c' do
+        let(:arg){ {a: 12, b: 15, c: 120} }
+
+        it{ should eq(false) }
+      end
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finitio
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2018-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -95,6 +95,7 @@ files:
 - lib/finitio/syntax/type/expression.rb
 - lib/finitio/syntax/type/external_pair.rb
 - lib/finitio/syntax/type/heading.rb
+- lib/finitio/syntax/type/heading_extra.rb
 - lib/finitio/syntax/type/inline_pair.rb
 - lib/finitio/syntax/type/lambda_expr.rb
 - lib/finitio/syntax/type/main_type.rb
@@ -311,164 +312,164 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Finitio - in Ruby
 test_files:
+- spec/spec_helper.rb
+- spec/type_factory/factory/test_tuple_type.rb
+- spec/type_factory/factory/test_builtin.rb
+- spec/type_factory/factory/test_set_type.rb
+- spec/type_factory/factory/test_struct_type.rb
+- spec/type_factory/factory/test_sub_type.rb
+- spec/type_factory/factory/test_seq_type.rb
+- spec/type_factory/dsl/test_attributes.rb
+- spec/type_factory/dsl/test_builtin.rb
+- spec/type_factory/dsl/test_adt.rb
+- spec/type_factory/dsl/test_multi_tuple.rb
+- spec/type_factory/dsl/test_seq.rb
+- spec/type_factory/dsl/test_multi_relation.rb
+- spec/type_factory/dsl/test_tuple.rb
+- spec/type_factory/dsl/test_set.rb
+- spec/type_factory/dsl/test_attribute.rb
+- spec/type_factory/dsl/test_any.rb
+- spec/type_factory/dsl/test_union.rb
+- spec/type_factory/dsl/test_struct.rb
+- spec/type_factory/dsl/test_relation.rb
+- spec/type_factory/dsl/test_subtype.rb
+- spec/attribute/test_initialize.rb
 - spec/attribute/test_equality.rb
+- spec/attribute/test_to_name.rb
 - spec/attribute/test_fetch_on.rb
-- spec/attribute/test_initialize.rb
 - spec/attribute/test_optional.rb
 - spec/attribute/test_required.rb
-- spec/attribute/test_to_name.rb
-- spec/constraint/test_anonymous.rb
-- spec/constraint/test_equality.rb
-- spec/constraint/test_name.rb
-- spec/constraint/test_named.rb
-- spec/constraint/test_triple_equal.rb
-- spec/finitio/system.fio
-- spec/finitio/test_ast.rb
-- spec/finitio/test_parse.rb
-- spec/finitio/test_system.rb
-- spec/heading/test_allow_extra.rb
-- spec/heading/test_each.rb
-- spec/heading/test_equality.rb
-- spec/heading/test_hash.rb
 - spec/heading/test_hash_get.rb
 - spec/heading/test_initialize.rb
+- spec/heading/test_equality.rb
+- spec/heading/test_to_name.rb
 - spec/heading/test_multi.rb
+- spec/heading/test_hash.rb
+- spec/heading/test_allow_extra.rb
 - spec/heading/test_size.rb
-- spec/heading/test_to_name.rb
-- spec/spec_helper.rb
-- spec/syntax/expr/test_free_variables.rb
-- spec/syntax/expr/test_to_proc_source.rb
-- spec/syntax/nodes/test_ad_type.rb
-- spec/syntax/nodes/test_any_type.rb
-- spec/syntax/nodes/test_attribute.rb
-- spec/syntax/nodes/test_builtin_type.rb
-- spec/syntax/nodes/test_comment.rb
-- spec/syntax/nodes/test_constraint_def.rb
-- spec/syntax/nodes/test_constraints.rb
-- spec/syntax/nodes/test_contract.rb
-- spec/syntax/nodes/test_expression.rb
-- spec/syntax/nodes/test_heading.rb
-- spec/syntax/nodes/test_metadata.rb
-- spec/syntax/nodes/test_named_constraint.rb
-- spec/syntax/nodes/test_relation_type.rb
-- spec/syntax/nodes/test_seq_type.rb
-- spec/syntax/nodes/test_set_type.rb
-- spec/syntax/nodes/test_spacing.rb
-- spec/syntax/nodes/test_struct_type.rb
-- spec/syntax/nodes/test_sub_type.rb
-- spec/syntax/nodes/test_system.rb
-- spec/syntax/nodes/test_tuple_type.rb
-- spec/syntax/nodes/test_type_def.rb
-- spec/syntax/nodes/test_type_ref.rb
-- spec/syntax/nodes/test_union_type.rb
-- spec/syntax/nodes/test_unnamed_constraint.rb
-- spec/syntax/test_compile.rb
-- spec/syntax/test_compile_type.rb
+- spec/heading/test_each.rb
+- spec/test_finitio.rb
+- spec/finitio/test_ast.rb
+- spec/finitio/system.fio
+- spec/finitio/test_system.rb
+- spec/finitio/test_parse.rb
+- spec/system/test_initialize.rb
+- spec/system/test_get_type.rb
+- spec/system/test_fetch.rb
+- spec/system/test_dup.rb
 - spec/system/test_add_type.rb
 - spec/system/test_dsl.rb
-- spec/system/test_dup.rb
-- spec/system/test_fetch.rb
-- spec/system/test_get_type.rb
-- spec/system/test_initialize.rb
-- spec/test_finitio.rb
+- spec/type/multi_relation_type/test_name.rb
+- spec/type/multi_relation_type/test_initialize.rb
+- spec/type/multi_relation_type/test_equality.rb
+- spec/type/multi_relation_type/test_include.rb
+- spec/type/multi_relation_type/test_default_name.rb
+- spec/type/multi_relation_type/test_dress.rb
+- spec/type/sub_type/test_name.rb
+- spec/type/sub_type/test_initialize.rb
+- spec/type/sub_type/test_equality.rb
+- spec/type/sub_type/test_include.rb
+- spec/type/sub_type/test_default_name.rb
+- spec/type/sub_type/test_dress.rb
+- spec/type/proxy_type/test_resolve.rb
+- spec/type/proxy_type/test_delegation.rb
+- spec/type/ad_type/test_name.rb
+- spec/type/ad_type/test_initialize.rb
+- spec/type/ad_type/test_include.rb
 - spec/type/ad_type/test_default_name.rb
 - spec/type/ad_type/test_dress.rb
-- spec/type/ad_type/test_include.rb
-- spec/type/ad_type/test_initialize.rb
-- spec/type/ad_type/test_name.rb
-- spec/type/alias_type/test_default_name.rb
-- spec/type/alias_type/test_delegation.rb
-- spec/type/alias_type/test_name.rb
-- spec/type/any_type/test_default_name.rb
-- spec/type/any_type/test_dress.rb
+- spec/type/struct_type/test_name.rb
+- spec/type/struct_type/test_initialize.rb
+- spec/type/struct_type/test_equality.rb
+- spec/type/struct_type/test_include.rb
+- spec/type/struct_type/test_default_name.rb
+- spec/type/struct_type/test_dress.rb
+- spec/type/set_type/test_name.rb
+- spec/type/set_type/test_initialize.rb
+- spec/type/set_type/test_equality.rb
+- spec/type/set_type/test_include.rb
+- spec/type/set_type/test_default_name.rb
+- spec/type/set_type/test_dress.rb
+- spec/type/relation_type/test_name.rb
+- spec/type/relation_type/test_initialize.rb
+- spec/type/relation_type/test_equality.rb
+- spec/type/relation_type/test_include.rb
+- spec/type/relation_type/test_default_name.rb
+- spec/type/relation_type/test_dress.rb
+- spec/type/any_type/test_name.rb
+- spec/type/any_type/test_initialize.rb
 - spec/type/any_type/test_equality.rb
 - spec/type/any_type/test_include.rb
-- spec/type/any_type/test_initialize.rb
-- spec/type/any_type/test_name.rb
-- spec/type/builtin_type/test_default_name.rb
-- spec/type/builtin_type/test_dress.rb
+- spec/type/any_type/test_default_name.rb
+- spec/type/any_type/test_dress.rb
+- spec/type/builtin_type/test_name.rb
+- spec/type/builtin_type/test_initialize.rb
 - spec/type/builtin_type/test_equality.rb
 - spec/type/builtin_type/test_include.rb
-- spec/type/builtin_type/test_initialize.rb
-- spec/type/builtin_type/test_name.rb
-- spec/type/multi_relation_type/test_default_name.rb
-- spec/type/multi_relation_type/test_dress.rb
-- spec/type/multi_relation_type/test_equality.rb
-- spec/type/multi_relation_type/test_include.rb
-- spec/type/multi_relation_type/test_initialize.rb
-- spec/type/multi_relation_type/test_name.rb
-- spec/type/multi_tuple_type/test_default_name.rb
-- spec/type/multi_tuple_type/test_dress.rb
-- spec/type/multi_tuple_type/test_equality.rb
-- spec/type/multi_tuple_type/test_include.rb
-- spec/type/multi_tuple_type/test_initialize.rb
-- spec/type/multi_tuple_type/test_name.rb
-- spec/type/proxy_type/test_delegation.rb
-- spec/type/proxy_type/test_resolve.rb
-- spec/type/relation_type/test_default_name.rb
-- spec/type/relation_type/test_dress.rb
-- spec/type/relation_type/test_equality.rb
-- spec/type/relation_type/test_include.rb
-- spec/type/relation_type/test_initialize.rb
-- spec/type/relation_type/test_name.rb
-- spec/type/seq_type/test_default_name.rb
-- spec/type/seq_type/test_dress.rb
-- spec/type/seq_type/test_equality.rb
-- spec/type/seq_type/test_include.rb
-- spec/type/seq_type/test_initialize.rb
-- spec/type/seq_type/test_name.rb
-- spec/type/set_type/test_default_name.rb
-- spec/type/set_type/test_dress.rb
-- spec/type/set_type/test_equality.rb
-- spec/type/set_type/test_include.rb
-- spec/type/set_type/test_initialize.rb
-- spec/type/set_type/test_name.rb
-- spec/type/struct_type/test_default_name.rb
-- spec/type/struct_type/test_dress.rb
-- spec/type/struct_type/test_equality.rb
-- spec/type/struct_type/test_include.rb
-- spec/type/struct_type/test_initialize.rb
-- spec/type/struct_type/test_name.rb
-- spec/type/sub_type/test_default_name.rb
-- spec/type/sub_type/test_dress.rb
-- spec/type/sub_type/test_equality.rb
-- spec/type/sub_type/test_include.rb
-- spec/type/sub_type/test_initialize.rb
-- spec/type/sub_type/test_name.rb
-- spec/type/tuple_type/test_default_name.rb
-- spec/type/tuple_type/test_dress.rb
-- spec/type/tuple_type/test_equality.rb
-- spec/type/tuple_type/test_include.rb
-- spec/type/tuple_type/test_initialize.rb
-- spec/type/tuple_type/test_name.rb
-- spec/type/union_type/test_default_name.rb
-- spec/type/union_type/test_dress.rb
+- spec/type/builtin_type/test_default_name.rb
+- spec/type/builtin_type/test_dress.rb
+- spec/type/union_type/test_name.rb
+- spec/type/union_type/test_initialize.rb
 - spec/type/union_type/test_equality.rb
 - spec/type/union_type/test_include.rb
-- spec/type/union_type/test_initialize.rb
-- spec/type/union_type/test_name.rb
-- spec/type_factory/dsl/test_adt.rb
-- spec/type_factory/dsl/test_any.rb
-- spec/type_factory/dsl/test_attribute.rb
-- spec/type_factory/dsl/test_attributes.rb
-- spec/type_factory/dsl/test_builtin.rb
-- spec/type_factory/dsl/test_multi_relation.rb
-- spec/type_factory/dsl/test_multi_tuple.rb
-- spec/type_factory/dsl/test_relation.rb
-- spec/type_factory/dsl/test_seq.rb
-- spec/type_factory/dsl/test_set.rb
-- spec/type_factory/dsl/test_struct.rb
-- spec/type_factory/dsl/test_subtype.rb
-- spec/type_factory/dsl/test_tuple.rb
-- spec/type_factory/dsl/test_union.rb
-- spec/type_factory/factory/test_builtin.rb
-- spec/type_factory/factory/test_seq_type.rb
-- spec/type_factory/factory/test_set_type.rb
-- spec/type_factory/factory/test_struct_type.rb
-- spec/type_factory/factory/test_sub_type.rb
-- spec/type_factory/factory/test_tuple_type.rb
+- spec/type/union_type/test_default_name.rb
+- spec/type/union_type/test_dress.rb
+- spec/type/tuple_type/test_name.rb
+- spec/type/tuple_type/test_initialize.rb
+- spec/type/tuple_type/test_equality.rb
+- spec/type/tuple_type/test_include.rb
+- spec/type/tuple_type/test_default_name.rb
+- spec/type/tuple_type/test_dress.rb
+- spec/type/alias_type/test_name.rb
+- spec/type/alias_type/test_default_name.rb
+- spec/type/alias_type/test_delegation.rb
+- spec/type/seq_type/test_name.rb
+- spec/type/seq_type/test_initialize.rb
+- spec/type/seq_type/test_equality.rb
+- spec/type/seq_type/test_include.rb
+- spec/type/seq_type/test_default_name.rb
+- spec/type/seq_type/test_dress.rb
+- spec/type/multi_tuple_type/test_name.rb
+- spec/type/multi_tuple_type/test_initialize.rb
+- spec/type/multi_tuple_type/test_equality.rb
+- spec/type/multi_tuple_type/test_include.rb
+- spec/type/multi_tuple_type/test_default_name.rb
+- spec/type/multi_tuple_type/test_dress.rb
+- spec/syntax/nodes/test_tuple_type.rb
+- spec/syntax/nodes/test_set_type.rb
+- spec/syntax/nodes/test_union_type.rb
+- spec/syntax/nodes/test_heading.rb
+- spec/syntax/nodes/test_builtin_type.rb
+- spec/syntax/nodes/test_constraints.rb
+- spec/syntax/nodes/test_type_ref.rb
+- spec/syntax/nodes/test_system.rb
+- spec/syntax/nodes/test_attribute.rb
+- spec/syntax/nodes/test_contract.rb
+- spec/syntax/nodes/test_named_constraint.rb
+- spec/syntax/nodes/test_metadata.rb
+- spec/syntax/nodes/test_type_def.rb
+- spec/syntax/nodes/test_struct_type.rb
+- spec/syntax/nodes/test_sub_type.rb
+- spec/syntax/nodes/test_any_type.rb
+- spec/syntax/nodes/test_constraint_def.rb
+- spec/syntax/nodes/test_ad_type.rb
+- spec/syntax/nodes/test_expression.rb
+- spec/syntax/nodes/test_relation_type.rb
+- spec/syntax/nodes/test_spacing.rb
+- spec/syntax/nodes/test_comment.rb
+- spec/syntax/nodes/test_seq_type.rb
+- spec/syntax/nodes/test_unnamed_constraint.rb
+- spec/syntax/expr/test_to_proc_source.rb
+- spec/syntax/expr/test_free_variables.rb
+- spec/syntax/test_compile.rb
+- spec/syntax/test_compile_type.rb
+- spec/constraint/test_name.rb
+- spec/constraint/test_equality.rb
+- spec/constraint/test_anonymous.rb
+- spec/constraint/test_named.rb
+- spec/constraint/test_triple_equal.rb