From cf01f7a258ec9ce6f6a948f6b73ba7a04909eb64 Mon Sep 17 00:00:00 2001 From: Elizabeth Mattijsen Date: Tue, 3 Mar 2020 11:10:57 +0100 Subject: [PATCH] Make all QuantHash.gist use the same format - type name up front - no comma's Spotted while preparing presentation for the GPaRW 2020 --- src/core.c/Baggy.pm6 | 2 +- src/core.c/Setty.pm6 | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/core.c/Baggy.pm6 b/src/core.c/Baggy.pm6 index 65a8821ff3e..25709535f4d 100644 --- a/src/core.c/Baggy.pm6 +++ b/src/core.c/Baggy.pm6 @@ -312,7 +312,7 @@ my role Baggy does QuantHash { nqp::concat( nqp::concat( nqp::concat(self.^name,'('), - nqp::join(', ', + nqp::join(' ', Rakudo::Sorting.MERGESORT-str( Rakudo::QuantHash.RAW-VALUES-MAP(self, { nqp::if( diff --git a/src/core.c/Setty.pm6 b/src/core.c/Setty.pm6 index dcccee78a06..b5eecaa20e4 100644 --- a/src/core.c/Setty.pm6 +++ b/src/core.c/Setty.pm6 @@ -146,11 +146,7 @@ my role Setty does QuantHash { multi method gist(Setty:D $ : --> Str:D) { nqp::concat( nqp::concat( - nqp::if( - nqp::istype(self,Set), - 'set(', - nqp::concat(self.^name,'(') - ), + nqp::concat(self.^name,'('), nqp::join(" ", Rakudo::Sorting.MERGESORT-str( Rakudo::QuantHash.RAW-VALUES-MAP(self, *.gist)