p
/
json-rpc-shell
1
1
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 2 Wiki Activity

json-format.pl: fix display of empty [] and {}

This commit is contained in:
Přemysl Eric Janouch 2017-01-25 19:52:09 +01:00
parent 66f1a6afa3
commit 17331073a4
Signed by: p
GPG Key ID: B715679E3A361BE6
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
json-format.pl
View File

@ -21,7 +21,7 @@ my $help;
if (!GetOptions('color=s' => \$color, 'help' => \$help) || $help) { if (!GetOptions('color=s' => \$color, 'help' => \$help) || $help) {
print STDERR print STDERR
"Usage: $0 [OPTION...] [FILE...]\n" . "Usage: $0 [OPTION...] [FILE...]\n" .
"Pretty-print and colorify JSON\n" . "Pretty-print and colorify JSON\n" .
"\n" . "\n" .
" --help print this help\n" . " --help print this help\n" .
" --color=COLOR 'always', 'never' or 'auto' (the default)\n"; " --color=COLOR 'always', 'never' or 'auto' (the default)\n";
@ -77,6 +77,7 @@ sub do_value ($$$);
sub do_object ($) { sub do_object ($) {
my $json = shift; my $json = shift;
my $in_field_name = 1; my $in_field_name = 1;
my $first = 1;
while (my ($token, $text) = nexttoken $json) { while (my ($token, $text) = nexttoken $json) {
if ($token eq 'COLON') { if ($token eq 'COLON') {
$in_field_name = 0; $in_field_name = 0;
@ -88,6 +89,9 @@ sub do_object ($) {
if ($token eq 'RBRACE') { if ($token eq 'RBRACE') {
$indent--; $indent--;
printindent; printindent;
} elsif ($first) {
printindent;
$first = 0;
} }
do_value $token, $text, $json; do_value $token, $text, $json;
return if $token eq 'RBRACE'; return if $token eq 'RBRACE';
@ -96,10 +100,14 @@ sub do_object ($) {
sub do_array ($) { sub do_array ($) {
my $json = shift; my $json = shift;
my $first = 1;
while (my ($token, $text) = nexttoken $json) { while (my ($token, $text) = nexttoken $json) {
if ($token eq 'RBRACKET') { if ($token eq 'RBRACKET') {
$indent--; $indent--;
printindent; printindent;
} elsif ($first) {
printindent;
$first = 0;
} }
do_value $token, $text, $json; do_value $token, $text, $json;
return if $token eq 'RBRACKET'; return if $token eq 'RBRACKET';
@ -115,11 +123,9 @@ sub do_value ($$$) {
} }
if ($token eq 'LBRACE') { if ($token eq 'LBRACE') {
$indent++; $indent++;
printindent;
do_object $json; do_object $json;
} elsif ($token eq 'LBRACKET') { } elsif ($token eq 'LBRACKET') {
$indent++; $indent++;
printindent;
do_array $json; do_array $json;
} elsif ($token eq 'COMMA') { } elsif ($token eq 'COMMA') {
printindent; printindent;
@ -129,14 +135,15 @@ sub do_value ($$$) {
} }
while (<>) { while (<>) {
my $json = $_; # FIXME: this way it doesn't work with pre-formatted JSON
my $json = $_;
my @matches = $json =~ /$any_token/gsc; my @matches = $json =~ /$any_token/gsc;
push @matches, substr $json, pos $json push @matches, substr $json, pos $json
if pos $json != length $json; if pos $json != length $json;
while (my ($token, $text) = nexttoken \@matches) { while (my ($token, $text) = nexttoken \@matches) {
next if $token eq 'WS'; next if $token eq 'WS';
do_value $token, $text, \@matches; do_value $token, $text, \@matches;
} }
print "\n"; print "\n";
} }