Skip to content

Commit

Permalink
Merge pull request #1979 from tbrowder/input-output
Browse files Browse the repository at this point in the history 
Fix GH #1968: input/output block lines are squeezed
  • Loading branch information
@tbrowder
tbrowder committed Jun 27, 2018
2 parents e6e9daf + c643383 commit 3ed20db
Show file tree
Hide file tree
Showing 3 changed files with 276 additions and 11 deletions.
50 changes: 40 additions & 10 deletions src/Perl6/Grammar.nqp
View file
Expand Up @@ -918,7 +918,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
token pod_string_character {
<pod_balanced_braces> || <pod_formatting_code> || $<char>=[ \N || [
<?{ $*POD_IN_FORMATTINGCODE }> \n [
<?{ $*POD_DELIMITED_CODE_BLOCK }> <!before \h* '=end' \h+ code> ||
<?{ $*POD_DELIMITED_CODE_BLOCK }> <!before \h* '=end' \h+ <pod-delim-code-typ> > ||
<!before \h* '=' \w>
]
]
Expand All @@ -941,7 +941,12 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
^^ $<spaces> '=end' \h+
[
'comment' [ <pod_newline> | $ ]
|| $<instead>=<identifier>? {$/.typed_panic: 'X::Syntax::Pod::BeginWithoutEnd', type => 'comment', spaces => ~$<spaces>, instead => $<instead> ?? ~$<instead> !! ''}
|| $<instead>=<identifier>? {
$/.typed_panic: 'X::Syntax::Pod::BeginWithoutEnd',
type => 'comment',
spaces => ~$<spaces>,
instead => $<instead> ?? ~$<instead> !! ''
}
]
]
}
Expand Down Expand Up @@ -969,7 +974,12 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
^^ $<spaces> '=end' \h+
[
$<type> [ <pod_newline> | $ ]
|| $<instead>=<identifier>? {$/.typed_panic: 'X::Syntax::Pod::BeginWithoutEnd', type => ~$<type>, spaces => ~$<spaces>, instead => $<instead> ?? ~$<instead> !! ''}
|| $<instead>=<identifier>? {
$/.typed_panic: 'X::Syntax::Pod::BeginWithoutEnd',
type => ~$<type>,
spaces => ~$<spaces>,
instead => $<instead> ?? ~$<instead> !! ''
}
]
]
}
Expand All @@ -986,23 +996,43 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
^^ \h* '=end' \h+
[
'table' [ <pod_newline> | $ ]
|| $<instead>=<identifier>? {$/.typed_panic: 'X::Syntax::Pod::BeginWithoutEnd', type => 'table', spaces => ~$<spaces>, instead => $<instead> ?? ~$<instead> !! ''}
|| $<instead>=<identifier>? {
$/.typed_panic: 'X::Syntax::Pod::BeginWithoutEnd',
type => 'table',
spaces => ~$<spaces>,
instead => $<instead> ?? ~$<instead> !! ''
}
]
]
}
# There are several different identifiers for pod blocks
# that are treated essentially the same: 'code', 'input',
# and 'output'.
token pod-delim-code-typ { code | input | output }
token pod_block:sym<delimited_code> {
^^
$<spaces> = [ \h* ]
'=begin' \h+ 'code' {}
'=begin' \h+ $<typ>=<pod-delim-code-typ> {}
:my $*POD_ALLOW_FCODES := 0;
:my $*POD_IN_CODE_BLOCK := 1;
:my $*POD_DELIMITED_CODE_BLOCK := 1;
<pod_configuration($<spaces>)> <pod_newline>+
[
|| <delimited_code_content($<spaces>)> $<spaces> '=end' \h+
[ 'code' [ <pod_newline> | $ ]
|| $<instead>=<identifier>? {$/.typed_panic: 'X::Syntax::Pod::BeginWithoutEnd', type => 'code', spaces => ~$<spaces>, instead => $<instead> ?? ~$<instead> !! ''}
[ $<end>=<pod-delim-code-typ> [ <pod_newline> | $ ]
{ if ~$<end> ne ~$<typ> {
$/.typed_panic: 'X::Syntax::Pod::BeginWithoutEnd',
type => ~$<typ>,
spaces => ~$<spaces>,
instead => $<end> ?? ~$<end> !! ''
}}
|| $<instead>=<identifier>? {
$/.typed_panic: 'X::Syntax::Pod::BeginWithoutEnd',
type => $<typ>,
spaces => ~$<spaces>,
instead => $<instead> ?? ~$<instead> !! ''
}
]
]
}
Expand All @@ -1011,7 +1041,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
^^
(
| $spaces
<!before '=end' \h+ 'code' [ <pod_newline> | $ ]>
<!before '=end' \h+ <pod-delim-code-typ> [ <pod_newline> | $ ]>
<pod_string>**0..1 <pod_newline>
| <pod_newline>
)*
Expand Down Expand Up @@ -1076,7 +1106,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
token pod_block:sym<paragraph_code> {
^^
$<spaces> = [ \h* ]
'=for' \h+ 'code' {}
'=for' \h+ <pod-delim-code-typ> {}
:my $*POD_ALLOW_FCODES := 0;
:my $*POD_IN_CODE_BLOCK := 1;
<pod_configuration($<spaces>)> <pod_newline>
Expand Down Expand Up @@ -1123,7 +1153,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
token pod_block:sym<abbreviated_code> {
^^
$<spaces> = [ \h* ]
'=code' {}
'=' <pod-delim-code-typ> {}
:my $*POD_ALLOW_FCODES := 0;
:my $*POD_IN_CODE_BLOCK := 1;
[\h*\n|\h+]
Expand Down
90 changes: 89 additions & 1 deletion t/07-pod-to-text/01-whitespace.t
View file
Expand Up @@ -3,7 +3,7 @@ use Test;

use Pod::To::Text;

plan 2;
plan 4;

my $ix = -1;

Expand Down Expand Up @@ -51,6 +51,94 @@ subtest 'Code blocks' => {
END
}

subtest 'Input blocks' => {
plan 3;

=begin input
say 1;
say 2;
=end input

is Pod::To::Text.render($=pod[++$ix]),
q:to/END/, "Empty lines don't get added spaces";
say 1;
say 2;
END

=begin input
my $a = -5;
say ++$a.=abs;
# OUTPUT: «6␤»
=end input

is Pod::To::Text.render($=pod[++$ix]),
q:to/END/, "Plain continuation lines are aligned";
my $a = -5;
say ++$a.=abs;
# OUTPUT: «6␤»
END

=begin input :allow<B L>
sub exclaim B<($phrase)> {
say $phrase L<~> "!!!!"
}
exclaim "Howdy, World";
=end input
is Pod::To::Text.render($=pod[++$ix]),
q:to/END/, "Formatting Codes in input block";
sub exclaim ($phrase) {
say $phrase ~ "!!!!"
}
exclaim "Howdy, World";
END
}

subtest 'Output blocks' => {
plan 3;

=begin output
say 1;
say 2;
=end output

is Pod::To::Text.render($=pod[++$ix]),
q:to/END/, "Empty lines don't get added spaces";
say 1;
say 2;
END

=begin output
my $a = -5;
say ++$a.=abs;
# OUTPUT: «6␤»
=end output

is Pod::To::Text.render($=pod[++$ix]),
q:to/END/, "Plain continuation lines are aligned";
my $a = -5;
say ++$a.=abs;
# OUTPUT: «6␤»
END

=begin output :allow<B L>
sub exclaim B<($phrase)> {
say $phrase L<~> "!!!!"
}
exclaim "Howdy, World";
=end output
is Pod::To::Text.render($=pod[++$ix]),
q:to/END/, "Formatting Codes in output block";
sub exclaim ($phrase) {
say $phrase ~ "!!!!"
}
exclaim "Howdy, World";
END
}

subtest 'Tables' => {
plan 1;

Expand Down
147 changes: 147 additions & 0 deletions t/07-pod-to-text/02-input-output.t
View file
@@ -0,0 +1,147 @@
use v6.c;
use Test;

use Pod::To::Text;

plan 18;

my $r;
my $rp;
my $p = -1;

# explicit code blocks
{
=begin code
say 1;
say 2;
=end code
$r = $=pod[++$p];
isa-ok $r, Pod::Block::Code;
# code blocks should get indented 4 spaces by Pod::To::Text
$rp = Pod::To::Text.render($r),
is $rp,
q:to/END/;
say 1;
say 2;
END

=code
say 1;
say 2;

$r = $=pod[++$p];
isa-ok $r, Pod::Block::Code;
# code blocks should get indented 4 spaces by Pod::To::Text
$rp = Pod::To::Text.render($r),
is $rp,
q:to/END/;
say 1;
say 2;
END

=for code
say 1;
say 2;
$r = $=pod[++$p];
isa-ok $r, Pod::Block::Code;
# code blocks should get indented 4 spaces by Pod::To::Text
$rp = Pod::To::Text.render($r),
is $rp,
q:to/END/;
say 1;
say 2;
END
}

# implicit code blocks: input
{
=begin input
say 1;
say 2;
=end input
$r = $=pod[++$p];
isa-ok $r, Pod::Block::Code;
# code blocks should get indented 4 spaces by Pod::To::Text
$rp = Pod::To::Text.render($r),
is $rp,
q:to/END/;
say 1;
say 2;
END

=input
say 1;
say 2;

$r = $=pod[++$p];
isa-ok $r, Pod::Block::Code;
# code blocks should get indented 4 spaces by Pod::To::Text
$rp = Pod::To::Text.render($r),
is $rp,
q:to/END/;
say 1;
say 2;
END

=for input
say 1;
say 2;
$r = $=pod[++$p];
isa-ok $r, Pod::Block::Code;
# code blocks should get indented 4 spaces by Pod::To::Text
$rp = Pod::To::Text.render($r),
is $rp,
q:to/END/;
say 1;
say 2;
END
}

# implicit code blocks: output
{
=begin output
say 1;
say 2;
=end output
$r = $=pod[++$p];
isa-ok $r, Pod::Block::Code;
# code blocks should get indented 4 spaces by Pod::To::Text
$rp = Pod::To::Text.render($r),
is $rp,
q:to/END/;
say 1;
say 2;
END

=output
say 1;
say 2;

$r = $=pod[++$p];
isa-ok $r, Pod::Block::Code;
# code blocks should get indented 4 spaces by Pod::To::Text
$rp = Pod::To::Text.render($r),
is $rp,
q:to/END/;
say 1;
say 2;
END

=for output
say 1;
say 2;
$r = $=pod[++$p];
isa-ok $r, Pod::Block::Code;
# code blocks should get indented 4 spaces by Pod::To::Text
$rp = Pod::To::Text.render($r),
is $rp,
q:to/END/;
say 1;
say 2;
END
}

# vim: expandtab shiftwidth=4 ft=perl6

0 comments on commit 3ed20db

Please sign in to comment.