Fix END block handling, we now pass S02-whitespace_and_comments/end-p…

…od.t
rakudo · Jul 7, 2011 · 74bfbe4 · 74bfbe4
1 parent 25cc743
commit 74bfbe4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -225,7 +225,7 @@ class Perl6::Actions is HLL::Actions {
 
     method pod_content_toplevel($/) {
         my $child := $<pod_block>.ast;
-        $*POD_BLOCKS.push($child);
+        $*POD_BLOCKS.push($child) if $child;
         make $child;
     }
 
@@ -241,6 +241,9 @@ class Perl6::Actions is HLL::Actions {
         make self.any_block($/);
     }
 
+    method pod_block:sym<end>($/) {
+    }
+
     method pod_block:sym<delimited>($/) {
         make self.any_block($/);
     }

diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -227,7 +227,7 @@ grammar Perl6::Grammar is HLL::Grammar {
         [
             || '=begin' \h+ 'END' <pod_newline>
             || '=for'   \h+ 'END' <pod_newline>
-            || '=END' \h+
+            || '=END' <pod_newline>
         ]
         .*
     }

diff --git a/t/spectest.data b/t/spectest.data
@@ -95,6 +95,7 @@ S02-names/identifier.t
 # S02-one-pass-parsing/less-than.t
 # S02-polymorphic_types/subset.t
 S02-whitespace_and_comments/begin_end_pod.t
+S02-whitespace_and_comments/end-pod.t
 # S02-whitespace_and_comments/comments.t
 S02-whitespace_and_comments/minimal-whitespace.t
 # S02-whitespace_and_comments/one-pass-parsing.t