Make sure =code and =for code take newlines and spaces

rakudo · Feb 20, 2014 · c940e3f · c940e3f
1 parent a9cf04d
commit c940e3f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/Perl6/Actions.nqp b/src/Perl6/Actions.nqp
@@ -605,7 +605,10 @@ class Perl6::Actions is HLL::Actions does STDActions {
 
     method pod_block:sym<paragraph_code>($/) {
         my $config := $<pod_configuration>.ast;
-        my @t      := Perl6::Pod::merge_twines($<pod_string>);
+        my @t := [];
+        for $<pod_line> {
+            nqp::splice(@t, $_.ast, +@t, 0);
+        }
         my $twine  := Perl6::Pod::serialize_array(@t).compile_time_value;
         make Perl6::Pod::serialize_object(
             'Pod::Block::Code', :content($twine),
@@ -626,13 +629,24 @@ class Perl6::Actions is HLL::Actions does STDActions {
     }
 
     method pod_block:sym<abbreviated_code>($/) {
-        my @t     := Perl6::Pod::merge_twines($<pod_string>);
+        my @t := [];
+        for $<pod_line> {
+            nqp::splice(@t, $_.ast, +@t, 0);
+        }
         my $twine := Perl6::Pod::serialize_array(@t).compile_time_value;
         make Perl6::Pod::serialize_object(
             'Pod::Block::Code', :content($twine)
         ).compile_time_value
     }
 
+    method pod_line ($/) {
+        my @t := Perl6::Pod::merge_twines($<pod_string>);
+        @t.push($*W.add_constant(
+            'Str', 'str', ~$<pod_newline>
+        ).compile_time_value);
+        make @t;
+    }
+
     method pod_block:sym<end>($/) {
     }
 

diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -762,8 +762,9 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
         $<spaces> = [ \h* ]
         '=for' \h+ 'code' {}
         :my $*POD_ALLOW_FCODES := 0;
+        :my $*POD_IN_CODE_BLOCK := 1;
         <pod_configuration($<spaces>)> <pod_newline>
-        [ <!before \h* '=' \w> <pod_string> <pod_newline> ]+
+        [ <!before \h* '=' \w> <pod_line> ]*
     }
 
     token pod_block:sym<abbreviated> {
@@ -809,9 +810,11 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
         :my $*POD_ALLOW_FCODES  := 0;
         :my $*POD_IN_CODE_BLOCK := 1;
         <pod_configuration($<spaces>)> [\h*\n|\h+]
-        [ <!before \h* '=' \w> <pod_string> <pod_newline> ]+
+        [ <!before \h* '=' \w> <pod_line> ]*
     }
 
+    token pod_line { <pod_string>**1 <pod_newline> }
+
     token pod_newline {
         \h* [ \n | $ ]
     }