From b9f0871f60a650a0d3e0a25186bc58deb5f21e7a Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Tue, 29 May 2018 09:31:10 +0200 Subject: [PATCH] Cope with containerized type objects in REPRComposeProtocol --- src/Perl6/Metamodel/REPRComposeProtocol.nqp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Perl6/Metamodel/REPRComposeProtocol.nqp b/src/Perl6/Metamodel/REPRComposeProtocol.nqp index b1c2e0063c7..f0ea7852eb1 100644 --- a/src/Perl6/Metamodel/REPRComposeProtocol.nqp +++ b/src/Perl6/Metamodel/REPRComposeProtocol.nqp @@ -24,12 +24,12 @@ role Perl6::Metamodel::REPRComposeProtocol { nqp::push(@repr_info, @type_info); # ...which in turn contains the current type in the MRO... - nqp::push(@type_info, $type_obj); + nqp::push(@type_info, nqp::decont($type_obj)); # ...then an array of hashes per attribute... my @attrs; nqp::push(@type_info, @attrs); - for $type_obj.HOW.attributes($type_obj, :local) -> $attr { + for $type_obj.HOW.attributes(nqp::decont($type_obj), :local) -> $attr { my %attr_info; %attr_info := $attr.name; %attr_info := $attr.type; @@ -56,7 +56,7 @@ role Perl6::Metamodel::REPRComposeProtocol { } # ...followed by a list of immediate parents. - nqp::push(@type_info, $type_obj.HOW.parents($type_obj, :local)); + nqp::push(@type_info, $type_obj.HOW.parents(nqp::decont($type_obj), :local)); } # Compose the representation using it.