puppet 4.3.2-x86-mingw32 → 4.4.0-x86-mingw32

data/lib/puppet/pops/types/types.rb

@@ -1,11 +1,26 @@
+require_relative 'iterable'
+require_relative 'enumeration'
+require_relative 'recursion_guard'
+require_relative 'type_acceptor'
+require_relative 'type_asserter'
+require_relative 'type_assertion_error'
+require_relative 'type_formatter'
+require_relative 'type_calculator'
+require_relative 'type_factory'
+require_relative 'type_parser'
+require_relative 'class_loader'
+require_relative 'type_mismatch_describer'
+
 require 'rgen/metamodel_builder'
 
+module Puppet::Pops
+module Types
 # The Types model is a model of Puppet Language types.
 #
 # The exact relationship between types is not visible in this model wrt. the PDataType which is an abstraction
 # of Scalar, Array[Data], and Hash[Scalar, Data] nested to any depth. This means it is not possible to
-# infer the type by simply looking at the inheritance hierarchy. The {Puppet::Pops::Types::TypeCalculator} should
-# be used to answer questions about types. The {Puppet::Pops::Types::TypeFactory} should be used to create an instance
+# infer the type by simply looking at the inheritance hierarchy. The {TypeCalculator} should
+# be used to answer questions about types. The {TypeFactory} should be used to create an instance
 # of a type whenever one is needed.
 #
 # The implementation of the Types model contains methods that are required for the type objects to behave as
@@ -14,1535 +29,2330 @@ require 'rgen/metamodel_builder'
 #
 # @api public
 #
-module Puppet::Pops
-  # TODO: See PUP-2978 for possible performance optimization
-  module Types
-    class TypedModelObject < Object
-      include Puppet::Pops::Visitable
-      include Puppet::Pops::Adaptable
-    end
-
-    # Base type for all types
-    # @api public
-    #
-    class PAnyType < TypedModelObject
-      # Checks if _o_ is a type that is assignable to this type.
-      # If _o_ is a `Class` then it is first converted to a type.
-      # If _o_ is a Variant, then it is considered assignable when all its types are assignable
-      # @return [Boolean] `true` when _o_ is assignable to this type
-      # @api public
-      def assignable?(o)
-        case o
-          when Class
-          # Safe to call _assignable directly since a Class never is a Unit or Variant
-          _assignable?(Puppet::Pops::Types::TypeCalculator.singleton.type(o))
-        when PUnitType
+# TODO: See PUP-2978 for possible performance optimization
+class TypedModelObject < Object
+  include Visitable
+  include Adaptable
+end
+
+# Base type for all types
+# @api public
+#
+class PAnyType < TypedModelObject
+  # Accept a visitor that will be sent the message `visit`, once with `self` as the
+  # argument. The visitor will then visit all types that this type contains.
+  #
+  def accept(visitor, guard)
+    visitor.visit(self, guard)
+  end
+
+  # Checks if _o_ is a type that is assignable to this type.
+  # If _o_ is a `Class` then it is first converted to a type.
+  # If _o_ is a Variant, then it is considered assignable when all its types are assignable
+  #
+  # The check for assignable must be guarded against self recursion since `self`, the given type _o_,
+  # or both, might be a `TypeAlias`. The initial caller of this method will typically never care
+  # about this and hence pass only the first argument, but as soon as a check of a contained type
+  # encounters a `TypeAlias`, then a `RecursionGuard` instance is created and passed on in all
+  # subsequent calls. The recursion is allowed to continue until self recursion has been detected in
+  # both `self` and in the given type. At that point the given type is considered to be assignable
+  # to `self` since all checks up to that point were positive.
+  #
+  # @param o [Class,PAnyType] the class or type to test
+  # @param guard [RecursionGuard] guard against recursion. Only used by internal calls
+  # @return [Boolean] `true` when _o_ is assignable to this type
+  # @api public
+  def assignable?(o, guard = nil)
+    case o
+      when Class
+      # Safe to call _assignable directly since a Class never is a Unit or Variant
+      _assignable?(TypeCalculator.singleton.type(o), guard)
+    when PUnitType
+      true
+    when PTypeAliasType
+      # An alias may contain self recursive constructs.
+      if o.self_recursion?
+        guard ||= RecursionGuard.new
+        if guard.add_that(o) == RecursionGuard::SELF_RECURSION_IN_BOTH
+          # Recursion detected both in self and other. This means that other is assignable
+          # to self. This point would not have been reached otherwise
           true
-        when PVariantType
-          # Assignable if all contained types are assignable
-          o.types.all? { |vt| assignable?(vt) }
-        when PNotUndefType
-          if !(o.type.nil? || o.type.assignable?(PUndefType::DEFAULT))
-            assignable?(o.type)
-          else
-            _assignable?(o)
-          end
         else
-          _assignable?(o)
+          assignable?(o.resolved_type, guard)
         end
-      end
+      else
+        assignable?(o.resolved_type, guard)
+      end
+    when PVariantType
+      # Assignable if all contained types are assignable
+      o.types.all? { |vt| assignable?(vt, guard) }
+    when PNotUndefType
+      if !(o.type.nil? || o.type.assignable?(PUndefType::DEFAULT))
+        assignable?(o.type, guard)
+      else
+        _assignable?(o, guard)
+      end
+    else
+      _assignable?(o, guard)
+    end
+  end
 
-      # Returns `true` if this instance is a callable that accepts the given _args_
-      #
-      # @return [Boolean]
-      def callable?(args)
-        args.is_a?(PAnyType) && kind_of_callable? && args.callable_args?(self)
-      end
+  # Returns `true` if this instance is a callable that accepts the given _args_
+  #
+  # @param args [PAnyType] the arguments to test
+  # @param guard [RecursionGuard] guard against recursion. Only used by internal calls
+  # @return [Boolean] `true` if this instance is a callable that accepts the given _args_
+  def callable?(args, guard = nil)
+    args.is_a?(PAnyType) && kind_of_callable? && args.callable_args?(self, guard)
+  end
 
-      # Returns `true` if this instance is considered valid as arguments to _callable_
-      # @return [Boolean]
-      # @api private
-      def callable_args?(callable)
-        false
-      end
+  # Returns `true` if this instance is considered valid as arguments to the given `callable`
+  # @param callable [PAnyType] the callable
+  # @param guard [RecursionGuard] guard against recursion. Only used by internal calls
+  # @return [Boolean] `true` if this instance is considered valid as arguments to the given `callable`
+  # @api private
+  def callable_args?(callable, guard)
+    false
+  end
 
-      # Subclasses that are enumerable will override this method to return `true`
-      # @return [Boolean] false#
-      def enumerable?
-        is_a?(Enumerable)
-      end
+  # Generalizes value specific types. Types that are not value specific will return `self` otherwise
+  # the generalized type is returned.
+  #
+  # @return [PAnyType] The generalized type
+  # @api public
+  def generalize
+    # Applicable to all types that have no variables
+    self
+  end
 
-      # Generalizes value specific types. Types that are not value specific will return `self` otherwize
-      # the generalized type is returned.
-      #
-      # @return [PAnyType] The generalized type
-      # @api public
-      def generalize
-        # Applicable to all types that have no variables
-        self
-      end
+  # Normalizes the type. This does not change the characteristics of the type but it will remove duplicates
+  # and constructs like NotUndef[T] where T is not assignable from Undef and change Variant[*T] where all
+  # T are enums into an Enum.
+  #
+  # @param guard [RecursionGuard] guard against recursion. Only used by internal calls
+  # @return [PAnyType] The iterable type that this type is assignable to or `nil`
+  # @api public
+  def normalize(guard = nil)
+    self
+  end
 
-      # Responds `true` for all callables, variants of callables and unless _optional_ is
-      # false, all optional callables.
-      # @return [Boolean] `true`if this type is considered callable
-      # @api private
-      def kind_of_callable?(optional=true)
-        false
-      end
+  # Responds `true` for all callables, variants of callables and unless _optional_ is
+  # false, all optional callables.
+  # @param optional [Boolean]
+  # @param guard [RecursionGuard] guard against recursion. Only used by internal calls
+  # @return [Boolean] `true`if this type is considered callable
+  # @api private
+  def kind_of_callable?(optional = true, guard = nil)
+    false
+  end
 
-      def hash
-        self.class.hash
-      end
+  # Returns `true` if an instance of this type is iterable, `false` otherwise
+  # The method #iterable_type must produce a `PIterableType` instance when this
+  # method returns `true`
+  #
+  # @param guard [RecursionGuard] guard against recursion. Only used by internal calls
+  # @return [Boolean] flag to indicate if instances of  this type is iterable.
+  def iterable?(guard = nil)
+    false
+  end
 
-      # Returns true if the given argument _o_ is an instance of this type
-      # @return [Boolean]
-      def instance?(o)
-        true
-      end
+  # Returns the `PIterableType` that this type should be assignable to, or `nil` if no such type exists.
+  # A type that returns a `PIterableType` must respond `true` to `#iterable?`.
+  #
+  # @example
+  #     Any Collection[T] is assignable to an Iterable[T]
+  #     A String is assignable to an Iterable[String] iterating over the strings characters
+  #     An Integer is assignable to an Iterable[Integer] iterating over the 'times' enumerator
+  #     A Type[T] is assignable to an Iterable[Type[T]] if T is an Integer or Enum
+  #
+  # @param guard [RecursionGuard] guard against recursion. Only used by internal calls
+  # @return [PIterableType,nil] The iterable type that this type is assignable to or `nil`
+  # @api private
+  def iterable_type(guard = nil)
+    nil
+  end
 
-      def ==(o)
-        self.class == o.class
-      end
+  def hash
+    self.class.hash
+  end
 
-      alias eql? ==
+  # Returns true if the given argument _o_ is an instance of this type
+  # @return [Boolean]
+  def instance?(o)
+    true
+  end
 
-      # Strips the class name from all module prefixes, the leading 'P' and the ending 'Type'. I.e.
-      # an instance of Puppet::Pops::Types::PVariantType will return 'Variant'
-      # @return [String] the simple name of this type
-      def simple_name
-        n = self.class.name
-        n[n.rindex('::')+3..n.size-5]
-      end
+  def eql?(o)
+    self.class == o.class
+  end
 
-      def to_s
-        Puppet::Pops::Types::TypeCalculator.string(self)
-      end
+  def ==(o)
+    eql?(o)
+  end
 
-      # The default instance of this type. Each type in the type system has this constant
-      # declared.
-      #
-      DEFAULT = PAnyType.new
+  # Strips the class name from all module prefixes, the leading 'P' and the ending 'Type'. I.e.
+  # an instance of PVariantType will return 'Variant'
+  # @return [String] the simple name of this type
+  def simple_name
+    n = self.class.name
+    n[n.rindex('::')+3..n.size-5]
+  end
 
-      protected
+  def to_alias_expanded_s
+    TypeFormatter.new.alias_expanded_string(self)
+  end
 
-      # @api private
-      def _assignable?(o)
-        o.is_a?(PAnyType)
-      end
+  def to_s
+    TypeFormatter.string(self)
+  end
 
-      NAME_SEGMENT_SEPARATOR = '::'.freeze
+  # The default instance of this type. Each type in the type system has this constant
+  # declared.
+  #
+  DEFAULT = PAnyType.new
 
-      # @api private
-      def class_from_string(str)
-        begin
-          str.split(NAME_SEGMENT_SEPARATOR).reduce(Object) do |memo, name_segment|
-            memo.const_get(name_segment)
-          end
-        rescue NameError
-          return nil
-        end
-      end
+  protected
 
-      # Produces the tuple entry at the given index given a tuple type, its from/to constraints on the last
-      # type, and an index.
-      # Produces nil if the index is out of bounds
-      # from must be less than to, and from may not be less than 0
-      #
-      # @api private
-      #
-      def tuple_entry_at(tuple_t, from, to, index)
-        regular = (tuple_t.types.size - 1)
-        if index < regular
-          tuple_t.types[index]
-        elsif index < regular + to
-          # in the varargs part
-          tuple_t.types[-1]
-        else
-          nil
-        end
-      end
+  # @api private
+  def _assignable?(o, guard)
+    o.is_a?(PAnyType)
+  end
 
+  NAME_SEGMENT_SEPARATOR = '::'.freeze
 
-      # Transform size_type to min, max
-      # if size_type == nil the constraint is 1,1
-      # if size_type.from == nil min size = 1
-      # if size_type.to == nil max size == Infinity
-      #
-      # @api private
-      def type_to_range(size_type)
-        return [1,1] if size_type.nil?
-        from = size_type.from
-        to = size_type.to
-        [from.nil? ? 1 : from, to.nil? ? Float::INFINITY : to]
+  # @api private
+  def class_from_string(str)
+    begin
+      str.split(NAME_SEGMENT_SEPARATOR).reduce(Object) do |memo, name_segment|
+        memo.const_get(name_segment)
       end
+    rescue NameError
+      return nil
     end
+  end
 
-    # The type of types.
-    # @api public
-    #
-    class PType < PAnyType
-      attr_reader :type
-
-      def initialize(type)
-        @type = type
-      end
+  # Produces the tuple entry at the given index given a tuple type, its from/to constraints on the last
+  # type, and an index.
+  # Produces nil if the index is out of bounds
+  # from must be less than to, and from may not be less than 0
+  #
+  # @api private
+  #
+  def tuple_entry_at(tuple_t, from, to, index)
+    regular = (tuple_t.types.size - 1)
+    if index < regular
+      tuple_t.types[index]
+    elsif index < regular + to
+      # in the varargs part
+      tuple_t.types[-1]
+    else
+      nil
+    end
+  end
 
-      def instance?(o)
-        if o.is_a?(PAnyType)
-          type.nil? || type.assignable?(o)
-        else
-          assignable?(TypeCalculator.infer(o))
-        end
-      end
 
-      def generalize
-        @type.nil? ? DEFAULT : PType.new(type.generalize)
-      end
+  # Transform size_type to min, max
+  # if size_type == nil the constraint is 1,1
+  # if size_type.from == nil min size = 1
+  # if size_type.to == nil max size == Infinity
+  #
+  # @api private
+  def type_to_range(size_type)
+    return [1,1] if size_type.nil?
+    from = size_type.from
+    to = size_type.to
+    [from.nil? ? 1 : from, to.nil? ? Float::INFINITY : to]
+  end
 
-      def hash
-        31 * @type.hash
-      end
+  # Applies a transformation by sending the given _method_ and _method_args_ to each of the types of the given array
+  # and collecting the results in a new array. If all transformation calls returned the type instance itself (i.e. no
+  # transformation took place), then this method will return `self`. If a transformation did occur, then this method
+  # will either return the transformed array or in case a block was given, the result of calling a given block with
+  # the transformed array.
+  #
+  # @param types [Array<PAnyType>] the array of types to transform
+  # @param method [Symbol] The method to call on each type
+  # @param method_args [Object] The arguments to pass to the method, if any
+  # @return [Object] self, the transformed array, or the result of calling a given block with the transformed array
+  # @yieldparam altered_types [Array<PAnyType>] the altered type array
+  # @api private
+  def alter_type_array(types, method, *method_args)
+    modified = false
+    modified_types = types.map do |t|
+      t_mod = t.send(method, *method_args)
+      modified = !t.equal?(t_mod) unless modified
+      t_mod
+    end
+    if modified
+      block_given? ? yield(modified_types) : modified_types
+    else
+      self
+    end
+  end
+end
 
-      def ==(o)
-        self.class == o.class && @type == o.type
-      end
+# @abstract Encapsulates common behavior for a type that contains one type
+# @api public
+class PTypeWithContainedType < PAnyType
+  attr_reader :type
 
-      def simple_name
-        # since this the class is inconsistently named PType and not PTypeType
-        'Type'
-      end
+  def initialize(type)
+    @type = type
+  end
 
-      DEFAULT = PType.new(nil)
+  def accept(visitor, guard)
+    super
+    @type.accept(visitor, guard) unless @type.nil?
+  end
 
-      protected
+  def generalize
+    if @type.nil?
+      self.class::DEFAULT
+    else
+      ge_type = @type.generalize
+      @type.equal?(ge_type) ? self : self.class.new(ge_type)
+    end
+  end
 
-      # @api private
-      def _assignable?(o)
-        return false unless o.is_a?(PType)
-        return true if @type.nil? # wide enough to handle all types
-        return false if o.type.nil? # wider than t
-        @type.assignable?(o.type)
-      end
+  def normalize(guard = nil)
+    if @type.nil?
+      self.class::DEFAULT
+    else
+      ne_type = @type.normalize(guard)
+      @type.equal?(ne_type) ? self : self.class.new(ne_type)
     end
+  end
 
-    class PNotUndefType < PAnyType
-      attr_reader :type
+  def hash
+    self.class.hash * 31 * @type.hash
+  end
 
-      def initialize(type = nil)
-        @type = type.class == PAnyType ? nil : type
-      end
+  def eql?(o)
+    self.class == o.class && @type == o.type
+  end
+end
 
-      def instance?(o)
-        !(o.nil? || o == :undef) && (@type.nil? || @type.instance?(o))
-      end
+# The type of types.
+# @api public
+#
+class PType < PTypeWithContainedType
+  def instance?(o)
+    if o.is_a?(PAnyType)
+      type.nil? || type.assignable?(o)
+    else
+      assignable?(TypeCalculator.infer(o))
+    end
+  end
 
-      def generalize
-        @type.nil? ? DEFAULT : PNotUndefType.new(type.generalize)
-      end
+  def iterable?(guard = nil)
+    case @type
+    when PEnumType
+      true
+    when PIntegerType
+      @type.finite_range?
+    else
+      false
+    end
+  end
 
-      def hash
-        31 * @type.hash
-      end
+  def iterable_type(guard = nil)
+    # The types PIntegerType and PEnumType are Iterable
+    case @type
+    when PEnumType
+      # @type describes the element type perfectly since the iteration is made over the
+      # contained choices.
+      PIterableType.new(@type)
+    when PIntegerType
+      # @type describes the element type perfectly since the iteration is made over the
+      # specified range.
+      @type.finite_range? ? PIterableType.new(@type) : nil
+    else
+      nil
+    end
+  end
 
-      def ==(o)
-        self.class == o.class && @type == o.type
-      end
+  def eql?(o)
+    self.class == o.class && @type == o.type
+  end
 
-      DEFAULT = PNotUndefType.new
+  def simple_name
+    # since this the class is inconsistently named PType and not PTypeType
+    'Type'
+  end
 
-      protected
+  DEFAULT = PType.new(nil)
 
-      # @api private
-      def _assignable?(o)
-        o.is_a?(PAnyType) && !o.assignable?(PUndefType::DEFAULT) && (@type.nil? || @type.assignable?(o))
-      end
-    end
+  protected
 
-    # @api public
-    #
-    class PUndefType < PAnyType
-      def instance?(o)
-        o.nil? || o == :undef
-      end
+  # @api private
+  def _assignable?(o, guard)
+    return false unless o.is_a?(PType)
+    return true if @type.nil? # wide enough to handle all types
+    return false if o.type.nil? # wider than t
+    @type.assignable?(o.type, guard)
+  end
+end
 
-      # @api private
-      def callable_args?(callable_t)
-        # if callable_t is Optional (or indeed PUndefType), this means that 'missing callable' is accepted
-        callable_t.assignable?(DEFAULT)
-      end
+class PNotUndefType < PTypeWithContainedType
+  def initialize(type = nil)
+    super(type.class == PAnyType ? nil : type)
+  end
 
-      DEFAULT = PUndefType.new
+  def instance?(o)
+    !(o.nil? || o == :undef) && (@type.nil? || @type.instance?(o))
+  end
 
-      protected
-      # @api private
-      def _assignable?(o)
-        o.is_a?(PUndefType)
-      end
+  def normalize(guard = nil)
+    n = super
+    if n.type.nil?
+      n
+    else
+      if n.type.is_a?(POptionalType)
+        # No point in having an optional in a NotUndef
+        PNotUndef.new(n.type.type).normalize
+      elsif !n.type.assignable?(PUndefType::DEFAULT)
+        # THe type is NotUndef anyway, so it can be stripped of
+        n.type
+      else
+        n
+       end
     end
+  end
 
-    # A type private to the type system that describes "ignored type" - i.e. "I am what you are"
-    # @api private
-    #
-    class PUnitType < PAnyType
-      def instance?(o)
-        true
-      end
+  DEFAULT = PNotUndefType.new
 
-      DEFAULT = PUnitType.new
+  protected
 
-      protected
-      # @api private
-      def _assignable?(o)
-        true
-      end
-    end
+  # @api private
+  def _assignable?(o, guard)
+    o.is_a?(PAnyType) && !o.assignable?(PUndefType::DEFAULT, guard) && (@type.nil? || @type.assignable?(o, guard))
+  end
+end
 
-    # @api public
-    #
-    class PDefaultType < PAnyType
-      def instance?(o)
-        o == :default
-      end
+# @api public
+#
+class PUndefType < PAnyType
+  def instance?(o)
+    o.nil? || o == :undef
+  end
 
-      DEFAULT = PDefaultType.new
+  # @api private
+  def callable_args?(callable_t, guard)
+    # if callable_t is Optional (or indeed PUndefType), this means that 'missing callable' is accepted
+    callable_t.assignable?(DEFAULT, guard)
+  end
 
-      protected
-      # @api private
-      def _assignable?(o)
-        o.is_a?(PDefaultType)
-      end
-    end
+  DEFAULT = PUndefType.new
 
-    # A flexible data type, being assignable to its subtypes as well as PArrayType and PHashType with element type assignable to PDataType.
-    #
-    # @api public
-    #
-    class PDataType < PAnyType
-      def ==(o)
-        self.class == o.class || o.class == PVariantType && o == PVariantType::DATA
-      end
+  protected
+  # @api private
+  def _assignable?(o, guard)
+    o.is_a?(PUndefType)
+  end
+end
 
-      def instance?(o)
-        PVariantType::DATA.instance?(o)
-      end
+# A type private to the type system that describes "ignored type" - i.e. "I am what you are"
+# @api private
+#
+class PUnitType < PAnyType
+  def instance?(o)
+    true
+  end
 
-      DEFAULT = PDataType.new
+  DEFAULT = PUnitType.new
 
-      protected
+  protected
+  # @api private
+  def _assignable?(o, guard)
+    true
+  end
+end
 
-      # Data is assignable by other Data and by Array[Data] and Hash[Scalar, Data]
-      # @api private
-      def _assignable?(o)
-        # We cannot put the NotUndefType[Data] in the @data_variant_t since that causes an endless recursion
-        case o
-        when Types::PDataType
-          true
-        when Types::PNotUndefType
-          assignable?(o.type || PUndefType::DEFAULT)
-        else
-          PVariantType::DATA.assignable?(o)
-        end
-      end
-    end
+# @api public
+#
+class PDefaultType < PAnyType
+  def instance?(o)
+    o == :default
+  end
 
-    # Type that is PDataType compatible, but is not a PCollectionType.
-    # @api public
-    #
-    class PScalarType < PAnyType
+  DEFAULT = PDefaultType.new
 
-      def instance?(o)
-        assignable?(TypeCalculator.infer(o))
-      end
+  protected
+  # @api private
+  def _assignable?(o, guard)
+    o.is_a?(PDefaultType)
+  end
+end
 
-      DEFAULT = PScalarType.new
+# A flexible data type, being assignable to its subtypes as well as PArrayType and PHashType with element type assignable to PDataType.
+#
+# @api public
+#
+class PDataType < PAnyType
+  def eql?(o)
+    self.class == o.class || o == PVariantType::DATA
+  end
 
-      protected
+  def instance?(o)
+    PVariantType::DATA.instance?(o)
+  end
 
-      # @api private
-      def _assignable?(o)
-        o.is_a?(PScalarType)
-      end
+  DEFAULT = PDataType.new
+
+  protected
+
+  # Data is assignable by other Data and by Array[Data] and Hash[Scalar, Data]
+  # @api private
+  def _assignable?(o, guard)
+    # We cannot put the NotUndefType[Data] in the @data_variant_t since that causes an endless recursion
+    case o
+    when Types::PDataType
+      true
+    when Types::PNotUndefType
+      assignable?(o.type || PUndefType::DEFAULT, guard)
+    else
+      PVariantType::DATA.assignable?(o, guard)
     end
+  end
+end
 
-    # A string type describing the set of strings having one of the given values
-    # @api public
-    #
-    class PEnumType < PScalarType
-      include Enumerable
+# Type that is PDataType compatible, but is not a PCollectionType.
+# @api public
+#
+class PScalarType < PAnyType
 
-      attr_reader :values
+  def instance?(o)
+    assignable?(TypeCalculator.infer(o))
+  end
 
-      def initialize(values)
-        @values = values.sort.freeze
-      end
+  DEFAULT = PScalarType.new
 
-      # Returns Enumerator if no block is given, otherwise, calls the given
-      # block with each of the strings for this enum
-      def each
-        if block_given?
-          values.each { |x| yield x }
-        else
-          values.to_enum
-        end
-      end
+  protected
 
-      def hash
-        @values.hash
-      end
+  # @api private
+  def _assignable?(o, guard)
+    o.is_a?(PScalarType)
+  end
+end
 
-      def ==(o)
-        self.class == o.class && @values == o.values
-      end
+# A string type describing the set of strings having one of the given values
+# @api public
+#
+class PEnumType < PScalarType
+  attr_reader :values
 
-      DEFAULT = PEnumType.new([])
+  def initialize(values)
+    @values = values.sort.freeze
+  end
 
-      protected
+  # Returns Enumerator if no block is given, otherwise, calls the given
+  # block with each of the strings for this enum
+  def each(&block)
+    r = Iterable.on(self)
+    block_given? ? r.each(&block) : r
+  end
 
-      # @api private
-      def _assignable?(o)
-        return true if self == o
-        svalues = values
-        if svalues.empty?
-          return true if o.is_a?(PStringType) || o.is_a?(PEnumType) || o.is_a?(PPatternType)
-        end
-        case o
-          when PStringType
-            # if the set of strings are all found in the set of enums
-            !o.values.empty? && o.values.all? { |s| svalues.any? { |e| e == s }}
-          when PEnumType
-            !o.values.empty? && o.values.all? { |s| svalues.any? {|e| e == s }}
-          else
-            false
-        end
-      end
-    end
+  def iterable?(guard = nil)
+    true
+  end
 
-    # @api public
-    #
-    class PNumericType < PScalarType
-      def initialize(from, to = Float::INFINITY)
-        from = -Float::INFINITY if from.nil? || from == :default
-        to = Float::INFINITY if to.nil? || to == :default
-        raise ArgumentError, "'from' must be less or equal to 'to'. Got (#{from}, #{to}" if from.is_a?(Numeric) && to.is_a?(Numeric) && from > to
-        @from = from
-        @to = to
-      end
+  def iterable_type(guard = nil)
+    # An instance of an Enum is a String
+    PStringType::ITERABLE_TYPE
+  end
 
-      # Returns the lower bound of the numeric range or `nil` if no lower bound is set.
-      # @return [Float,Integer]
-      def from
-        @from == -Float::INFINITY ? nil : @from
-      end
+  def hash
+    @values.hash
+  end
 
-      # Returns the upper bound of the numeric range or `nil` if no upper bound is set.
-      # @return [Float,Integer]
-      def to
-        @to == Float::INFINITY ? nil : @to
-      end
+  def eql?(o)
+    self.class == o.class && @values == o.values
+  end
 
-      # Same as #from but will return `-Float::Infinity` instead of `nil` if no lower bound is set.
-      # @return [Float,Integer]
-      def numeric_from
-        @from
-      end
+  DEFAULT = PEnumType.new(EMPTY_ARRAY)
 
-      # Same as #to but will return `Float::Infinity` instead of `nil` if no lower bound is set.
-      # @return [Float,Integer]
-      def numeric_to
-        @to
-      end
+  protected
 
-      def hash
-        @from.hash * 31 + @to.hash
-      end
+  # @api private
+  def _assignable?(o, guard)
+    return true if self == o
+    svalues = values
+    if svalues.empty?
+      return true if o.is_a?(PStringType) || o.is_a?(PEnumType) || o.is_a?(PPatternType)
+    end
+    case o
+      when PStringType
+        # if the set of strings are all found in the set of enums
+        !o.values.empty? && o.values.all? { |s| svalues.any? { |e| e == s }}
+      when PEnumType
+        !o.values.empty? && o.values.all? { |s| svalues.any? {|e| e == s }}
+      else
+        false
+    end
+  end
+end
 
-      def ==(o)
-        self.class == o.class && @from == o.numeric_from && @to == o.numeric_to
-      end
+# @api public
+#
+class PNumericType < PScalarType
+  def initialize(from, to = Float::INFINITY)
+    from = -Float::INFINITY if from.nil? || from == :default
+    to = Float::INFINITY if to.nil? || to == :default
+    raise ArgumentError, "'from' must be less or equal to 'to'. Got (#{from}, #{to}" if from.is_a?(Numeric) && to.is_a?(Numeric) && from > to
+    @from = from
+    @to = to
+  end
 
-      def instance?(o)
-        o.is_a?(Numeric) && o >= @from && o <= @to
-      end
+  # Checks if this numeric range intersects with another
+  #
+  # @param o [PNumericType] the range to compare with
+  # @return [Boolean] `true` if this range intersects with the other range
+  # @api public
+  def intersect?(o)
+    self.class == o.class && !(@to < o.from || o.to < @from)
+  end
 
-      def unbounded?
-        @from == -Float::INFINITY && @to == Float::INFINITY
-      end
+  # Returns the lower bound of the numeric range or `nil` if no lower bound is set.
+  # @return [Float,Integer]
+  def from
+    @from == -Float::INFINITY ? nil : @from
+  end
 
-      DEFAULT = PNumericType.new(-Float::INFINITY)
+  # Returns the upper bound of the numeric range or `nil` if no upper bound is set.
+  # @return [Float,Integer]
+  def to
+    @to == Float::INFINITY ? nil : @to
+  end
 
-      protected
+  # Same as #from but will return `-Float::Infinity` instead of `nil` if no lower bound is set.
+  # @return [Float,Integer]
+  def numeric_from
+    @from
+  end
 
-      # @api_private
-      def _assignable?(o)
-        return false unless o.is_a?(self.class)
-        # If o min and max are within the range of t
-        @from <= o.numeric_from && @to >= o.numeric_to
-      end
-    end
+  # Same as #to but will return `Float::Infinity` instead of `nil` if no lower bound is set.
+  # @return [Float,Integer]
+  def numeric_to
+    @to
+  end
 
-    # @api public
-    #
-    class PIntegerType < PNumericType
-      # The integer type is enumerable when it defines a range
-      include Enumerable
+  def hash
+    @from.hash * 31 + @to.hash
+  end
 
-      def enumerable?
-        @from != -Float::INFINITY && @to != Float::INFINITY
-      end
+  def eql?(o)
+    self.class == o.class && @from == o.numeric_from && @to == o.numeric_to
+  end
 
-      def generalize
-        DEFAULT
-      end
+  def instance?(o)
+    o.is_a?(Numeric) && o >= @from && o <= @to
+  end
 
-      def instance?(o)
-        o.is_a?(Integer) && o >= numeric_from && o <= numeric_to
-      end
+  def unbounded?
+    @from == -Float::INFINITY && @to == Float::INFINITY
+  end
 
-      # Returns Float.Infinity if one end of the range is unbound
-      def size
-        return Float::INFINITY if @from == -Float::INFINITY || @to == Float::INFINITY
-        1+(to-from).abs
-      end
+  DEFAULT = PNumericType.new(-Float::INFINITY)
 
-      # Returns the range as an array ordered so the smaller number is always first.
-      # The number may be Infinity or -Infinity.
-      def range
-        [@from, @to]
-      end
+  protected
 
-      # Returns Enumerator if no block is given
-      # Returns nil if size is infinity (does not yield)
-      def each
-        if block_given?
-          enumerable? ? @from.upto(@to) { |x| yield x } : nil
-        else
-          to_enum
-        end
-      end
+  # @api_private
+  def _assignable?(o, guard)
+    return false unless o.is_a?(self.class)
+    # If o min and max are within the range of t
+    @from <= o.numeric_from && @to >= o.numeric_to
+  end
+end
 
-      # Returns a range where both to and from are positive numbers. Negative
-      # numbers are converted to zero
-      # @return [PIntegerType] a positive range
-      def to_size
-        @from >= 0 ? self : PIntegerType.new(0, @to < 0 ? 0 : @to)
-      end
+# @api public
+#
+class PIntegerType < PNumericType
+  # Will respond `true` for any range that is bounded at both ends.
+  #
+  # @return [Boolean] `true` if the type describes a finite range.
+  def finite_range?
+    @from != -Float::INFINITY && @to != Float::INFINITY
+  end
 
-      DEFAULT = PIntegerType.new(-Float::INFINITY)
-    end
+  def generalize
+    DEFAULT
+  end
 
-    # @api public
-    #
-    class PFloatType < PNumericType
-      def generalize
-        DEFAULT
-      end
+  def instance?(o)
+    o.is_a?(Integer) && o >= numeric_from && o <= numeric_to
+  end
 
-      def instance?(o)
-        o.is_a?(Float) && o >= numeric_from && o <= numeric_to
-      end
+  # Checks if this range is adjacent to the given range
+  #
+  # @param o [PIntegerType] the range to compare with
+  # @return [Boolean] `true` if this range is adjacent to the other range
+  # @api public
+  def adjacent?(o)
+    o.is_a?(PIntegerType) &&  (@to + 1 == o.from || o.to + 1 == @from)
+  end
 
-      DEFAULT = PFloatType.new(-Float::INFINITY)
+  # Concatenates this range with another range provided that the ranges intersect or
+  # are adjacent. When that's not the case, this method will return `nil`
+  #
+  # @param o [PIntegerType] the range to concatenate with this range
+  # @return [PIntegerType,nil] the concatenated range or `nil` when the ranges were apart
+  # @api public
+  def merge(o)
+    if intersect?(o) || adjacent?(o)
+      min = @from <= o.from ? @from : o.from
+      max = @to >= o.to ? @to : o.to
+      PIntegerType.new(min, max)
+    else
+      nil
     end
+  end
 
-    # @api public
-    #
-    class PCollectionType < PAnyType
-      attr_reader :element_type, :size_type
-
-      def initialize(element_type, size_type = nil)
-        @element_type = element_type
-        @size_type = size_type
-      end
+  def iterable?(guard = nil)
+    true
+  end
 
-      def generalize
-        @element_type.nil? ? DEFAULT : PCollectionType.new(element_type.generalize, nil)
-      end
+  def iterable_type(guard = nil)
+    # It's unknown if the iterable will be a range (min, max) or a "times" (0, max)
+    PIterableType.new(PIntegerType::DEFAULT)
+  end
 
-      def instance?(o)
-        assignable?(TypeCalculator.infer(o))
-      end
+  # Returns Float.Infinity if one end of the range is unbound
+  def size
+    return Float::INFINITY if @from == -Float::INFINITY || @to == Float::INFINITY
+    1+(to-from).abs
+  end
 
-      # Returns an array with from (min) size to (max) size
-      def size_range
-        (@size_type || DEFAULT_SIZE).range
-      end
+  # Returns the range as an array ordered so the smaller number is always first.
+  # The number may be Infinity or -Infinity.
+  def range
+    [@from, @to]
+  end
 
-      def hash
-        @element_type.hash * 31 + @size_type.hash
-      end
+  # Returns Enumerator if no block is given
+  # Returns nil if size is infinity (does not yield)
+  def each(&block)
+    r = Iterable.on(self)
+    block_given? ? r.each(&block) : r
+  end
 
-      def ==(o)
-        self.class == o.class && @element_type == o.element_type && @size_type == o.size_type
-      end
+  # Returns a range where both to and from are positive numbers. Negative
+  # numbers are converted to zero
+  # @return [PIntegerType] a positive range
+  def to_size
+    @from >= 0 ? self : PIntegerType.new(0, @to < 0 ? 0 : @to)
+  end
 
+  DEFAULT = PIntegerType.new(-Float::INFINITY)
+end
 
-      DEFAULT_SIZE = PIntegerType.new(0)
-      ZERO_SIZE = PIntegerType.new(0, 0)
-      DEFAULT = PCollectionType.new(nil)
+# @api public
+#
+class PFloatType < PNumericType
+  def generalize
+    DEFAULT
+  end
 
-      protected
+  def instance?(o)
+    o.is_a?(Float) && o >= numeric_from && o <= numeric_to
+  end
 
-      # @api private
-      #
-      def _assignable?(o)
-        case o
-          when PCollectionType
-            (@size_type || DEFAULT_SIZE).assignable?(o.size_type || DEFAULT_SIZE)
-          when PTupleType
-            # compute the tuple's min/max size, and check if that size matches
-            from, to = type_to_range(o.size_type)
-            from = o.types.size - 1 + from
-            to = o.types.size - 1 + to
-            (@size_type || DEFAULT_SIZE).assignable?(PIntegerType.new(from, to))
-          when PStructType
-            from = to = o.elements.size
-            (@size_type || DEFAULT_SIZE).assignable?(PIntegerType.new(from, to))
-          else
-            false
-        end
-      end
+  # Concatenates this range with another range provided that the ranges intersect. When that's not the case, this
+  # method will return `nil`
+  #
+  # @param o [PFloatType] the range to concatenate with this range
+  # @return [PFloatType,nil] the concatenated range or `nil` when the ranges were apart
+  # @api public
+  def merge(o)
+    if intersect?(o)
+      min = @from <= o.from ? @from : o.from
+      max = @to >= o.to ? @to : o.to
+      PFloatType.new(min, max)
+    else
+      nil
     end
+  end
 
-    # @api public
-    #
-    class PStringType < PScalarType
-      attr_reader :size_type, :values
+  DEFAULT = PFloatType.new(-Float::INFINITY)
+end
 
-      def generalize
-        DEFAULT
-      end
+# @api public
+#
+class PCollectionType < PAnyType
+  attr_reader :element_type, :size_type
 
-      def initialize(size_type, values = [])
-        @size_type = size_type
-        @values = values.sort.freeze
-      end
+  def initialize(element_type, size_type = nil)
+    @element_type = element_type
+    @size_type = size_type
+  end
 
-      def hash
-        @size_type.hash * 31 + @values.hash
-      end
+  def accept(visitor, guard)
+    super
+    @size_type.accept(visitor, guard) unless @size_type.nil?
+    @element_type.accept(visitor, guard) unless @element_type.nil?
+  end
 
-      def ==(o)
-        self.class == o.class && @size_type == o.size_type && @values == o.values
-      end
+  def generalize
+    if @element_type.nil?
+      DEFAULT
+    else
+      ge_type = @element_type.generalize
+      @size_type.nil? && @element_type.equal?(ge_type) ? self : self.class.new(ge_type, nil)
+    end
+  end
 
-      def instance?(o)
-        # true if size compliant
-        if o.is_a?(String) && (@size_type.nil? || @size_type.instance?(o.size))
-          @values.empty? || @values.include?(o)
-        else
-          false
-        end
-      end
-
-      DEFAULT = PStringType.new(nil)
-      NON_EMPTY = PStringType.new(PIntegerType.new(1))
-
-      protected
-
-      # @api private
-      def _assignable?(o)
-        if values.empty?
-          # A general string is assignable by any other string or pattern restricted string
-          # if the string has a size constraint it does not match since there is no reasonable way
-          # to compute the min/max length a pattern will match. For enum, it is possible to test that
-          # each enumerator value is within range
-          case o
-            when PStringType
-              # true if size compliant
-              (@size_type || PCollectionType::DEFAULT_SIZE).assignable?(o.size_type || PCollectionType::DEFAULT_SIZE)
-
-            when PPatternType
-              # true if size constraint is at least 0 to +Infinity (which is the same as the default)
-              @size_type.nil? || @size_type.assignable?(PCollectionType::DEFAULT_SIZE)
-
-            when PEnumType
-              if o.values.empty?
-                # enum represents all enums, and thus all strings, a sized constrained string can thus not
-                # be assigned any enum (unless it is max size).
-                @size_type.nil? || @size_type.assignable?(PCollectionType::DEFAULT_SIZE)
-              else
-                # true if all enum values are within range
-                orange = o.values.map(&:size).minmax
-                srange = (@size_type || PCollectionType::DEFAULT_SIZE).range
-                # If o min and max are within the range of t
-                srange[0] <= orange[0] && srange[1] >= orange[1]
-              end
-            else
-              # no other type matches string
-              false
-          end
-        elsif o.is_a?(PStringType)
-          # A specific string acts as a set of strings - must have exactly the same strings
-          # In this case, size does not matter since the definition is very precise anyway
-          values == o.values
-        else
-          # All others are false, since no other type describes the same set of specific strings
-          false
-        end
-      end
+  def normalize(guard = nil)
+    if @element_type.nil?
+      DEFAULT
+    else
+      ne_type = @element_type.normalize(guard)
+      @element_type.equal?(ne_type) ? self : self.class.new(ne_type, @size_type)
     end
+  end
 
-    # @api public
-    #
-    class PRegexpType < PScalarType
-      attr_reader :pattern
+  def instance?(o)
+    assignable?(TypeCalculator.infer(o))
+  end
 
-      def initialize(pattern)
-        @pattern = pattern
-      end
+  # Returns an array with from (min) size to (max) size
+  def size_range
+    (@size_type || DEFAULT_SIZE).range
+  end
 
-      def regexp
-        @regexp ||= Regexp.new(@pattern || '')
-      end
+  def hash
+    @element_type.hash * 31 + @size_type.hash
+  end
 
-      def hash
-        @pattern.hash
-      end
+  def iterable?(guard = nil)
+    true
+  end
 
-      def ==(o)
-        self.class == o.class && @pattern == o.pattern
-      end
+  def iterable_type(guard = nil)
+    @element_type.nil? ? PIterableType::DEFAULT : PIterableType.new(@element_type)
+  end
+
+  def eql?(o)
+    self.class == o.class && @element_type == o.element_type && @size_type == o.size_type
+  end
 
-      DEFAULT = PRegexpType.new(nil)
 
-      protected
+  DEFAULT_SIZE = PIntegerType.new(0)
+  ZERO_SIZE = PIntegerType.new(0, 0)
+  DEFAULT = PCollectionType.new(nil)
 
-      # @api private
-      #
-      def _assignable?(o)
-        o.is_a?(PRegexpType) && (@pattern.nil? || @pattern == o.pattern)
-      end
+  protected
+
+  # @api private
+  #
+  def _assignable?(o, guard)
+    case o
+      when PCollectionType
+        (@size_type || DEFAULT_SIZE).assignable?(o.size_type || DEFAULT_SIZE, guard)
+      when PTupleType
+        # compute the tuple's min/max size, and check if that size matches
+        from, to = type_to_range(o.size_type)
+        from = o.types.size - 1 + from
+        to = o.types.size - 1 + to
+        (@size_type || DEFAULT_SIZE).assignable?(PIntegerType.new(from, to), guard)
+      when PStructType
+        from = to = o.elements.size
+        (@size_type || DEFAULT_SIZE).assignable?(PIntegerType.new(from, to), guard)
+      else
+        false
     end
+  end
+end
 
-    # Represents a subtype of String that narrows the string to those matching the patterns
-    # If specified without a pattern it is basically the same as the String type.
-    #
-    # @api public
-    #
-    class PPatternType < PScalarType
-      attr_reader :patterns
+class PIterableType < PTypeWithContainedType
+  def element_type
+    @type
+  end
 
-      def initialize(patterns)
-        @patterns = patterns.freeze
+  def instance?(o)
+    if @type.nil? || @type.assignable?(PAnyType::DEFAULT)
+      # Any element_type will do
+      case o
+      when Iterable, String, Hash, Array, Range, PEnumType
+        true
+      when Integer
+        o >= 0
+      when PIntegerType
+        o.finite_range?
+      else
+        false
       end
+    else
+      assignable?(TypeCalculator.infer(o))
+    end
+  end
 
-      def hash
-        @patterns.hash
-      end
+  def iterable?(guard = nil)
+    true
+  end
 
-      def ==(o)
-        self.class == o.class && (@patterns | o.patterns).size == @patterns.size
-      end
+  def iterable_type(guard = nil)
+    self
+  end
 
-      DEFAULT = PPatternType.new([])
+  DEFAULT = PIterableType.new(nil)
 
-      protected
+  protected
 
-      # @api private
-      #
-      def _assignable?(o)
-        return true if self == o
-        case o
-        when PStringType, PEnumType
+  # @api private
+  def _assignable?(o, guard)
+    if @type.nil? || @type.assignable?(PAnyType::DEFAULT, guard)
+      # Don't request the iterable_type. Since this Iterable accepts Any element, it is enough that o is iterable.
+      o.iterable?
+    else
+      o = o.iterable_type
+      o.nil? || o.element_type.nil? ? false : @type.assignable?(o.element_type, guard)
+    end
+  end
+end
+
+# @api public
+#
+class PIteratorType < PTypeWithContainedType
+  def element_type
+    @type
+  end
+
+  def instance?(o)
+    o.is_a?(Iterable) && (@element_type.nil? || @element_type.assignable?(o.element_type))
+  end
+
+  def iterable?(guard = nil)
+    true
+  end
+
+  def iterable_type(guard = nil)
+    @type.nil? ? PIteratbleType::DEFAULT : PIterableType.new(@element_type)
+  end
+
+  DEFAULT = PIteratorType.new(nil)
+
+  protected
+
+  # @api private
+  def _assignable?(o, guard)
+    o.is_a?(PIteratorType) && (@element_type.nil? || @element_type.assignable?(o.element_type, guard))
+  end
+end
+
+# @api public
+#
+class PStringType < PScalarType
+  attr_reader :size_type, :values
+
+  def initialize(size_type, values = EMPTY_ARRAY)
+    @size_type = size_type
+    @values = values.sort.freeze
+  end
+
+  def accept(visitor, guard)
+    super
+    @size_type.accept(visitor, guard) unless @size_type.nil?
+  end
+
+  def generalize
+    DEFAULT
+  end
+
+  def hash
+    @size_type.hash * 31 + @values.hash
+  end
+
+  def iterable?(guard = nil)
+    true
+  end
+
+  def iterable_type(guard = nil)
+    ITERABLE_TYPE
+  end
+
+  def eql?(o)
+    self.class == o.class && @size_type == o.size_type && @values == o.values
+  end
+
+  def instance?(o)
+    # true if size compliant
+    if o.is_a?(String) && (@size_type.nil? || @size_type.instance?(o.size))
+      @values.empty? || @values.include?(o)
+    else
+      false
+    end
+  end
+
+  DEFAULT = PStringType.new(nil)
+  NON_EMPTY = PStringType.new(PIntegerType.new(1))
+
+  # Iterates over each character of the string
+  ITERABLE_TYPE = PIterableType.new(PStringType.new(PIntegerType.new(1,1)))
+
+  protected
+
+  # @api private
+  def _assignable?(o, guard)
+    if values.empty?
+      # A general string is assignable by any other string or pattern restricted string
+      # if the string has a size constraint it does not match since there is no reasonable way
+      # to compute the min/max length a pattern will match. For enum, it is possible to test that
+      # each enumerator value is within range
+      case o
+        when PStringType
+          # true if size compliant
+          (@size_type || PCollectionType::DEFAULT_SIZE).assignable?(
+            o.size_type || PCollectionType::DEFAULT_SIZE, guard)
+
+        when PPatternType
+          # true if size constraint is at least 0 to +Infinity (which is the same as the default)
+          @size_type.nil? || @size_type.assignable?(PCollectionType::DEFAULT_SIZE, guard)
+
+        when PEnumType
           if o.values.empty?
-            # Strings / Enums (unknown which ones) cannot all match a pattern, but if there is no pattern it is ok
-            # (There should really always be a pattern, but better safe than sorry).
-            @patterns.empty?
+            # enum represents all enums, and thus all strings, a sized constrained string can thus not
+            # be assigned any enum (unless it is max size).
+            @size_type.nil? || @size_type.assignable?(PCollectionType::DEFAULT_SIZE, guard)
           else
-            # all strings in String/Enum type must match one of the patterns in Pattern type,
-            # or Pattern represents all Patterns == all Strings
-            regexps = @patterns.map { |p| p.regexp }
-            regexps.empty? || o.values.all? { |v| regexps.any? {|re| re.match(v) } }
+            # true if all enum values are within range
+            orange = o.values.map(&:size).minmax
+            srange = (@size_type || PCollectionType::DEFAULT_SIZE).range
+            # If o min and max are within the range of t
+            srange[0] <= orange[0] && srange[1] >= orange[1]
           end
-        when PPatternType
-          @patterns.empty?
         else
+          # no other type matches string
           false
-        end
       end
+    elsif o.is_a?(PStringType)
+      # A specific string acts as a set of strings - must have exactly the same strings
+      # In this case, size does not matter since the definition is very precise anyway
+      values == o.values
+    else
+      # All others are false, since no other type describes the same set of specific strings
+      false
     end
+  end
+end
 
-    # @api public
-    #
-    class PBooleanType < PScalarType
+# @api public
+#
+class PRegexpType < PScalarType
+  attr_reader :pattern
 
-      def instance?(o)
-        o == true || o == false
-      end
+  def initialize(pattern)
+    @pattern = pattern
+  end
 
-      DEFAULT = PBooleanType.new
+  def regexp
+    @regexp ||= Regexp.new(@pattern || '')
+  end
 
-      protected
+  def hash
+    @pattern.hash
+  end
 
-      # @api private
-      #
-      def _assignable?(o)
-        o.is_a?(PBooleanType)
-      end
+  def eql?(o)
+    self.class == o.class && @pattern == o.pattern
+  end
+
+  DEFAULT = PRegexpType.new(nil)
+
+  protected
+
+  # @api private
+  #
+  def _assignable?(o, guard)
+    o.is_a?(PRegexpType) && (@pattern.nil? || @pattern == o.pattern)
+  end
+end
+
+# Represents a subtype of String that narrows the string to those matching the patterns
+# If specified without a pattern it is basically the same as the String type.
+#
+# @api public
+#
+class PPatternType < PScalarType
+  attr_reader :patterns
+
+  def initialize(patterns)
+    @patterns = patterns.freeze
+  end
+
+  def accept(visitor, guard)
+    super
+    @patterns.each { |p| p.accept(visitor, guard) }
+  end
+
+  def hash
+    @patterns.hash
+  end
+
+  def eql?(o)
+    self.class == o.class && @patterns.size == o.patterns.size && (@patterns - o.patterns).empty?
+  end
+
+  DEFAULT = PPatternType.new(EMPTY_ARRAY)
+
+  protected
+
+  # @api private
+  #
+  def _assignable?(o, guard)
+    return true if self == o
+    case o
+    when PStringType, PEnumType
+      if o.values.empty?
+        # Strings / Enums (unknown which ones) cannot all match a pattern, but if there is no pattern it is ok
+        # (There should really always be a pattern, but better safe than sorry).
+        @patterns.empty?
+      else
+        # all strings in String/Enum type must match one of the patterns in Pattern type,
+        # or Pattern represents all Patterns == all Strings
+        regexps = @patterns.map { |p| p.regexp }
+        regexps.empty? || o.values.all? { |v| regexps.any? {|re| re.match(v) } }
+      end
+    when PPatternType
+      @patterns.empty?
+    else
+      false
     end
+  end
+end
 
-    # @api public
-    #
-    # @api public
-    #
-    class PStructElement < TypedModelObject
-      attr_accessor :key_type, :value_type
+# @api public
+#
+class PBooleanType < PScalarType
 
-      def hash
-        value_type.hash * 31 + key_type.hash
-      end
+  def instance?(o)
+    o == true || o == false
+  end
 
-      def name
-        k = key_type
-        k = k.optional_type if k.is_a?(POptionalType)
-        k.values[0]
-      end
+  DEFAULT = PBooleanType.new
 
-      def initialize(key_type, value_type)
-        @key_type = key_type
-        @value_type = value_type
-      end
+  protected
 
-      def generalize
-        PStructElement.new(@key_type, @value_type.generalize)
-      end
+  # @api private
+  #
+  def _assignable?(o, guard)
+    o.is_a?(PBooleanType)
+  end
+end
 
-      def <=>(o)
-        self.name <=> o.name
-      end
+# @api public
+#
+# @api public
+#
+class PStructElement < TypedModelObject
+  attr_accessor :key_type, :value_type
 
-      def ==(o)
-         self.class == o.class && value_type == o.value_type && key_type == o.key_type
-      end
+  def accept(visitor, guard)
+    @key_type.accept(visitor, guard)
+    @value_type.accept(visitor, guard)
+  end
+
+  def hash
+    value_type.hash * 31 + key_type.hash
+  end
+
+  def name
+    k = key_type
+    k = k.optional_type if k.is_a?(POptionalType)
+    k.values[0]
+  end
+
+  def initialize(key_type, value_type)
+    @key_type = key_type
+    @value_type = value_type
+  end
+
+  def generalize
+    gv_type = @value_type.generalize
+    @value_type.equal?(gv_type) ? self : PStructElement.new(@key_type, gv_type)
+  end
+
+  def normalize(guard = nil)
+    nv_type = @value_type.normalize(guard)
+    @value_type.equal?(nv_type) ? self : PStructElement.new(@key_type, nv_type)
+  end
+
+  def <=>(o)
+    self.name <=> o.name
+  end
+
+  def eql?(o)
+     self.class == o.class && value_type == o.value_type && key_type == o.key_type
+  end
+end
+
+# @api public
+#
+class PStructType < PAnyType
+  include Enumerable
+
+  def initialize(elements)
+    @elements = elements.sort.freeze
+  end
+
+  def accept(visitor, guard)
+    super
+    @elements.each { |elem| elem.accept(visitor, guard) }
+  end
+
+  def each
+    if block_given?
+      elements.each { |elem| yield elem }
+    else
+      elements.to_enum
     end
+  end
 
-    # @api public
-    #
-    class PStructType < PAnyType
-      include Enumerable
+  def generalize
+    if @elements.empty?
+      DEFAULT
+    else
+      alter_type_array(@elements, :generalize) { |altered| PStructType.new(altered) }
+    end
+  end
 
-      def initialize(elements)
-        @elements = elements.sort.freeze
-      end
+  def normalize(guard = nil)
+    if @elements.empty?
+      DEFAULT
+    else
+      alter_type_array(@elements, :normalize, guard) { |altered| PStructType.new(altered) }
+    end
+  end
 
-      def each
-        if block_given?
-          elements.each { |elem| yield elem }
-        else
-          elements.to_enum
-        end
-      end
+  def hashed_elements
+    @hashed ||= @elements.reduce({}) {|memo, e| memo[e.name] = e; memo }
+  end
 
-      def generalize
-        @elements.empty? ? DEFAULT : PStructType.new(@elements.map { |se| se.generalize })
-      end
+  def hash
+    @elements.hash
+  end
 
-      def hashed_elements
-        @hashed ||= @elements.reduce({}) {|memo, e| memo[e.name] = e; memo }
-      end
- 
-      def hash
-        @elements.hash
-      end
+  def iterable?(guard = nil)
+    true
+  end
 
-      def ==(o)
-        self.class == o.class && @elements == o.elements
-      end
+  def iterable_type(guard = nil)
+    if self == DEFAULT
+      PIterableType.new(PHashType::DEFAULT_KEY_PAIR_TUPLE)
+    else
+      tc = TypeCalculator.singleton
+      PIterableType.new(
+        PTupleType.new([
+          tc.unwrap_single_variant(PVariantType.new(@elements.map {|se| se.key_type })),
+          tc.unwrap_single_variant(PVariantType.new(@elements.map {|se| se.value_type }))],
+          PHashType::KEY_PAIR_TUPLE_SIZE))
+    end
+  end
 
-      def elements
-        @elements
-      end
+  def eql?(o)
+    self.class == o.class && @elements == o.elements
+  end
 
-      def instance?(o)
-        return false unless o.is_a?(Hash)
-        matched = 0
-        @elements.all? do |e|
-          key = e.name
-          v = o[key]
-          if v.nil? && !o.include?(key)
-            # Entry is missing. Only OK when key is optional
-            e.key_type.assignable?(PUndefType::DEFAULT)
-          else
-            matched += 1
-            e.value_type.instance?(v)
-          end
-        end && matched == o.size
-      end
+  def elements
+    @elements
+  end
 
-      DEFAULT = PStructType.new([])
-
-      protected
-
-      # @api private
-      def _assignable?(o)
-        if o.is_a?(Types::PStructType)
-          h2 = o.hashed_elements
-          matched = 0
-          elements.all? do |e1|
-            e2 = h2[e1.name]
-            if e2.nil?
-              e1.key_type.assignable?(PUndefType::DEFAULT)
-            else
-              matched += 1
-              e1.key_type.assignable?(e2.key_type) && e1.value_type.assignable?(e2.value_type)
-            end
-          end && matched == h2.size
-        elsif o.is_a?(Types::PHashType)
-          required = 0
-          required_elements_assignable = elements.all? do |e|
-            if e.key_type.assignable?(PUndefType::DEFAULT)
-              true
-            else
-              required += 1
-              e.value_type.assignable?(o.element_type)
-            end
-          end
-          if required_elements_assignable
-            size_o = o.size_type || collection_default_size_t
-            PIntegerType.new(required, elements.size).assignable?(size_o)
-          end
+  def instance?(o)
+    return false unless o.is_a?(Hash)
+    matched = 0
+    @elements.all? do |e|
+      key = e.name
+      v = o[key]
+      if v.nil? && !o.include?(key)
+        # Entry is missing. Only OK when key is optional
+        e.key_type.assignable?(PUndefType::DEFAULT)
+      else
+        matched += 1
+        e.value_type.instance?(v)
+      end
+    end && matched == o.size
+  end
+
+  DEFAULT = PStructType.new(EMPTY_ARRAY)
+
+  protected
+
+  # @api private
+  def _assignable?(o, guard)
+    if o.is_a?(Types::PStructType)
+      h2 = o.hashed_elements
+      matched = 0
+      elements.all? do |e1|
+        e2 = h2[e1.name]
+        if e2.nil?
+          e1.key_type.assignable?(PUndefType::DEFAULT, guard)
         else
-          false
+          matched += 1
+          e1.key_type.assignable?(e2.key_type, guard) && e1.value_type.assignable?(e2.value_type, guard)
+        end
+      end && matched == h2.size
+    elsif o.is_a?(Types::PHashType)
+      required = 0
+      required_elements_assignable = elements.all? do |e|
+        if e.key_type.assignable?(PUndefType::DEFAULT)
+          true
+        else
+          required += 1
+          e.value_type.assignable?(o.element_type, guard)
         end
       end
+      if required_elements_assignable
+        size_o = o.size_type || collection_default_size_t
+        PIntegerType.new(required, elements.size).assignable?(size_o, guard)
+      end
+    else
+      false
     end
+  end
+end
 
-    # @api public
-    #
-    class PTupleType < PAnyType
-      include Enumerable
+# @api public
+#
+class PTupleType < PAnyType
+  include Enumerable
 
-      # If set, describes min and max required of the given types - if max > size of
-      # types, the last type entry repeats
-      #
-      attr_reader :size_type
+  # If set, describes min and max required of the given types - if max > size of
+  # types, the last type entry repeats
+  #
+  attr_reader :size_type
 
-      attr_reader :types
+  attr_reader :types
 
-      # @api private
-      def callable_args?(callable_t)
-        unless size_type.nil?
-          raise ArgumentError, 'Callable tuple may not have a size constraint when used as args'
-        end
+  def accept(visitor, guard)
+    super
+    @size_type.accept(visitor, guard) unless @size_type.nil?
+    @types.each { |elem| elem.accept(visitor, guard) }
+  end
 
-        params_tuple = callable_t.param_types
-        param_block_t = callable_t.block_type
-        arg_types = @types
-        arg_block_t = arg_types.last
-        if arg_block_t.kind_of_callable?
-          # Can't pass a block to a callable that doesn't accept one
-          return false if param_block_t.nil?
-
-          # Check that the block is of the right tyṕe
-          return false unless param_block_t.assignable?(arg_block_t)
-
-          # Check other arguments
-          arg_count = arg_types.size - 1
-          params_size_t = params_tuple.size_type || PIntegerType.new(*params_tuple.size_range)
-          return false unless params_size_t.assignable?(PIntegerType.new(arg_count, arg_count))
-
-          ctypes = params_tuple.types
-          arg_count.times do |index|
-            return false unless (ctypes[index] || ctypes[-1]).assignable?(arg_types[index])
-          end
-          return true
-        end
+  # @api private
+  def callable_args?(callable_t, guard)
+    unless size_type.nil?
+      raise ArgumentError, 'Callable tuple may not have a size constraint when used as args'
+    end
 
-        # Check that tuple is assignable and that the block (if declared) is optional
-        params_tuple.assignable?(self) && (param_block_t.nil? || param_block_t.assignable?(PUndefType::DEFAULT))
-      end
+    params_tuple = callable_t.param_types
+    param_block_t = callable_t.block_type
+    arg_types = @types
+    arg_block_t = arg_types.last
+    if arg_block_t.kind_of_callable?(true, guard)
+      # Can't pass a block to a callable that doesn't accept one
+      return false if param_block_t.nil?
 
-      def initialize(types, size_type = nil)
-        @types = types
-        @size_type = size_type.nil? ? nil : size_type.to_size
-      end
+      # Check that the block is of the right tyṕe
+      return false unless param_block_t.assignable?(arg_block_t, guard)
 
-      # Returns Enumerator for the types if no block is given, otherwise, calls the given
-      # block with each of the types in this tuple
-      def each
-        if block_given?
-          types.each { |x| yield x }
-        else
-          types.to_enum
-        end
-      end
+      # Check other arguments
+      arg_count = arg_types.size - 1
+      params_size_t = params_tuple.size_type || PIntegerType.new(*params_tuple.size_range)
+      return false unless params_size_t.assignable?(PIntegerType.new(arg_count, arg_count), guard)
 
-      def generalize
-        self == DEFAULT ? self : PTupleType.new(@types.map {|t| t.generalize })
+      ctypes = params_tuple.types
+      arg_count.times do |index|
+        return false unless (ctypes[index] || ctypes[-1]).assignable?(arg_types[index], guard)
       end
+      return true
+    end
 
-      def instance?(o)
-        return false unless o.is_a?(Array)
-        # compute the tuple's min/max size, and check if that size matches
-        size_t = size_type || PIntegerType.new(*size_range)
+    # Check that tuple is assignable and that the block (if declared) is optional
+    params_tuple.assignable?(self, guard) && (param_block_t.nil? || param_block_t.assignable?(PUndefType::DEFAULT, guard))
+  end
 
-        return false unless size_t.instance?(o.size)
-        o.each_with_index do |element, index|
-          return false unless (types[index] || types[-1]).instance?(element)
-        end
-        true
-      end
+  def initialize(types, size_type = nil)
+    @types = types
+    @size_type = size_type.nil? ? nil : size_type.to_size
+  end
 
-      # Returns the number of elements accepted [min, max] in the tuple
-      def size_range
-        if @size_type.nil?
-          types_size = @types.size
-          [types_size, types_size]
-        else
-          @size_type.range
-        end
-      end
+  # Returns Enumerator for the types if no block is given, otherwise, calls the given
+  # block with each of the types in this tuple
+  def each
+    if block_given?
+      types.each { |x| yield x }
+    else
+      types.to_enum
+    end
+  end
 
-      # Returns the number of accepted occurrences [min, max] of the last type in the tuple
-      # The defaults is [1,1]
-      #
-      def repeat_last_range
-        if @size_type.nil?
-          return [1, 1]
-        end
-        types_size = @types.size
-        from, to = @size_type.range
-        min = from - (types_size-1)
-        min = min <= 0 ? 0 : min
-        max = to - (types_size-1)
-        [min, max]
-      end
+  def generalize
+    if self == DEFAULT
+      DEFAULT
+    else
+      alter_type_array(@types, :generalize) { |altered_types| PTupleType.new(altered_types, @size_type) }
+    end
+  end
 
-      def hash
-        @size_type.hash * 31 + @types.hash
-      end
+  def normalize(guard = nil)
+    if self == DEFAULT
+      DEFAULT
+    else
+      alter_type_array(@types, :normalize, guard) { |altered_types| PTupleType.new(altered_types, @size_type) }
+    end
+  end
 
-      def ==(o)
-        self.class == o.class && @types == o.types && @size_type == o.size_type
-      end
+  def instance?(o)
+    return false unless o.is_a?(Array)
+    # compute the tuple's min/max size, and check if that size matches
+    size_t = size_type || PIntegerType.new(*size_range)
 
-      DATA = PTupleType.new([PDataType::DEFAULT], PCollectionType::DEFAULT_SIZE)
-      DEFAULT = PTupleType.new([])
+    return false unless size_t.instance?(o.size)
+    o.each_with_index do |element, index|
+      return false unless (types[index] || types[-1]).instance?(element)
+    end
+    true
+  end
 
-      protected
+  def iterable?(guard = nil)
+    true
+  end
 
-      # @api private
-      def _assignable?(o)
-        return true if self == o
-        s_types = types
-        return true if s_types.empty? && (o.is_a?(PArrayType))
-        size_s = size_type || PIntegerType.new(*size_range)
+  def iterable_type(guard = nil)
+    PIterableType.new(TypeCalculator.singleton.unwrap_single_variant(PVariantType.new(types)))
+  end
 
-        if o.is_a?(PTupleType)
-          size_o = o.size_type || PIntegerType.new(*o.size_range)
+  # Returns the number of elements accepted [min, max] in the tuple
+  def size_range
+    if @size_type.nil?
+      types_size = @types.size
+      [types_size, types_size]
+    else
+      @size_type.range
+    end
+  end
 
-          # not assignable if the number of types in o is outside number of types in t1
-          if size_s.assignable?(size_o)
-            o_types = o.types
-            o_types.size.times do |index|
-              return false unless (s_types[index] || s_types[-1]).assignable?(o_types[index])
-            end
-            return true
-          else
-            return false
-          end
-        elsif o.is_a?(PArrayType)
-          o_entry = o.element_type
-          # Array of anything can not be assigned (unless tuple is tuple of anything) - this case
-          # was handled at the top of this method.
-          #
-          return false if o_entry.nil?
-          size_o = o.size_type || PCollectionType::DEFAULT_SIZE
-          return false unless size_s.assignable?(size_o)
-          [s_types.size, size_o.range[1]].min.times { |index| return false unless (s_types[index] || s_types[-1]).assignable?(o_entry) }
-          true
-        else
-          false
-        end
-      end
+  # Returns the number of accepted occurrences [min, max] of the last type in the tuple
+  # The defaults is [1,1]
+  #
+  def repeat_last_range
+    if @size_type.nil?
+      return [1, 1]
     end
+    types_size = @types.size
+    from, to = @size_type.range
+    min = from - (types_size-1)
+    min = min <= 0 ? 0 : min
+    max = to - (types_size-1)
+    [min, max]
+  end
 
-    # @api public
-    #
-    class PCallableType < PAnyType
-      # Types of parameters as a Tuple with required/optional count, or an Integer with min (required), max count
-      # @return [PTupleType] the tuple representing the parameter types
-      attr_reader :param_types
-
-      # Although being an abstract type reference, only Callable, or all Callables wrapped in
-      # Optional or Variant are supported
-      # If not set, the meaning is that block is not supported.
-      # @return [PAnyType|nil] the block type
-      attr_reader :block_type
-
-      # @param param_types [PTupleType]
-      # @param block_type [PAnyType|nil]
-      def initialize(param_types, block_type = nil)
-        @param_types = param_types
-        @block_type = block_type
-      end
+  def hash
+    @size_type.hash * 31 + @types.hash
+  end
 
-      def generalize
-        return self if self == DEFAULT
-        params_t = @param_types.nil? ? nil : @param_types.generalize
-        block_t = @block_type.nil? ? nil : @block_type.generalize
-        PCallableType.new(params_t, block_t)
-      end
+  def eql?(o)
+    self.class == o.class && @types == o.types && @size_type == o.size_type
+  end
 
-      def instance?(o)
-        assignable?(TypeCalculator.infer(o))
-      end
+  DATA = PTupleType.new([PDataType::DEFAULT], PCollectionType::DEFAULT_SIZE)
+  DEFAULT = PTupleType.new(EMPTY_ARRAY)
 
-      # @api private
-      def callable_args?(required_callable_t)
-        # If the required callable is euqal or more specific than self, self is acceptable arguments
-        required_callable_t.assignable?(self)
-      end
+  protected
 
-      def kind_of_callable?(optional=true)
-          true
-      end
+  # @api private
+  def _assignable?(o, guard)
+    return true if self == o
+    s_types = types
+    return true if s_types.empty? && (o.is_a?(PArrayType))
+    size_s = size_type || PIntegerType.new(*size_range)
 
-      # Returns the number of accepted arguments [min, max]
-      def size_range
-        @param_types.nil? ? nil : @param_types.size_range
-      end
+    if o.is_a?(PTupleType)
+      size_o = o.size_type || PIntegerType.new(*o.size_range)
 
-      # Returns the number of accepted arguments for the last parameter type [min, max]
+      # not assignable if the number of types in o is outside number of types in t1
+      if size_s.assignable?(size_o, guard)
+        o_types = o.types
+        o_types.size.times do |index|
+          return false unless (s_types[index] || s_types[-1]).assignable?(o_types[index], guard)
+        end
+        return true
+      else
+        return false
+      end
+    elsif o.is_a?(PArrayType)
+      o_entry = o.element_type
+      # Array of anything can not be assigned (unless tuple is tuple of anything) - this case
+      # was handled at the top of this method.
       #
-      def last_range
-        @param_types.nil? ? nil : @param_types.repeat_last_range
-      end
+      return false if o_entry.nil?
+      size_o = o.size_type || PCollectionType::DEFAULT_SIZE
+      return false unless size_s.assignable?(size_o, guard)
+      [s_types.size, size_o.range[1]].min.times { |index| return false unless (s_types[index] || s_types[-1]).assignable?(o_entry, guard) }
+      true
+    else
+      false
+    end
+  end
+end
 
-      # Range [0,0], [0,1], or [1,1] for the block
-      #
-      def block_range
-        case block_type
-        when POptionalType
-          [0,1]
-        when PVariantType, PCallableType
-          [1,1]
-        else
-          [0,0]
-        end
-      end
+# @api public
+#
+class PCallableType < PAnyType
+  # Types of parameters as a Tuple with required/optional count, or an Integer with min (required), max count
+  # @return [PTupleType] the tuple representing the parameter types
+  attr_reader :param_types
+
+  # Although being an abstract type reference, only Callable, or all Callables wrapped in
+  # Optional or Variant are supported
+  # If not set, the meaning is that block is not supported.
+  # @return [PAnyType|nil] the block type
+  attr_reader :block_type
+
+  # @param param_types [PTupleType]
+  # @param block_type [PAnyType|nil]
+  def initialize(param_types, block_type = nil)
+    @param_types = param_types
+    @block_type = block_type
+  end
 
-      def hash
-        @param_types.hash * 31 + @block_type.hash
-      end
+  def accept(visitor, guard)
+    super
+    @param_types.accept(visitor, guard) unless @param_types.nil?
+    @block_type.accept(visitor, guard) unless @block_type.nil?
+  end
 
-      def ==(o)
-        self.class == o.class && @param_types == o.param_types && @block_type == o.block_type
-      end
+  def generalize
+    if self == DEFAULT
+      DEFAULT
+    else
+      params_t = @param_types.nil? ? nil : @param_types.generalize
+      block_t = @block_type.nil? ? nil : @block_type.generalize
+      @param_types.equal?(params_t) && @block_type.equal?(block_t) ? self : PCallableType.new(params_t, block_t)
+    end
+  end
+
+  def normalize(guard = nil)
+    if self == DEFAULT
+      DEFAULT
+    else
+      params_t = @param_types.nil? ? nil : @param_types.normalize(guard)
+      block_t = @block_type.nil? ? nil : @block_type.normalize(guard)
+      @param_types.equal?(params_t) && @block_type.equal?(block_t) ? self : PCallableType.new(params_t, block_t)
+    end
+  end
+
+  def instance?(o)
+    assignable?(TypeCalculator.infer(o))
+  end
 
-      DEFAULT = PCallableType.new(nil)
+  # @api private
+  def callable_args?(required_callable_t, guard)
+    # If the required callable is euqal or more specific than self, self is acceptable arguments
+    required_callable_t.assignable?(self, guard)
+  end
 
-      protected
+  def kind_of_callable?(optional=true, guard = nil)
+      true
+  end
 
-      # @api private
-      def _assignable?(o)
-        return false unless o.is_a?(PCallableType)
-        # nil param_types means, any other Callable is assignable
-        return true if @param_types.nil?
+  # Returns the number of accepted arguments [min, max]
+  def size_range
+    @param_types.nil? ? nil : @param_types.size_range
+  end
 
-        # NOTE: these tests are made in reverse as it is calling the callable that is constrained
-        # (it's lower bound), not its upper bound
-        return false unless o.param_types.assignable?(@param_types)
-        # names are ignored, they are just information
-        # Blocks must be compatible
-        this_block_t = @block_type || PUndefType::DEFAULT
-        that_block_t = o.block_type || PUndefType::DEFAULT
-        that_block_t.assignable?(this_block_t)
-      end
+  # Returns the number of accepted arguments for the last parameter type [min, max]
+  #
+  def last_range
+    @param_types.nil? ? nil : @param_types.repeat_last_range
+  end
+
+  # Range [0,0], [0,1], or [1,1] for the block
+  #
+  def block_range
+    case block_type
+    when POptionalType
+      [0,1]
+    when PVariantType, PCallableType
+      [1,1]
+    else
+      [0,0]
     end
+  end
 
-    # @api public
-    #
-    class PArrayType < PCollectionType
+  def hash
+    @param_types.hash * 31 + @block_type.hash
+  end
 
-      # @api private
-      def callable_args?(callable)
-        param_t = callable.param_types
-        block_t = callable.block_type
-        # does not support calling with a block, but have to check that callable is ok with missing block
-        (param_t.nil? || param_t.assignable?(self)) && (block_t.nil? || block_t.assignable(PUndefType::DEFAULT))
-      end
+  def eql?(o)
+    self.class == o.class && @param_types == o.param_types && @block_type == o.block_type
+  end
 
-      def generalize
-        if self == DEFAULT
-          self
-        else
-          PArrayType.new(element_type.nil? ? nil : element_type.generalize)
-        end
-      end
+  DEFAULT = PCallableType.new(nil)
 
-      def instance?(o)
-        return false unless o.is_a?(Array)
-        element_t = element_type
-        return false unless element_t.nil? || o.all? {|element| element_t.instance?(element) }
-        size_t = size_type
-        size_t.nil? || size_t.instance?(o.size)
-      end
+  protected
 
-      DATA = PArrayType.new(PDataType::DEFAULT, PCollectionType::DEFAULT_SIZE)
-      DEFAULT = PArrayType.new(nil)
-      EMPTY = PArrayType.new(PUnitType::DEFAULT, PCollectionType::ZERO_SIZE)
-
-      protected
-
-      # Array is assignable if o is an Array and o's element type is assignable, or if o is a Tuple
-      # @api private
-      def _assignable?(o)
-        s_entry = element_type
-        if o.is_a?(PTupleType)
-
-          # Tuple of anything can not be assigned (unless array is tuple of anything) - this case
-          # was handled at the top of this method.
-          #
-          return false if s_entry.nil?
-
-          return false unless o.types.all? {|o_element_t| s_entry.assignable?(o_element_t) }
-          o_regular = o.types[0..-2]
-          o_ranged = o.types[-1]
-          o_from, o_to = type_to_range(o.size_type)
-          o_required = o_regular.size + o_from
-
-          # array type may be size constrained
-          size_s = size_type || DEFAULT_SIZE
-          min, max = size_s.range
-          # Tuple with fewer min entries can not be assigned
-          return false if o_required < min
-          # Tuple with more optionally available entries can not be assigned
-          return false if o_regular.size + o_to > max
-          # each tuple type must be assignable to the element type
-          o_required.times do |index|
-            o_entry = tuple_entry_at(o, o_from, o_to, index)
-            return false unless s_entry.assignable?(o_entry)
-          end
-          # ... and so must the last, possibly optional (ranged) type
-          s_entry.assignable?(o_ranged)
-        elsif o.is_a?(PArrayType)
-          super && (s_entry.nil? || s_entry.assignable?(o.element_type))
-        else
-          false
-        end
-      end
+  # @api private
+  def _assignable?(o, guard)
+    return false unless o.is_a?(PCallableType)
+    # nil param_types means, any other Callable is assignable
+    return true if @param_types.nil?
+
+    # NOTE: these tests are made in reverse as it is calling the callable that is constrained
+    # (it's lower bound), not its upper bound
+    return false unless o.param_types.assignable?(@param_types, guard)
+    # names are ignored, they are just information
+    # Blocks must be compatible
+    this_block_t = @block_type || PUndefType::DEFAULT
+    that_block_t = o.block_type || PUndefType::DEFAULT
+    that_block_t.assignable?(this_block_t, guard)
+  end
+end
+
+# @api public
+#
+class PArrayType < PCollectionType
+
+  # @api private
+  def callable_args?(callable, guard = nil)
+    param_t = callable.param_types
+    block_t = callable.block_type
+    # does not support calling with a block, but have to check that callable is ok with missing block
+    (param_t.nil? || param_t.assignable?(self, guard)) && (block_t.nil? || block_t.assignable(PUndefType::DEFAULT, guard))
+  end
+
+  def generalize
+    if self == DATA
+      self
+    else
+      super
     end
+  end
 
-    # @api public
-    #
-    class PHashType < PCollectionType
-      attr_accessor :key_type
+  def normalize(guard = nil)
+    if self == DATA
+      self
+    else
+      super
+    end
+  end
 
-      def initialize(key_type, value_type, size_type = nil)
-        super(value_type, size_type)
-        @key_type = key_type
-      end
+  def instance?(o)
+    return false unless o.is_a?(Array)
+    element_t = element_type
+    return false unless element_t.nil? || o.all? {|element| element_t.instance?(element) }
+    size_t = size_type
+    size_t.nil? || size_t.instance?(o.size)
+  end
 
-      def generalize
-        if self == DEFAULT || self == EMPTY
-          self
-        else
-          key_t = @key_type
-          key_t = key_t.generalize unless key_t.nil?
-          value_t = element_type
-          value_t = value_t.generalize unless value_t.nil?
-          PHashType.new(key_t, value_t)
-        end
-      end
+  DATA = PArrayType.new(PDataType::DEFAULT, DEFAULT_SIZE)
+  DEFAULT = PArrayType.new(nil)
+  EMPTY = PArrayType.new(PUnitType::DEFAULT, ZERO_SIZE)
+
+  protected
+
+  # Array is assignable if o is an Array and o's element type is assignable, or if o is a Tuple
+  # @api private
+  def _assignable?(o, guard)
+    s_entry = element_type
+    if o.is_a?(PTupleType)
+      # If s_entry is nil, this Array type has no opinion on element types. Therefore any
+      # tuple can be assigned.
+      return true if s_entry.nil?
+
+      return false unless o.types.all? {|o_element_t| s_entry.assignable?(o_element_t, guard) }
+      o_regular = o.types[0..-2]
+      o_ranged = o.types[-1]
+      o_from, o_to = type_to_range(o.size_type)
+      o_required = o_regular.size + o_from
+
+      # array type may be size constrained
+      size_s = size_type || DEFAULT_SIZE
+      min, max = size_s.range
+      # Tuple with fewer min entries can not be assigned
+      return false if o_required < min
+      # Tuple with more optionally available entries can not be assigned
+      return false if o_regular.size + o_to > max
+      # each tuple type must be assignable to the element type
+      o_required.times do |index|
+        o_entry = tuple_entry_at(o, o_from, o_to, index)
+        return false unless s_entry.assignable?(o_entry, guard)
+      end
+      # ... and so must the last, possibly optional (ranged) type
+      s_entry.assignable?(o_ranged)
+    elsif o.is_a?(PArrayType)
+      super && (s_entry.nil? || s_entry.assignable?(o.element_type, guard))
+    else
+      false
+    end
+  end
+end
 
-      def hash
-        @key_type.hash * 31 + super
-      end
+# @api public
+#
+class PHashType < PCollectionType
+  attr_accessor :key_type
 
-      def instance?(o)
-        return false unless o.is_a?(Hash)
-        key_t = key_type
-        element_t = element_type
-        if (key_t.nil? || o.keys.all? {|key| key_t.instance?(key) }) &&
-            (element_t.nil? || o.values.all? {|value| element_t.instance?(value) })
-          size_t = size_type
-          size_t.nil? || size_t.instance?(o.size)
-        else
-          false
-        end
-      end
+  def initialize(key_type, value_type, size_type = nil)
+    super(value_type, size_type)
+    @key_type = key_type
+  end
 
-      def ==(o)
-        super && @key_type == o.key_type
-      end
+  def accept(visitor, guard)
+    super
+    @key_type.accept(visitor, guard) unless @key_type.nil?
+  end
 
-      def is_the_empty_hash?
-        self == EMPTY
-      end
+  def generalize
+    if self == DEFAULT || self == DATA || self == EMPTY
+      self
+    else
+      key_t = @key_type
+      key_t = key_t.generalize unless key_t.nil?
+      value_t = @element_type
+      value_t = value_t.generalize unless value_t.nil?
+      @size_type.nil? && @key_type.equal?(key_t) && @element_type.equal?(value_t) ? self : PHashType.new(key_t, value_t, nil)
+    end
+  end
+
+  def normalize(guard = nil)
+    if self == DEFAULT || self == DATA || self == EMPTY
+      self
+    else
+      key_t = @key_type
+      key_t = key_t.normalize(guard) unless key_t.nil?
+      value_t = @element_type
+      value_t = value_t.normalize(guard) unless value_t.nil?
+      @size_type.nil? && @key_type.equal?(key_t) && @element_type.equal?(value_t) ? self : PHashType.new(key_t, value_t, nil)
+    end
+  end
+
+  def hash
+    @key_type.hash * 31 + super
+  end
+
+  def instance?(o)
+    return false unless o.is_a?(Hash)
+    key_t = key_type
+    element_t = element_type
+    if (key_t.nil? || o.keys.all? {|key| key_t.instance?(key) }) &&
+        (element_t.nil? || o.values.all? {|value| element_t.instance?(value) })
+      size_t = size_type
+      size_t.nil? || size_t.instance?(o.size)
+    else
+      false
+    end
+  end
+
+  def iterable?(guard = nil)
+    true
+  end
+
+  def iterable_type(guard = nil)
+    if self == DEFAULT || self == EMPTY
+      PIterableType.new(DEFAULT_KEY_PAIR_TUPLE)
+    else
+      PIterableType.new(PTupleType.new([@key_type, @element_type], KEY_PAIR_TUPLE_SIZE))
+    end
+  end
+
+  def eql?(o)
+    super && @key_type == o.key_type
+  end
+
+  def is_the_empty_hash?
+    self == EMPTY
+  end
+
+  DEFAULT = PHashType.new(nil, nil)
+  KEY_PAIR_TUPLE_SIZE = PIntegerType.new(2,2)
+  DEFAULT_KEY_PAIR_TUPLE = PTupleType.new([PUnitType::DEFAULT, PUnitType::DEFAULT], KEY_PAIR_TUPLE_SIZE)
+  DATA = PHashType.new(PScalarType::DEFAULT, PDataType::DEFAULT, DEFAULT_SIZE)
+  EMPTY = PHashType.new(PUnitType::DEFAULT, PUnitType::DEFAULT, PIntegerType.new(0, 0))
+
+  protected
+
+  # Hash is assignable if o is a Hash and o's key and element types are assignable
+  # @api private
+  def _assignable?(o, guard)
+    case o
+      when PHashType
+        size_s = size_type
+        return true if (size_s.nil? || size_s.from == 0) && o.is_the_empty_hash?
+        return false unless (key_type.nil? || key_type.assignable?(o.key_type, guard)) && (element_type.nil? || element_type.assignable?(o.element_type, guard))
+        super
+      when PStructType
+        # hash must accept String as key type
+        # hash must accept all value types
+        # hash must accept the size of the struct
+        o_elements = o.elements
+        (size_type || DEFAULT_SIZE).instance?(o_elements.size) &&
+            o_elements.all? {|e| (key_type.nil? || key_type.instance?(e.name)) && (element_type.nil? || element_type.assignable?(e.value_type, guard)) }
+      else
+        false
+    end
+  end
+end
+
+# A flexible type describing an any? of other types
+# @api public
+#
+class PVariantType < PAnyType
+  include Enumerable
 
-      DEFAULT = PHashType.new(nil, nil)
-      DATA = PHashType.new(PScalarType::DEFAULT, PDataType::DEFAULT, DEFAULT_SIZE)
-      EMPTY = PHashType.new(PUndefType::DEFAULT, PUndefType::DEFAULT, PIntegerType.new(0, 0))
-
-      protected
-
-      # Hash is assignable if o is a Hash and o's key and element types are assignable
-      # @api private
-      def _assignable?(o)
-        case o
-          when PHashType
-            size_s = size_type
-            return true if (size_s.nil? || size_s.from == 0) && o.is_the_empty_hash?
-            return false unless (key_type.nil? || key_type.assignable?(o.key_type)) && (element_type.nil? || element_type.assignable?(o.element_type))
-            super
-          when PStructType
-            # hash must accept String as key type
-            # hash must accept all value types
-            # hash must accept the size of the struct
-            o_elements = o.elements
-            (size_type || DEFAULT_SIZE).instance?(o_elements.size) &&
-                o_elements.all? {|e| (key_type.nil? || key_type.instance?(e.name)) && (element_type.nil? || element_type.assignable?(e.value_type)) }
+  attr_reader :types
+
+  # @param types [Array[PAnyType]] the variants
+  def initialize(types)
+    @types = types.uniq.freeze
+  end
+
+  def accept(visitor, guard)
+    super
+    @types.each { |t| t.accept(visitor, guard) }
+  end
+
+  def each
+    if block_given?
+      types.each { |t| yield t }
+    else
+      types.to_enum
+    end
+  end
+
+  def generalize
+    if self == DEFAULT || self == DATA
+      self
+    else
+      alter_type_array(@types, :generalize) { |altered| PVariantType.new(mod_types) }
+    end
+  end
+
+  def normalize(guard = nil)
+    if self == DEFAULT || self == DATA || @types.empty?
+      self
+    else
+      # Normalize all contained types
+      modified = false
+      types = alter_type_array(@types, :normalize, guard)
+      if types == self
+        types = @types
+      else
+        modified = true
+      end
+
+      if types.size == 1
+        types[0]
+      elsif types.any? { |t| t.is_a?(PUndefType) }
+        # Undef entry present. Use an OptionalType with a normalized Variant of all types that are not Undef
+        POptionalType.new(PVariantType.new(types.reject { |ot| ot.is_a?(PUndefType) }).normalize(guard)).normalize(guard)
+      else
+        # Merge all variants into this one
+        types = types.map do |t|
+          if t.is_a?(PVariantType)
+            modified = true
+            t.types
           else
-            false
+            t
+          end
+        end
+        types.flatten! if modified
+        size_before_merge = types.size
+
+        types = swap_not_undefs(types)
+        types = swap_optionals(types)
+        types = merge_enums(types)
+        types = merge_patterns(types)
+        types = merge_int_ranges(types)
+        types = merge_float_ranges(types)
+
+        if types.size == 1
+          types[0]
+        else
+          modified || types.size != size_before_merge ? PVariantType.new(types) : self
         end
       end
     end
+  end
 
-    # A flexible type describing an any? of other types
-    # @api public
-    #
-    class PVariantType < PAnyType
-      include Enumerable
+  def hash
+    @types.hash
+  end
 
-      attr_reader :types
+  def instance?(o)
+    # instance of variant if o is instance? of any of variant's types
+    @types.any? { |type| type.instance?(o) }
+  end
 
-      def initialize(types)
-        @types = types.freeze
-      end
+  def kind_of_callable?(optional = true, guard = nil)
+    @types.all? { |type| type.kind_of_callable?(optional, guard) }
+  end
+
+  def resolved?
+    @types.all? { |type| type.resolved? }
+  end
+
+  def eql?(o)
+    o = DATA if o.is_a?(PDataType)
+    self.class == o.class && @types.size == o.types.size && (@types - o.types).empty?
+  end
 
-      def each
-        if block_given?
-          types.each { |t| yield t }
+  # Variant compatible with the Data type.
+  DATA = PVariantType.new([PHashType::DATA, PArrayType::DATA, PScalarType::DEFAULT, PUndefType::DEFAULT, PTupleType::DATA])
+
+  DEFAULT = PVariantType.new(EMPTY_ARRAY)
+
+  protected
+
+  # @api private
+  def _assignable?(o, guard)
+    # Data is a specific variant
+    o = DATA if o.is_a?(PDataType)
+    if o.is_a?(PVariantType)
+      # A variant is assignable if all of its options are assignable to one of this type's options
+      return true if self == o
+      o.types.all? do |other|
+        # if the other is a Variant, all of its options, but be assignable to one of this type's options
+        other = other.is_a?(PDataType) ? DATA : other
+        if other.is_a?(PVariantType)
+          assignable?(other, guard)
         else
-          types.to_enum
+          types.any? {|option_t| option_t.assignable?(other, guard) }
         end
       end
+    else
+      # A variant is assignable if o is assignable to any of its types
+      types.any? { |option_t| option_t.assignable?(o, guard) }
+    end
+  end
 
-      def generalize
-        (self == DEFAULT || self == DATA) ? self : PVariantType.new(@types.map {|t| t.generalize})
+  # @api private
+  def swap_optionals(array)
+    if array.size > 1
+      parts = array.partition {|t| t.is_a?(POptionalType) }
+      optionals = parts[0]
+      if optionals.size > 1
+        others = parts[1]
+        others <<  POptionalType.new(PVariantType.new(optionals.map { |optional| optional.type }).normalize)
+        array = others
       end
+    end
+    array
+  end
 
-      def hash
-        @types.hash
+  # @api private
+  def swap_not_undefs(array)
+    if array.size > 1
+      parts = array.partition {|t| t.is_a?(PNotUndefType) }
+      not_undefs = parts[0]
+      if not_undefs.size > 1
+        others = parts[1]
+        others <<  PNotUndefType.new(PVariantType.new(not_undefs.map { |not_undef| not_undef.type }).normalize)
+        array = others
       end
+    end
+    array
+  end
 
-      def instance?(o)
-        # instance of variant if o is instance? of any of variant's types
-        @types.any? { |type| type.instance?(o) }
+  # @api private
+  def merge_enums(array)
+    if array.size > 1
+      parts = array.partition {|t| t.is_a?(PEnumType) || t.is_a?(PStringType) && !t.values.empty? }
+      enums = parts[0]
+      if enums.size > 1
+        others = parts[1]
+        others <<  PEnumType.new(enums.map { |enum| enum.values }.flatten.uniq)
+        array = others
       end
+    end
+    array
+  end
 
-      def kind_of_callable?(optional = true)
-        @types.all? { |type| type.kind_of_callable?(optional) }
+  # @api private
+  def merge_patterns(array)
+    if array.size > 1
+      parts = array.partition {|t| t.is_a?(PPatternType) }
+      patterns = parts[0]
+      if patterns.size > 1
+        others = parts[1]
+        others <<  PPatternType.new(patterns.map { |pattern| pattern.patterns }.flatten.uniq)
+        array = others
       end
+    end
+    array
+  end
 
-      def ==(o)
-        # TODO: This special case doesn't look like it belongs here
-        self.class == o.class && (@types | o.types).size == @types.size ||
-            o.class == PDataType && self == DATA
-      end
+  # @api private
+  def merge_int_ranges(array)
+    if array.size > 1
+      parts = array.partition {|t| t.is_a?(PIntegerType) }
+      ranges = parts[0]
+      array = merge_ranges(ranges) + parts[1] if ranges.size > 1
+    end
+    array
+  end
 
-      # Variant compatible with the Data type.
-      DATA = PVariantType.new([PHashType::DATA, PArrayType::DATA, PScalarType::DEFAULT, PUndefType::DEFAULT, PTupleType::DATA])
-
-      DEFAULT = PVariantType.new([])
-
-      protected
-
-      # @api private
-      def _assignable?(o)
-        # Data is a specific variant
-        o = DATA if o.is_a?(PDataType)
-        if o.is_a?(PVariantType)
-          # A variant is assignable if all of its options are assignable to one of this type's options
-          return true if self == o
-          o.types.all? do |other|
-            # if the other is a Variant, all of its options, but be assignable to one of this type's options
-            other = other.is_a?(PDataType) ? DATA : other
-            if other.is_a?(PVariantType)
-              assignable?(other)
-            else
-              types.any? {|option_t| option_t.assignable?(other) }
-            end
-          end
+  def merge_float_ranges(array)
+    if array.size > 1
+      parts = array.partition {|t| t.is_a?(PFloatType) }
+      ranges = parts[0]
+      array = merge_ranges(ranges) + parts[1] if ranges.size > 1
+    end
+    array
+  end
+
+  # @api private
+  def merge_ranges(ranges)
+    result = []
+    while !ranges.empty?
+      unmerged = []
+      x = ranges.pop
+      result << ranges.inject(x) do |memo, y|
+        merged = memo.merge(y)
+        if merged.nil?
+          unmerged << y
         else
-          # A variant is assignable if o is assignable to any of its types
-          types.any? { |option_t| option_t.assignable?(o) }
+          memo = merged
         end
+        memo
       end
+      ranges = unmerged
     end
+    result
+  end
+end
 
-    # @api public
-    #
-    class PRuntimeType < PAnyType
-      attr_reader :runtime, :runtime_type_name
+# @api public
+#
+class PRuntimeType < PAnyType
+  attr_reader :runtime, :runtime_type_name
 
-      def initialize(runtime, runtime_type_name = nil)
-        @runtime = runtime
-        @runtime_type_name = runtime_type_name
-      end
+  def initialize(runtime, runtime_type_name = nil)
+    @runtime = runtime
+    @runtime_type_name = runtime_type_name
+  end
 
-      def hash
-        @runtime.hash * 31 + @runtime_type_name.hash
-      end
+  def hash
+    @runtime.hash * 31 + @runtime_type_name.hash
+  end
 
-      def ==(o)
-        self.class == o.class && @runtime == o.runtime && @runtime_type_name == o.runtime_type_name
-      end
+  def eql?(o)
+    self.class == o.class && @runtime == o.runtime && @runtime_type_name == o.runtime_type_name
+  end
 
-      def instance?(o)
-        assignable?(TypeCalculator.infer(o))
-      end
+  def instance?(o)
+    assignable?(TypeCalculator.infer(o))
+  end
 
-      DEFAULT = PRuntimeType.new(nil)
+  def iterable?(guard = nil)
+    c = class_from_string(@runtime_type_name)
+    c.nil? ? false : c < Iterable
+  end
 
-      protected
+  def iterable_type(guard = nil)
+    iterable?(guard) ? PIterableType.new(self) : nil
+  end
 
-      # Assignable if o's has the same runtime and the runtime name resolves to
-      # a class that is the same or subclass of t1's resolved runtime type name
-      # @api private
-      def _assignable?(o)
-        return false unless o.is_a?(PRuntimeType)
-        return false unless @runtime == o.runtime
-        return true if @runtime_type_name.nil?   # t1 is wider
-        return false if o.runtime_type_name.nil?  # t1 not nil, so o can not be wider
+  DEFAULT = PRuntimeType.new(nil)
 
-        # NOTE: This only supports Ruby, must change when/if the set of runtimes is expanded
-        c1 = class_from_string(@runtime_type_name)
-        c2 = class_from_string(o.runtime_type_name)
-        return false unless c1.is_a?(Module) && c2.is_a?(Module)
-        !!(c2 <= c1)
-      end
-    end
+  protected
 
-    # Abstract representation of a type that can be placed in a Catalog.
-    # @api public
-    #
-    class PCatalogEntryType < PAnyType
+  # Assignable if o's has the same runtime and the runtime name resolves to
+  # a class that is the same or subclass of t1's resolved runtime type name
+  # @api private
+  def _assignable?(o, guard)
+    return false unless o.is_a?(PRuntimeType)
+    return false unless @runtime == o.runtime
+    return true if @runtime_type_name.nil?   # t1 is wider
+    return false if o.runtime_type_name.nil?  # t1 not nil, so o can not be wider
 
-      DEFAULT = PCatalogEntryType.new
+    # NOTE: This only supports Ruby, must change when/if the set of runtimes is expanded
+    c1 = class_from_string(@runtime_type_name)
+    c2 = class_from_string(o.runtime_type_name)
+    return false unless c1.is_a?(Module) && c2.is_a?(Module)
+    !!(c2 <= c1)
+  end
+end
 
-      def instance?(o)
-        assignable?(TypeCalculator.infer(o))
-      end
+# Abstract representation of a type that can be placed in a Catalog.
+# @api public
+#
+class PCatalogEntryType < PAnyType
 
-      protected
-      # @api private
-      def _assignable?(o)
-        o.is_a?(PCatalogEntryType)
-      end
-    end
+  DEFAULT = PCatalogEntryType.new
 
-    # Represents a (host-) class in the Puppet Language.
-    # @api public
-    #
-    class PHostClassType < PCatalogEntryType
-      attr_reader :class_name
+  def instance?(o)
+    assignable?(TypeCalculator.infer(o))
+  end
 
-      def initialize(class_name)
-        @class_name = class_name
-      end
+  protected
+  # @api private
+  def _assignable?(o, guard)
+    o.is_a?(PCatalogEntryType)
+  end
+end
 
-      def hash
-        11 * @class_name.hash
-      end
-      def ==(o)
-        self.class == o.class && @class_name == o.class_name
-      end
+# Represents a (host-) class in the Puppet Language.
+# @api public
+#
+class PHostClassType < PCatalogEntryType
+  attr_reader :class_name
 
-      DEFAULT = PHostClassType.new(nil)
+  def initialize(class_name)
+    @class_name = class_name
+  end
 
-      protected
+  def hash
+    11 * @class_name.hash
+  end
+  def eql?(o)
+    self.class == o.class && @class_name == o.class_name
+  end
 
-      # @api private
-      def _assignable?(o)
-        return false unless o.is_a?(PHostClassType)
-        # Class = Class[name}, Class[name] != Class
-        return true if @class_name.nil?
-        # Class[name] = Class[name]
-        @class_name == o.class_name
-      end
-    end
+  DEFAULT = PHostClassType.new(nil)
 
-    # Represents a Resource Type in the Puppet Language
-    # @api public
-    #
-    class PResourceType < PCatalogEntryType
-      attr_reader :type_name, :title
+  protected
 
-      def initialize(type_name, title = nil)
-        @type_name = type_name
-        @title = title
-      end
+  # @api private
+  def _assignable?(o, guard)
+    return false unless o.is_a?(PHostClassType)
+    # Class = Class[name}, Class[name] != Class
+    return true if @class_name.nil?
+    # Class[name] = Class[name]
+    @class_name == o.class_name
+  end
+end
 
-      def hash
-        @type_name.hash * 31 + @title.hash
-      end
+# Represents a Resource Type in the Puppet Language
+# @api public
+#
+class PResourceType < PCatalogEntryType
+  attr_reader :type_name, :title
 
-      def ==(o)
-        self.class == o.class && @type_name == o.type_name && @title == o.title
-      end
+  def initialize(type_name, title = nil)
+    @type_name = type_name
+    @title = title
+  end
+
+  def hash
+    @type_name.hash * 31 + @title.hash
+  end
+
+  def eql?(o)
+    self.class == o.class && @type_name == o.type_name && @title == o.title
+  end
+
+  DEFAULT = PResourceType.new(nil)
+
+  protected
+
+  # @api private
+  def _assignable?(o, guard)
+    return false unless o.is_a?(PResourceType)
+    return true if @type_name.nil?
+    return false if @type_name != o.type_name
+    return true if @title.nil?
+    @title == o.title
+  end
+end
+
+# Represents a type that accept PUndefType instead of the type parameter
+# required_type - is a short hand for Variant[T, Undef]
+# @api public
+#
+class POptionalType < PTypeWithContainedType
+  def optional_type
+    @type
+  end
 
-      DEFAULT = PResourceType.new(nil)
+  def kind_of_callable?(optional=true, guard = nil)
+      optional && !@type.nil? && @type.kind_of_callable?(optional, guard)
+  end
 
-      protected
+  def instance?(o)
+    PUndefType::DEFAULT.instance?(o) || (!@type.nil? && @type.instance?(o))
+  end
 
-      # @api private
-      def _assignable?(o)
-        return false unless o.is_a?(PResourceType)
-        return true if @type_name.nil?
-        return false if @type_name != o.type_name
-        return true if @title.nil?
-        @title == o.title
+  def normalize(guard = nil)
+    n = super
+    if n.type.nil?
+      n
+    else
+      if n.type.is_a?(PNotUndefType)
+        # No point in having an NotUndef in an Optional
+        POptionalType.new(n.type.type).normalize
+      elsif n.type.assignable?(PUndefType::DEFAULT)
+        # THe type is Optional anyway, so it can be stripped of
+        n.type
+      else
+        n
       end
     end
+  end
 
-    # Represents a type that accept PUndefType instead of the type parameter
-    # required_type - is a short hand for Variant[T, Undef]
-    # @api public
-    #
-    class POptionalType < PAnyType
-      attr_reader :optional_type
+  DEFAULT = POptionalType.new(nil)
 
-      def initialize(optional_type)
-        @optional_type = optional_type
-      end
+  protected
 
-      def generalize
-        @optional_type.nil? ? self : PType.new(@optional_type.generalize)
-      end
+  # @api private
+  def _assignable?(o, guard)
+    return true if o.is_a?(PUndefType)
+    return true if @type.nil?
+    if o.is_a?(POptionalType)
+      @type.assignable?(o.optional_type, guard)
+    else
+      @type.assignable?(o, guard)
+    end
+  end
+end
 
-      def hash
-        7 * @optional_type.hash
-      end
+class PTypeReferenceType < PAnyType
+  attr_reader :name, :parameters
 
-      def kind_of_callable?(optional=true)
-          optional && !@optional_type.nil? && @optional_type.kind_of_callable?(optional)
-      end
+  def initialize(name, parameters = nil)
+    @name = name
+    @parameters = parameters.nil? ? EMPTY_ARRAY : parameters
+  end
 
-      def ==(o)
-        self.class == o.class && @optional_type == o.optional_type
-      end
+  def callable?(args)
+    false
+  end
 
-      def instance?(o)
-        PUndefType::DEFAULT.instance?(o) || (!optional_type.nil? && optional_type.instance?(o))
-      end
+  def instance?(o)
+    false
+  end
+
+  def hash
+    @name.hash * 31 + @parameters.hash
+  end
 
-      DEFAULT = POptionalType.new(nil)
+  def eql?(o)
+    super && o.name == @name && o.parameters == @parameters
+  end
 
-      protected
+  protected
 
-      # @api private
-      def _assignable?(o)
-        return true if o.is_a?(PUndefType)
-        return true if @optional_type.nil?
-        if o.is_a?(POptionalType)
-          @optional_type.assignable?(o.optional_type)
-        else
-          @optional_type.assignable?(o)
-        end
+  def _assignable?(o, guard)
+    # A type must be assignable to itself or a lot of unit tests will break
+    o == self
+  end
+
+  DEFAULT = PTypeReferenceType.new('UnresolvedReference')
+end
+
+# Describes a named alias for another Type.
+# The alias is created with a name and an unresolved type expression. The type expression may
+# in turn contain other aliases (including the alias that contains it) which means that an alias
+# might contain self recursion. Whether or not that is the case is computed and remembered when the alias
+# is resolved since guarding against self recursive constructs is relatively expensive.
+#
+class PTypeAliasType < PAnyType
+  attr_reader :name
+
+  # @param name [String] The name of the type
+  # @param type_expr [Model::PopsObject] The expression that describes the aliased type
+  # @param resolved_type [PAnyType] the resolve type (only used for the DEFAULT initialization)
+  def initialize(name, type_expr, resolved_type = nil)
+    @name = name
+    @type_expr = type_expr
+    @resolved_type = resolved_type
+    @self_recursion = false
+  end
+
+  # Returns the resolved type. The type must have been resolved by a call prior to calls to this
+  # method or an error will be raised.
+  #
+  # @return [PAnyType] The resolved type of this alias.
+  # @raise [Puppet::Error] unless the type has been resolved prior to calling this method
+  def resolved_type
+    raise Puppet::Error, "Reference to unresolved type #{@name}" unless @resolved_type
+    @resolved_type
+  end
+
+  def callable_args?(callable, guard)
+    guarded_recursion(guard, false) { |g| resolved_type.callable_args?(callable, g) }
+  end
+
+  def kind_of_callable?(optional=true, guard = nil)
+    guarded_recursion(guard, false) { |g| resolved_type.kind_of_callable?(optional, g) }
+  end
+
+  def instance?(o)
+    # No value can ever be recursive so no guard is needed here
+    resolved_type.instance?(o)
+  end
+
+  def iterable?(guard = nil)
+    guarded_recursion(guard, false) { |g| resolved_type.iterable?(g) }
+  end
+
+  def iterable_type(guard = nil)
+    guarded_recursion(guard, nil) { |g| resolved_type.iterable_type(g) }
+  end
+
+  def hash
+    @name.hash
+  end
+
+  # Called from the TypeParser once it has found a type using the Loader. The TypeParser will
+  # interpret the contained expression and the resolved type is remembered. This method also
+  # checks and remembers if the resolve type contains self recursion.
+  #
+  # @param type_parser [TypeParser] type parser that will interpret the type expression
+  # @param loader [Loader::Loader] loader to use when loading type aliases
+  # @return [PTypeAliasType] the receiver of the call, i.e. `self`
+  # @api private
+  def resolve(type_parser, loader)
+    if @resolved_type.nil?
+      # resolved to PTypeReferenceType::DEFAULT during resolve to avoid endless recursion
+      @resolved_type = PTypeReferenceType::DEFAULT
+      @self_recursion = true # assumed while it being found out below
+      begin
+        @resolved_type = type_parser.interpret(@type_expr, loader).normalize
+
+        # Find out if this type is recursive. A recursive type has performance implications
+        # on several methods and this knowledge is used to avoid that for non-recursive
+        # types.
+        guard = RecursionGuard.new
+        accept(NoopTypeAcceptor::INSTANCE, guard)
+        @self_recursion = guard.recursive_this?(self)
+      rescue
+        @resolved_type = nil
+        raise
       end
     end
+    self
+  end
+
+  def eql?(o)
+    super && o.name == @name
   end
-end
 
+  def accept(visitor, guard)
+    guarded_recursion(guard, nil) do |g|
+      super
+      resolved_type.accept(visitor, g)
+    end
+  end
+
+  def self_recursion?
+    @self_recursion
+  end
+
+  protected
+
+  def _assignable?(o, guard)
+    guard ||= RecursionGuard.new
+    if guard.add_this(self) == RecursionGuard::SELF_RECURSION_IN_BOTH
+      # Recursion detected both in self and other. This means that other is assignable
+      # to self. This point would not have been reached otherwise
+      true
+    else
+      resolved_type.assignable?(o, guard)
+    end
+  end
+
+  private
+
+  def guarded_recursion(guard, dflt)
+    if @self_recursion
+      guard ||= RecursionGuard.new
+      (guard.add_this(self) & RecursionGuard::SELF_RECURSION_IN_THIS) == 0 ? yield(guard) : dflt
+    else
+      yield(guard)
+    end
+  end
+
+  DEFAULT = PTypeAliasType.new('UnresolvedAlias', nil, PTypeReferenceType::DEFAULT)
+end
+end
+end