finitio 0.6.1 → 0.7.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b96114d305e1a1028b5928cb419060c63e5385b0
-  data.tar.gz: a7630a2f60f26888e217113bc701222ff0822f45
+  metadata.gz: 62428c8d4da07e87d6941a239e5d7f068dcbfbe5
+  data.tar.gz: e20902929ec496b6ea231b5c66a63b7ef59432af
 SHA512:
-  metadata.gz: 52b4db3b9a8d266b016ae992f8ce36113aaffb1c8468bc89f4468e92b6871db63ab59b7a5e6371b931c6074fb7d44bce438215280a25d4a71a632ed8fa7fde94
-  data.tar.gz: 4628099b4394f0fab3d064265193b022565b6393c8278fe8f3ca02b3c8f6ba0dfe95bf690e9dbb260eb5fe121820b15e03b7df82ae41e16aca4a85b62c38bae0
+  metadata.gz: c75b78277e39efebb52b2ba293f336953deb0c59f5b9eaa248e5c4645ae8ca078783466a8352f8a1ad98570d2fb2286a3ad2d3dadf0a6560b76ec336f311fc18
+  data.tar.gz: b3cba6dc70482fb8b780c72ff500c37c13968f61ea2f8293fd263d1423261e1a482e9df296a6165cd71a787fdea5bfb696b91b3b944af006cf10a23e56121ac7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    finitio (0.6.1)
+    finitio (0.7.0.pre.rc1)
       citrus (>= 2.4, < 4.0)
 
 GEM

data/lib/finitio.rb

@@ -1,5 +1,6 @@
 require 'set'
 require 'time'
+require 'pathname'
 
 module Finitio
 
@@ -13,6 +14,14 @@ module Finitio
 
   ANY_TYPE = AnyType.new
 
+  STDLIB_PATHS = [
+    File.expand_path('../finitio/stdlib', __FILE__)
+  ]
+
+  def stdlib_path(path)
+    STDLIB_PATHS << path
+  end
+
   def parse(source)
     require "finitio/syntax"
     Syntax.parse(source)
@@ -31,6 +40,6 @@ module Finitio
   extend self
 
   DEFAULT_SYSTEM = system(File.read(
-    File.expand_path('../finitio/Finitio/default.fio', __FILE__)
+    File.expand_path('../finitio/stdlib/finitio/data.fio', __FILE__)
   ))
 end # module Finitio

data/lib/finitio/support/compilation.rb

@@ -1,23 +1,53 @@
 module Finitio
   class Compilation
 
-    def initialize(system = System.new, factory = TypeFactory.new)
+    def initialize(system = System.new, factory = TypeFactory.new, source = nil)
       @system  = system
       @factory = factory
       @proxies = []
+      @source = source
     end
-    attr_reader :system, :factory, :proxies
+    attr_reader :system, :factory, :proxies, :source
 
-    def self.coerce(arg)
+    def self.coerce(arg, source = nil)
       case arg
-      when NilClass    then new
-      when System      then new(arg, arg.factory)
-      when TypeFactory then new(System.new, arg)
+      when NilClass    then new(System.new, TypeFactory.new, source)
+      when System      then new(arg, arg.factory, source)
+      when TypeFactory then new(System.new, arg, source)
       else
         raise ArgumentError, "Unable to coerce `#{arg}`"
       end
     end
 
+    def imports
+      @system.send(:imports)
+    end
+
+    def add_import(import)
+      @system.add_import(import)
+      self
+    end
+
+    def resolve_url(url)
+      if url.to_s =~ /^\.\//
+        resolve_relative_url(url)
+      else
+        STDLIB_PATHS.each do |path|
+          file = File.expand_path("#{url}.fio", path)
+          return Pathname.new(file) if File.file?(file)
+        end
+        raise Error, "No such import `#{url}`"
+      end
+    end
+
+    def resolve_relative_url(url)
+      raise Error, "Unable to resolve `#{url}`, missing path context"\
+        unless source.respond_to?(:to_path)
+      file = File.expand_path("../#{url}.fio", source.to_path)
+      raise Error, "No such file `#{file}`" unless File.file?(file)
+      Pathname.new(file)
+    end
+
     def resolve_proxies!
       proxies.each do |p|
         p.resolve(system)

data/lib/finitio/syntax.rb

@@ -3,6 +3,10 @@ require_relative 'syntax/node'
 require_relative 'syntax/literal'
 require_relative 'syntax/expr'
 require_relative 'syntax/type'
+require_relative 'syntax/import'
+require_relative 'syntax/imports'
+require_relative 'syntax/definitions'
+require_relative 'syntax/system'
 module Finitio
   module Syntax
 
@@ -21,13 +25,13 @@ module Finitio
     end
 
     def self.compile(source, cpl = nil)
-      cpl = Compilation.coerce(cpl)
+      cpl = Compilation.coerce(cpl, source)
       parse(source, root: "system").compile(cpl)
       cpl.resolve_proxies!.system
     end
 
     def self.compile_type(source, cpl = nil)
-      cpl = Compilation.coerce(cpl)
+      cpl = Compilation.coerce(cpl, source)
       parse(source, root: "type").compile(cpl)
     end
 

data/lib/finitio/syntax/finitio.citrus

@@ -10,10 +10,20 @@ grammar Finitio::Syntax::Parser
   include Finitio::Syntax::Types
 
   rule system
-    (spacing definitions spacing main_type? spacing eof)
+    (spacing imports spacing definitions spacing main_type? spacing eof)
     <Finitio::Syntax::System>
   end
 
+  rule imports
+    (import (spacing import)*)?
+    <Finitio::Syntax::Imports>
+  end
+
+  rule import
+    ('@import' spaces import_url)
+    <Finitio::Syntax::Import>
+  end
+
   rule definitions
     (type_def (spacing type_def)*)?
     <Finitio::Syntax::Definitions>

data/lib/finitio/syntax/import.rb

@@ -0,0 +1,21 @@
+module Finitio
+  module Syntax
+    module Import
+      include Node
+
+      capture :import_url
+
+      def compile(system)
+        file = system.resolve_url(import_url)
+        imported = Finitio.system(file)
+        system.add_import(imported)
+        system
+      end
+
+      def to_ast
+        [:import, import_url]
+      end
+
+    end # module Import
+  end # module Syntax
+end # module Finitio

data/lib/finitio/syntax/imports.rb

@@ -0,0 +1,19 @@
+module Finitio
+  module Syntax
+    module Imports
+      include Node
+
+      def compile(system)
+        captures[:import].each do |node|
+          node.compile(system)
+        end
+        system
+      end
+
+      def to_ast
+        [:imports] + captures[:import].map(&:to_ast)
+      end
+
+    end # module Imports
+  end # module Syntax
+end # module Finitio

data/lib/finitio/syntax/lexer.citrus

@@ -32,6 +32,10 @@ grammar Finitio::Syntax::Lexer
     /[a-zA-Z0-9:]+/
   end
 
+  rule import_url
+    (!space .)+
+  end
+
   # LEXER symbols
 
   rule equal

data/lib/finitio/syntax/{type/system.rb → system.rb}

@@ -3,16 +3,20 @@ module Finitio
     module System
       include Node
 
-      capture :definitions, :main_type
+      capture :imports, :definitions, :main_type
 
       def compile(system)
+        imports.compile(system) if imports
         definitions.compile(system)
         main_type.compile(system) if main_type
         system
       end
 
       def to_ast
-        ast = [ :system ] + definitions.to_ast
+        ast = [ :system ]
+        imports_ast = imports.to_ast
+        ast << imports_ast unless imports_ast.size == 1
+        ast += definitions.to_ast
         ast << main_type.to_ast if main_type
         ast
       end

data/lib/finitio/syntax/type.rb

@@ -1,5 +1,3 @@
-require_relative 'type/system'
-require_relative 'type/definitions'
 require_relative 'type/type_def'
 require_relative 'type/main_type'
 require_relative 'type/expression'

data/lib/finitio/system.rb

@@ -4,8 +4,16 @@ module Finitio
   #
   class System
 
-    def initialize(types = {})
+    def initialize(types = {}, imports = [])
       @types = types
+      @imports = imports
+    end
+
+    attr_reader :types, :imports
+    private :types, :imports
+
+    def add_import(system)
+      @imports << system
     end
 
     def add_type(type, name = nil, metadata = nil)
@@ -19,7 +27,9 @@ module Finitio
     end
 
     def get_type(name)
-      @types[name] || @types[name.to_s]
+      fetch(name){|_|
+        fetch(name.to_s){ nil }
+      }
     end
     alias :[] :get_type
 
@@ -27,9 +37,27 @@ module Finitio
       self['Main']
     end
 
-    def fetch(name, &bl)
-      @types.fetch(name, &bl)
+    def fetch(name, with_imports = true, &bl)
+      if with_imports
+        @types.fetch(name) do
+          _fetch(name, @imports, &bl)
+        end
+      else
+        @types.fetch(name, &bl)
+      end
+    end
+
+    def _fetch(name, imports, &bl)
+      if imports.empty?
+        raise KeyError, %Q{key not found: "#{name}"} unless bl
+        bl.call(name)
+      else
+        imports.first.fetch(name, false) do
+          _fetch(name, imports[1..-1], &bl)
+        end
+      end
     end
+    private :_fetch
 
     def factory
       @factory ||= TypeFactory.new
@@ -56,7 +84,7 @@ module Finitio
     end
 
     def dup
-      System.new(@types.dup)
+      System.new(@types.dup, @imports.dup)
     end
 
   end # class System

data/lib/finitio/type/proxy_type.rb

@@ -25,15 +25,15 @@ module Finitio
       :to_s
     ].each do |meth|
       define_method(meth) do |*args, &bl|
-        raise Error, "Proxy not resolved" unless @target
+        raise Error, "No such type `#{@target_name}` (proxy not resolved?)" unless @target
         @target.send(meth, *args, &bl)
       end
     end
 
     def resolve(system)
-      @target = system.fetch(target_name) do
+      @target = system.fetch(target_name){
         raise Error, "No such type `#{target_name}`"
-      end
+      }
     end
 
   end # class ProxyType

data/lib/finitio/version.rb

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

data/spec/syntax/nodes/test_import.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+module Finitio
+  describe Syntax, "import" do
+
+    subject{
+      Syntax.parse(input, root: "import")
+    }
+
+    let(:sys){
+      Compilation.coerce(system, Path.dir/"test_import.rb")
+    }
+
+    let(:compiled){
+      subject.compile(sys)
+    }
+
+    let(:ast){
+      subject.to_ast
+    }
+
+    context 'with a stdlib import' do
+      let(:input){ '@import finitio/data' }
+
+      it 'compiles to an Import' do
+        expect(compiled).to be(sys)
+        expect(compiled.send(:imports).size).to eql(1)
+      end
+
+      it 'has the expected AST' do
+        expect(ast).to eq([:import, "finitio/data"])
+      end
+    end
+
+    context 'with a stdlib import' do
+      let(:input){ '@import ./imported' }
+
+      it 'compiles to an Import' do
+        expect(compiled).to be(sys)
+        expect(compiled.send(:imports).size).to eql(1)
+      end
+
+      it 'has the expected AST' do
+        expect(ast).to eq([:import, "./imported"])
+      end
+    end
+
+  end
+end

data/spec/system/test_fetch.rb

@@ -38,5 +38,42 @@ module Finitio
       end
     end
 
+    context 'with an imported type' do
+      subject{
+        s = System.new
+        s.add_import(system)
+        s.fetch("intType", imports, &fallback)
+      }
+
+      context "specifying the use of imports" do
+        let(:imports) { true }
+        let(:fallback){ ->(name){ raise } }
+
+        it 'should return the type' do
+          expect(subject).to eq(intType)
+        end
+      end
+
+      context "specifying not to use the imports" do
+        let(:imports) { false }
+        let(:fallback){ ->(name){ "bar" } }
+
+        it 'should yield the fallback block' do
+          expect(subject).to eq("bar")
+        end
+      end
+
+      context "specifying not to use the imports and no fallbak" do
+        let(:imports) { false }
+        let(:fallback){ nil }
+
+        it 'should yield the fallback block' do
+          expect {
+            subject
+          }.to raise_error
+        end
+      end
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finitio
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0.pre.rc1
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -49,8 +49,8 @@ files:
 - Rakefile
 - finitio.gemspec
 - lib/finitio.rb
-- lib/finitio/Finitio/default.fio
 - lib/finitio/errors.rb
+- lib/finitio/stdlib/finitio/data.fio
 - lib/finitio/support.rb
 - lib/finitio/support/attribute.rb
 - lib/finitio/support/compilation.rb
@@ -61,6 +61,7 @@ files:
 - lib/finitio/support/metadata.rb
 - lib/finitio/support/type_factory.rb
 - lib/finitio/syntax.rb
+- lib/finitio/syntax/definitions.rb
 - lib/finitio/syntax/expr.rb
 - lib/finitio/syntax/expr/arith_op.rb
 - lib/finitio/syntax/expr/comparison.rb
@@ -75,6 +76,8 @@ files:
 - lib/finitio/syntax/expressions.citrus
 - lib/finitio/syntax/finitio.citrus
 - lib/finitio/syntax/finitio.sexp
+- lib/finitio/syntax/import.rb
+- lib/finitio/syntax/imports.rb
 - lib/finitio/syntax/lexer.citrus
 - lib/finitio/syntax/literal.rb
 - lib/finitio/syntax/literal/boolean.rb
@@ -83,6 +86,7 @@ files:
 - lib/finitio/syntax/literal/string.rb
 - lib/finitio/syntax/literals.citrus
 - lib/finitio/syntax/node.rb
+- lib/finitio/syntax/system.rb
 - lib/finitio/syntax/type.rb
 - lib/finitio/syntax/type/ad_type.rb
 - lib/finitio/syntax/type/any_type.rb
@@ -91,7 +95,6 @@ files:
 - lib/finitio/syntax/type/constraint_def.rb
 - lib/finitio/syntax/type/constraints.rb
 - lib/finitio/syntax/type/contract.rb
-- lib/finitio/syntax/type/definitions.rb
 - lib/finitio/syntax/type/expression.rb
 - lib/finitio/syntax/type/external_pair.rb
 - lib/finitio/syntax/type/heading.rb
@@ -107,7 +110,6 @@ files:
 - lib/finitio/syntax/type/set_type.rb
 - lib/finitio/syntax/type/struct_type.rb
 - lib/finitio/syntax/type/sub_type.rb
-- lib/finitio/syntax/type/system.rb
 - lib/finitio/syntax/type/tuple_type.rb
 - lib/finitio/syntax/type/type_def.rb
 - lib/finitio/syntax/type/type_ref.rb
@@ -162,6 +164,7 @@ files:
 - spec/spec_helper.rb
 - spec/syntax/expr/test_free_variables.rb
 - spec/syntax/expr/test_to_proc_source.rb
+- spec/syntax/nodes/imported.fio
 - spec/syntax/nodes/test_ad_type.rb
 - spec/syntax/nodes/test_any_type.rb
 - spec/syntax/nodes/test_attribute.rb
@@ -172,6 +175,7 @@ files:
 - spec/syntax/nodes/test_contract.rb
 - spec/syntax/nodes/test_expression.rb
 - spec/syntax/nodes/test_heading.rb
+- spec/syntax/nodes/test_import.rb
 - spec/syntax/nodes/test_metadata.rb
 - spec/syntax/nodes/test_named_constraint.rb
 - spec/syntax/nodes/test_relation_type.rb
@@ -307,169 +311,171 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 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_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/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/imported.fio
+- 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_import.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/system/test_add_type.rb
 - spec/system/test_dsl.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/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/ad_type/test_default_name.rb
 - spec/type/ad_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/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/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/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/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_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/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/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
+- 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/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