Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Perlito5 - perl5 - pretty-printer - statement modifier
  • Loading branch information
@fglock
fglock committed Oct 6, 2013
1 parent 0d9f88e commit 875d2eb
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 5 deletions.
21 changes: 18 additions & 3 deletions perlito5.pl
View file
Expand Up @@ -12483,10 +12483,10 @@ package Perlito5::AST::If;
sub Perlito5::AST::If::emit_perl5_2 {
my $self = $_[0];
if (($self->{'body'} && (ref($self->{'body'}) ne 'Perlito5::AST::Lit::Block'))) {
return ($self->{'body'}->emit_perl5_2() . ' if ' . $self->{'cond'}->emit_perl5_2())
return ['stmt_modifier', $self->{'body'}->emit_perl5_2(), ['stmt', 'if', $self->{'cond'}->emit_perl5_2()]]
};
if (($self->{'otherwise'} && (ref($self->{'otherwise'}) ne 'Perlito5::AST::Lit::Block'))) {
return ($self->{'otherwise'}->emit_perl5_2() . ' unless ' . $self->{'cond'}->emit_perl5_2())
return ['stmt_modifier', $self->{'otherwise'}->emit_perl5_2(), ['stmt', 'unless', $self->{'cond'}->emit_perl5_2()]]
};
return ('if (' . $self->{'cond'}->emit_perl5_2() . ') ' . (($self->{'body'} ? Perlito5::Perl5::emit_perl5_2_block($self->{'body'}->stmts()) : '{ }')) . ((($self->{'otherwise'} && scalar(@{$self->{'otherwise'}->stmts()})) ? ((chr(10) . 'else ' . Perlito5::Perl5::emit_perl5_2_block($self->{'otherwise'}->stmts()))) : '')))
}
Expand Down Expand Up @@ -12585,7 +12585,7 @@ package Perlito5::Perl5::PrettyPrinter;

# use warnings
;
my %dispatch = ('stmt', \&statement, 'block', \&block, 'keyword', \&keyword, 'bareword', \&bareword, 'op', \&op, 'paren', \&paren, 'paren_semicolon', \&paren_semicolon, 'comment', \&comment);
my %dispatch = ('stmt', \&statement, 'stmt_modifier', \&statement_modifier, 'block', \&block, 'keyword', \&keyword, 'bareword', \&bareword, 'op', \&op, 'paren', \&paren, 'paren_semicolon', \&paren_semicolon, 'comment', \&comment);
my %pair = ('(', ')', '[', ']', '{', '}');
our %op = ('prefix:<-->', {'fix', 'prefix', 'prec', 1, 'str', '--'}, 'prefix:<++>', {'fix', 'prefix', 'prec', 1, 'str', '++'}, 'postfix:<-->', {'fix', 'postfix', 'prec', 1, 'str', '--'}, 'postfix:<-->', {'fix', 'postfix', 'prec', 1, 'str', '++'}, 'infix:<**>', {'fix', 'infix', 'prec', 2, 'str', '**'}, 'prefix:<' . chr(92) . '>', {'fix', 'prefix', 'prec', 3, 'str', chr(92)}, 'prefix:<+>', {'fix', 'prefix', 'prec', 3, 'str', '+'}, 'prefix:<->', {'fix', 'prefix', 'prec', 3, 'str', '-'}, 'prefix:<~>', {'fix', 'prefix', 'prec', 3, 'str', '~'}, 'prefix:<!>', {'fix', 'prefix', 'prec', 3, 'str', '!'}, 'infix:<=~>', {'fix', 'infix', 'prec', 4, 'str', ' =~ '}, 'infix:<!~>', {'fix', 'infix', 'prec', 4, 'str', ' !~ '}, 'infix:<*>', {'fix', 'infix', 'prec', 5, 'str', ' * '}, 'infix:</>', {'fix', 'infix', 'prec', 5, 'str', ' / '}, 'infix:<%>', {'fix', 'infix', 'prec', 5, 'str', ' % '}, 'infix:<x>', {'fix', 'infix', 'prec', 5, 'str', ' x '}, 'infix:<+>', {'fix', 'infix', 'prec', 6, 'str', ' + '}, 'infix:<->', {'fix', 'infix', 'prec', 6, 'str', ' - '}, 'list:<.>', {'fix', 'list', 'prec', 6, 'str', ' . '}, 'infix:<<<>', {'fix', 'infix', 'prec', 7, 'str', ' << '}, 'infix:<>>>', {'fix', 'infix', 'prec', 7, 'str', ' >> '}, 'prefix:<-f>', {'fix', 'prefix', 'prec', 8, 'str', '-f '}, 'prefix:<do>', {'fix', 'parsed', 'prec', 8, 'str', 'do '}, 'prefix:<sub>', {'fix', 'parsed', 'prec', 8, 'str', 'sub'}, 'prefix:<my>', {'fix', 'parsed', 'prec', 8, 'str', 'my'}, 'prefix:<our>', {'fix', 'parsed', 'prec', 8, 'str', 'our'}, 'prefix:<state>', {'fix', 'parsed', 'prec', 8, 'str', 'state'}, 'infix:<lt>', {'fix', 'infix', 'prec', 9, 'str', ' lt '}, 'infix:<le>', {'fix', 'infix', 'prec', 9, 'str', ' le '}, 'infix:<gt>', {'fix', 'infix', 'prec', 9, 'str', ' gt '}, 'infix:<ge>', {'fix', 'infix', 'prec', 9, 'str', ' ge '}, 'infix:<<=>', {'fix', 'infix', 'prec', 9, 'str', ' <= '}, 'infix:<>=>', {'fix', 'infix', 'prec', 9, 'str', ' >= '}, 'infix:<<>', {'fix', 'infix', 'prec', 9, 'str', ' < '}, 'infix:<>>', {'fix', 'infix', 'prec', 9, 'str', ' > '}, 'infix:<=>', {'fix', 'infix', 'prec', 19, 'str', ' = '}, 'infix:<=>>', {'fix', 'infix', 'prec', 20, 'str', ' => '}, 'list:<,>', {'fix', 'list', 'prec', 20, 'str', ', '});
my %tab;
Expand Down Expand Up @@ -12729,6 +12729,21 @@ sub Perlito5::Perl5::PrettyPrinter::statement {
push(@{$out}, ' ') if ($line != $#{$data})
}
};
sub Perlito5::Perl5::PrettyPrinter::statement_modifier {
my($data, $level, $out) = @_;
for my $line ((1 .. 2)) {
my $d = $data->[$line];
push(@{$out}, tab($level));
if (ref($d)) {
$dispatch{$d->[0]}->($d, $level, $out)
}
else {
push(@{$out}, $d)
};
push(@{$out}, chr(10)) if ($line == 1);
($level)++
}
};
sub Perlito5::Perl5::PrettyPrinter::block {
my($data, $level, $out) = @_;
if ((@{$data} == 1)) {
Expand Down
6 changes: 4 additions & 2 deletions src5/lib/Perlito5/Perl5/Emitter2.pm
View file
Expand Up @@ -382,10 +382,12 @@ package Perlito5::AST::If;
my $self = $_[0];

if ($self->{body} && ref($self->{body}) ne 'Perlito5::AST::Lit::Block') {
return $self->{body}->emit_perl5_2() . ' if ' . $self->{cond}->emit_perl5_2();
return [ stmt_modifier => $self->{body}->emit_perl5_2(),
[ stmt => 'if', $self->{cond}->emit_perl5_2() ] ];
}
if ($self->{otherwise} && ref($self->{otherwise}) ne 'Perlito5::AST::Lit::Block') {
return $self->{otherwise}->emit_perl5_2() . ' unless ' . $self->{cond}->emit_perl5_2();
return [ stmt_modifier => $self->{otherwise}->emit_perl5_2(),
[ stmt => 'unless', $self->{cond}->emit_perl5_2() ] ];
}

return 'if (' . $self->{cond}->emit_perl5_2() . ") "
Expand Down
17 changes: 17 additions & 0 deletions src5/lib/Perlito5/Perl5/PrettyPrinter.pm
View file
Expand Up @@ -4,6 +4,7 @@ use warnings;

my %dispatch = (
stmt => \&statement, # if (expr) {stms}
stmt_modifier => \&statement_modifier, # stmt if expr
block => \&block, # {stmts}
keyword => \&keyword, # if
bareword => \&bareword, # main
Expand Down Expand Up @@ -226,6 +227,22 @@ sub statement {
}
}

sub statement_modifier {
my ( $data, $level, $out ) = @_;
for my $line ( 1 .. 2 ) {
my $d = $data->[$line];
push @$out, tab($level);
if ( ref($d) ) {
$dispatch{ $d->[0] }->( $d, $level, $out );
}
else {
push @$out, $d;
}
push @$out, "\n" if $line == 1;
$level++;
}
}

sub block {
my ( $data, $level, $out ) = @_;
if ( @$data == 1 ) {
Expand Down

0 comments on commit 875d2eb

Please sign in to comment.