puppet 4.10.12-x86-mingw32 → 5.0.0-x86-mingw32

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

@@ -85,7 +85,7 @@ module TypeFactory
       size_type_or_value.nil? ? PStringType::DEFAULT : PStringType.new(size_type_or_value)
     else
       if Puppet[:strict] != :off
-        Puppet.warn_once(:deprecation, "TypeFactory#string_multi_args", "Passing more than one argument to TypeFactory#string is deprecated")
+        Puppet.warn_once('deprecations', "TypeFactory#string_multi_args", "Passing more than one argument to TypeFactory#string is deprecated")
       end
       deprecated_second_argument.size == 1 ? PStringType.new(deprecated_second_argument[0]) : PEnumType.new(*deprecated_second_argument)
     end
@@ -252,13 +252,20 @@ module TypeFactory
     PPatternType.new(patterns)
   end
 
-  # Produces the Literal type
+  # Produces the Scalar type
   # @api public
   #
   def self.scalar
     PScalarType::DEFAULT
   end
 
+  # Produces the ScalarData type
+  # @api public
+  #
+  def self.scalar_data
+    PScalarDataType::DEFAULT
+  end
+
   # Produces a CallableType matching all callables
   # @api public
   #
@@ -325,7 +332,14 @@ module TypeFactory
   # @api public
   #
   def self.data
-    PDataType::DEFAULT
+    @data_t ||= TypeParser.singleton.parse('Data', Loaders.static_loader)
+  end
+
+  # Produces the RichData type
+  # @api public
+  #
+  def self.rich_data
+    @rich_data_t ||= TypeParser.singleton.parse('RichData', Loaders.static_loader)
   end
 
   # Creates an instance of the Undef type
@@ -422,18 +436,32 @@ module TypeFactory
     PHashType.new(key_type, value_type, size_type)
   end
 
+  # Produces a type for Array[Any]
+  # @api public
+  #
+  def self.array_of_any
+    PArrayType::DEFAULT
+  end
+
   # Produces a type for Array[Data]
   # @api public
   #
   def self.array_of_data
-    PArrayType::DATA
+    @array_of_data_t = PArrayType.new(data)
+  end
+
+  # Produces a type for Hash[Any,Any]
+  # @api public
+  #
+  def self.hash_of_any
+    PHashType::DEFAULT
   end
 
-  # Produces a type for Hash[Scalar, Data]
+  # Produces a type for Hash[String,Data]
   # @api public
   #
   def self.hash_of_data
-    PHashType::DATA
+    @hash_of_data_t = PHashType.new(string, data)
   end
 
   # Produces a type for NotUndef[T]

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

@@ -24,6 +24,26 @@ class TypeFormatter
     @singleton
   end
 
+  def expanded
+    tf = clone
+    tf.instance_variable_set(:@expanded, true)
+    tf
+  end
+
+  def indented(indent = 0, indent_width = 2)
+    tf = clone
+    tf.instance_variable_set(:@indent, indent)
+    tf.instance_variable_set(:@indent_width, indent_width)
+    tf
+  end
+
+  def ruby(ref_ctor)
+    tf = clone
+    tf.instance_variable_set(:@ruby, true)
+    tf.instance_variable_set(:@ref_ctor, ref_ctor)
+    tf
+  end
+
   # Produces a string representing the type
   # @api public
   #
@@ -84,9 +104,9 @@ class TypeFormatter
     if @ruby && t.is_a?(PAnyType)
       @ruby = false
       begin
-        @bld << @ref_ctor << "('"
-        @@string_visitor.visit_this_0(self, t)
-        @bld << "')"
+        @bld << @ref_ctor << '('
+        @@string_visitor.visit_this_0(self, TypeFormatter.new.string(t))
+        @bld << ')'
       ensure
         @ruby = true
       end
@@ -135,7 +155,7 @@ class TypeFormatter
   def string_PScalarType(_)  ; @bld << 'Scalar'  ; end
 
   # @api private
-  def string_PDataType(_)    ; @bld << 'Data'    ; end
+  def string_PScalarDataType(_)  ; @bld << 'ScalarData'  ; end
 
   # @api private
   def string_PNumericType(_) ; @bld << 'Numeric' ; end
@@ -304,11 +324,14 @@ class TypeFormatter
   end
 
   def string_PuppetObject(t)
-    @bld << t._ptype.name << '('
-    append_indented_string(t.i12n_hash, @indent || 0, @indent_width || 2, true)
-    @bld.chomp!
+    @bld << t._pcore_type.name << '('
+    if @indent
+      append_indented_string(t._pcore_init_hash, @indent, @indent_width, true)
+      @bld.chomp!
+    else
+      append_string(t._pcore_init_hash)
+    end
     @bld << ')'
-    newline if @indent
   end
 
   # @api private
@@ -326,7 +349,7 @@ class TypeFormatter
     if t.has_empty_range?
       append_array('Array') { append_strings([0, 0]) }
     else
-      append_array('Array', t == PArrayType::DATA) do
+      append_array('Array', t == PArrayType::DEFAULT) do
         append_strings([t.element_type], true)
         append_elements(range_array_part(t.size_type), true)
         chomp_list
@@ -339,7 +362,7 @@ class TypeFormatter
     if t.has_empty_range?
       append_array('Hash') { append_strings([0, 0]) }
     else
-      append_array('Hash', t == PHashType::DATA) do
+      append_array('Hash', t == PHashType::DEFAULT) do
         append_strings([t.key_type, t.value_type], true)
         append_elements(range_array_part(t.size_type), true)
         chomp_list
@@ -380,7 +403,7 @@ class TypeFormatter
 
   # @api private
   def string_PAnnotatedMember(m)
-    hash = m.i12n_hash
+    hash = m._pcore_init_hash
     if hash.size == 1
       string(m.type)
     else
@@ -398,7 +421,7 @@ class TypeFormatter
   # @api private
   def string_PTypeSetType(t)
     append_array('TypeSet') do
-      append_hash(t.i12n_hash.each, proc { |k| @bld << symbolic_key(k) }) do |k,v|
+      append_hash(t._pcore_init_hash.each, proc { |k| @bld << symbolic_key(k) }) do |k,v|
         case k
         when KEY_TYPES
           old_ts = @type_set
@@ -426,7 +449,7 @@ class TypeFormatter
   # @api private
   def string_PObjectType(t)
     if @expanded
-      append_object_hash(t.i12n_hash(@type_set.nil? || !@type_set.defines_type?(t)))
+      append_object_hash(t._pcore_init_hash(@type_set.nil? || !@type_set.defines_type?(t)))
     else
       @bld << (@type_set ? @type_set.name_for(t, t.label) : t.label)
     end
@@ -464,7 +487,7 @@ class TypeFormatter
   def format_type_alias_type(t, expand)
     if @type_set.nil?
       @bld << t.name
-      if expand
+      if expand && !Loader::StaticLoader::BUILTIN_ALIASES.include?(t.name)
         @bld << ' = '
         append_string(t.resolved_type)
       end
@@ -484,7 +507,17 @@ class TypeFormatter
 
   # @api private
   def string_Array(t)
-    append_array('') { append_strings(t) }
+    append_array('') do
+      if @indent && !is_short_array?(t)
+        @indent += 1
+        t.each { |elem| newline; append_string(elem); @bld << COMMA_SEP }
+        chomp_list
+        @indent -= 1
+        newline
+      else
+        append_strings(t)
+      end
+    end
   end
 
   # @api private
@@ -507,7 +540,7 @@ class TypeFormatter
   def string_Numeric(t)      ; @bld << t.to_s    ; end
 
   # @api private
-  def string_Regexp(t)       ; @bld << PRegexpType.regexp_to_s_with_delimiters(t); end
+  def string_Regexp(t)       ; @bld << t.inspect; end
 
   # @api private
   def string_String(t)
@@ -569,6 +602,21 @@ class TypeFormatter
 
   HASH_ENTRY_OP = ' => '.freeze
 
+  def is_short_array?(t)
+    t.empty? || 100 - @indent * @indent_width > t.inject(0) do |sum, elem|
+      case elem
+      when true, false, nil, Numeric, Symbol
+        sum + elem.inspect.length()
+      when String
+        sum + 2 + elem.length
+      when Hash, Array
+        sum + (elem.empty? ? 2 : 1000)
+      else
+        sum + 1000
+      end
+    end
+  end
+
   def range_array_part(t)
     t.nil? || t.unbounded? ? EMPTY_ARRAY : [t.from.nil? ? 'default' : t.from.to_s , t.to.nil? ? 'default' : t.to.to_s ]
   end

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

@@ -330,9 +330,11 @@ module Types
       multi = false
       if @optional
         if e.is_a?(PVariantType)
-          e = [PUndefType::DEFAULT] + e.types
+          e = e.types
+          e = [PUndefType::DEFAULT] + e unless e.include?(PUndefType::DEFAULT)
         else
-          e = [PUndefType::DEFAULT, e]
+          er = all_resolved(e)
+          e = [PUndefType::DEFAULT, e] unless er.is_a?(PVariantType) && er.types.include?(PUndefType::DEFAULT)
         end
       elsif e.is_a?(PVariantType)
         e = e.types
@@ -343,8 +345,8 @@ module Types
           a = detailed_actual_to_s(e, a)
           e = e.map { |t| t.to_alias_expanded_s }
         else
-          e = e.map { |t| short_name(t) }.uniq
-          a = short_name(a)
+          e = e.map { |t| t.simple_name }.uniq
+          a = a.simple_name
         end
         case e.size
         when 1
@@ -361,8 +363,8 @@ module Types
           a = detailed_actual_to_s(e, a)
           e = e.to_alias_expanded_s
         else
-          e = short_name(e)
-          a = short_name(a)
+          e = e.simple_name
+          a = a.simple_name
         end
       end
       if multi
@@ -378,16 +380,6 @@ module Types
 
     private
 
-    def short_name(t)
-      # Ensure that Optional, NotUndef, Sensitive, and Type are reported with included
-      # type parameter.
-      if t.is_a?(PTypeWithContainedType) && !(t.type.nil? || t.type.class == PAnyType)
-        "#{t.name}[#{t.type.name}]"
-      else
-        t.name
-      end
-    end
-
     # Answers the question if `e` is a specialized type of `a`
     # @param e [PAnyType] the expected type
     # @param a [PAnyType] the actual type
@@ -455,7 +447,7 @@ module Types
       if e.is_a?(Array)
         e.map { |t| all_resolved(t) }
       else
-        e.is_a?(PTypeAliasType) ? e.resolved_type : e
+        e.is_a?(PTypeAliasType) ? all_resolved(e.resolved_type) : e
       end
     end
 
@@ -473,8 +465,7 @@ module Types
       if always_fully_detailed?(e, a)
         a.to_alias_expanded_s
       else
-        g = a.generalize
-        any_assignable?(e, g) ? a.to_alias_expanded_s : g.to_s
+        any_assignable?(e, a.generalize) ? a.to_alias_expanded_s : a.simple_name
       end
     end
   end
@@ -487,7 +478,7 @@ module Types
 
     def actual_string
       a = actual
-      a.is_a?(PStringType) && !a.value.nil? ? "'#{a.value}'" : short_name(a)
+      a.is_a?(PStringType) && !a.value.nil? ? "'#{a.value}'" : a.simple_name
     end
   end
 
@@ -559,7 +550,7 @@ module Types
     end
 
     def tense_deprecated
-      Puppet.warn_once(:deprecation, 'typemismatch#tense', "Passing a 'tense' argument to the TypeMismatchDescriber is deprecated and ignored. Everything is now reported using present tense")
+      Puppet.warn_once('deprecations', 'typemismatch#tense', "Passing a 'tense' argument to the TypeMismatchDescriber is deprecated and ignored. Everything is now reported using present tense")
     end
 
     # Validates that all entries in the give_hash exists in the given param_struct, that their type conforms
@@ -805,7 +796,7 @@ module Types
     def describe_PTypeAliasType(expected, actual, path)
       resolved_type = expected.resolved_type
       describe(resolved_type, actual, path).map do |description|
-        if description.is_a?(ExpectedActualMismatch) && description.expected.equal?(resolved_type)
+        if description.is_a?(ExpectedActualMismatch)
           description.swap_expected(expected)
         else
           description

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

@@ -34,13 +34,13 @@ class TypeParser
   #
   def parse(string, context = nil)
     model = @parser.parse_string(string)
-    interpret(model.current.body, context)
+    interpret(model.model.body, context)
   end
 
   # @api private
   def parse_literal(string, context = nil)
-    model = @parser.parse_string(string)
-    interpret_any(model.current.body, context)
+    factory = @parser.parse_string(string)
+    interpret_any(factory.model.body, context)
   end
 
   # @param ast [Puppet::Pops::Model::PopsObject] the ast to interpret
@@ -69,6 +69,17 @@ class TypeParser
     interpret_any(o.body, context)
   end
 
+  # @api private
+  def interpret_TypeAlias(o, context)
+    Loader::TypeDefinitionInstantiator.create_type(o.name, o.type_expr, Pcore::RUNTIME_NAME_AUTHORITY).resolve(self, loader_from_context(o, context))
+  end
+
+  # @api private
+  def interpret_TypeDefinition(o, context)
+    Loader::TypeDefinitionInstantiator.create_runtime_type(o)
+  end
+
+  # @api private
   def interpret_LambdaExpression(o, context)
     o
   end
@@ -78,6 +89,11 @@ class TypeParser
     o.value
   end
 
+  # @api private
+  def interpret_QualifiedReference(o, context)
+    o.cased_value
+  end
+
   # @api private
   def interpret_LiteralBoolean(o, context)
     o.value
@@ -152,17 +168,17 @@ class TypeParser
         'boolean'      => TypeFactory.boolean,
         'pattern'      => TypeFactory.pattern,
         'regexp'       => TypeFactory.regexp,
-        'data'         => TypeFactory.data,
-        'array'        => TypeFactory.array_of_data,
-        'hash'         => TypeFactory.hash_of_data,
+        'array'        => TypeFactory.array_of_any,
+        'hash'         => TypeFactory.hash_of_any,
         'class'        => TypeFactory.host_class,
         'resource'     => TypeFactory.resource,
         'collection'   => TypeFactory.collection,
         'scalar'       => TypeFactory.scalar,
+        'scalardata'   => TypeFactory.scalar_data,
         'catalogentry' => TypeFactory.catalog_entry,
         'undef'        => TypeFactory.undef,
-        'notundef'     => TypeFactory.not_undef(),
-        'default'      => TypeFactory.default(),
+        'notundef'     => TypeFactory.not_undef,
+        'default'      => TypeFactory.default,
         'any'          => TypeFactory.any,
         'variant'      => TypeFactory.variant,
         'optional'     => TypeFactory.optional,
@@ -180,7 +196,7 @@ class TypeParser
         'semverrange'  => TypeFactory.sem_ver_range,
         'timestamp'    => TypeFactory.timestamp,
         'timespan'     => TypeFactory.timespan
-    }
+    }.freeze
   end
 
   # @api private
@@ -305,7 +321,7 @@ class TypeParser
         if param_start.nil?
           type = type_str
         else
-          tps = interpret_any(@parser.parse_string(type_str[param_start..-1]).current, context)
+          tps = interpret_any(@parser.parse_string(type_str[param_start..-1]).model, context)
           raise_invalid_parameters_error(type.to_s, '1', tps.size) unless tps.size == 1
           type = type_str[0..param_start-1]
           parameters = [type] + tps
@@ -505,7 +521,7 @@ class TypeParser
       end
 
       if type.nil?
-        TypeFactory.type_reference(original_text_of(qref.eContainer))
+        TypeFactory.type_reference(original_text_of(ast))
       elsif type.is_a?(PResourceType)
         raise_invalid_parameters_error(qref.cased_value, 1, parameters.size) unless parameters.size == 1
         TypeFactory.resource(type.type_name, parameters[0])
@@ -556,8 +572,7 @@ class TypeParser
   end
 
   def original_text_of(ast)
-    position = Adapters::SourcePosAdapter.adapt(ast)
-    position.extract_tree_text
+    ast.locator.extract_tree_text(ast)
   end
 end
 end

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

@@ -8,12 +8,12 @@ class TypeSetReference
   attr_reader :version_range
   attr_reader :type_set
 
-  def initialize(owner, i12n_hash)
+  def initialize(owner, init_hash)
     @owner = owner
-    @name_authority = (i12n_hash[KEY_NAME_AUTHORITY] || owner.name_authority).freeze
-    @name = i12n_hash[KEY_NAME].freeze
-    @version_range = PSemVerRangeType.convert(i12n_hash[KEY_VERSION_RANGE])
-    init_annotatable(i12n_hash)
+    @name_authority = (init_hash[KEY_NAME_AUTHORITY] || owner.name_authority).freeze
+    @name = init_hash[KEY_NAME].freeze
+    @version_range = PSemVerRangeType.convert(init_hash[KEY_VERSION_RANGE])
+    init_annotatable(init_hash)
   end
 
   def accept(visitor, guard)
@@ -28,7 +28,7 @@ class TypeSetReference
     [@name_authority, @name, @version_range].hash
   end
 
-  def i12n_hash
+  def _pcore_init_hash
     result = super
     result[KEY_NAME_AUTHORITY] = @name_authority unless @name_authority == @owner.name_authority
     result[KEY_NAME] = @name