From 6f0d87562de7cf66a2a2273f9d9198f16266f597 Mon Sep 17 00:00:00 2001 From: "H.Merijn Brand" Date: Thu, 7 Jan 2010 13:18:40 +0100 Subject: [PATCH] Put first hash element after opening lonely brace --- ChangeLog | 3 ++- Peek.pm | 9 +++++---- t/10_DDumper.t | 19 +++++++++---------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12fbe88..d2bc1d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ -2009-11-25 0.30 - H.Merijn Brand +2010-01-07 0.30 - H.Merijn Brand * Use $Data::Dumper::Quotekeys = 0; instead of removing the quotes myself + * Put first hash element after opening lonely brace 2009-11-09 0.29 - H.Merijn Brand diff --git a/Peek.pm b/Peek.pm index 1497d09..9ac6214 100644 --- a/Peek.pm +++ b/Peek.pm @@ -76,10 +76,11 @@ sub DDumper local $Data::Dumper::Useqq = 0; # I want unicode visible my $s = Data::Dumper::Dumper @_; - $s =~ s!^(\s*)(.*?)\s*=>!sprintf "%s%-16s =>", $1, $2!gme; # Align => - $s =~ s!\bbless\s*\(\s*!bless (!gm and $s =~ s!\s+\)([;,])$!)$1!gm; - $s =~ s!^(?= *[]}](?:[;,]|$))! !gm; - $s =~ s!^(\s+)!$1$1!gm; + $s =~ s/^(\s*)(.*?)\s*=>/sprintf "%s%-16s =>", $1, $2/gme; # Align => + $s =~ s/\bbless\s*\(\s*/bless (/gm and $s =~ s/\s+\)([;,])$/)$1/gm; + $s =~ s/^(?= *[]}](?:[;,]|$))/ /gm; + $s =~ s/^(\s*[{[]) *\n *(?=\S)(?![{[])/$1 /gm; + $s =~ s/^(\s+)/$1$1/gm; defined wantarray or print STDERR $s; return $s; diff --git a/t/10_DDumper.t b/t/10_DDumper.t index 99ac67b..182a5e0 100644 --- a/t/10_DDumper.t +++ b/t/10_DDumper.t @@ -3,7 +3,7 @@ use strict; use warnings; -use Test::More tests => 56; +use Test::More tests => 55; use Test::NoWarnings; BEGIN { @@ -54,18 +54,17 @@ undef undef (0, 1) 1 \(0, 1) \1 -- Structures -[0, 1] ^\[\n line 1 - ^ 0,\n line 2 - ^ 1\n line 3 - ^ ]\Z line 4 -[0,1,2] \A\[\n\s+0,\n\s+1,\n\s+2\n\s+]\Z line splitting +[0, 1] ^\[ 0,\n line 1 + ^ 1\n line 2 + ^ ]\Z line 3 +[0,1,2] \A\[\s+0,\n\s+1,\n\s+2\n\s+]\Z line splitting -- Indentation -[0] \A\[\n 0\n ]\Z single indent +[0] \A\[ 0\n ]\Z single indent [[0],{foo=>1}] ^\[\n outer list - ^ {4}\[\n {8}0\n {8}],\n {4} inner list - ^ {4}\{\n {8}foo {14}=> 1\n {8}}\n inner hash + ^ {4}\[ 0\n {8}],\n {4} inner list + ^ {4}\{ foo {14}=> 1\n {8}}\n inner hash ^ {4}]\Z outer list end -[[0],{foo=>1}] \A\[\n {4}\[\n {8}0\n {8}],\n {4}\{\n {8}foo {14}=> 1\n {8}}\n {4}]\Z full struct +[[0],{foo=>1}] \A\[\n {4}\[ 0\n {8}],\n {4}\{ foo {14}=> 1\n {8}}\n {4}]\Z full struct -- Sorting S:1:{ab=>1,bc=>2,cd=>3,de=>13} ab.*bc.*cd.*de default sort S:R:{ab=>1,bc=>2,cd=>3,de=>13} de.*cd.*bc.*ab reverse sort -- 2.11.4.GIT