simplify further to a Seq

cjfields · Sep 9, 2016 · f1b2a7a · f1b2a7a
1 parent d00d853
commit f1b2a7a
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/lib/Bio/SeqIO/fasta.pm6 b/lib/Bio/SeqIO/fasta.pm6
@@ -31,21 +31,15 @@ class Bio::SeqIO::fasta does Bio::Role::SeqStream does Bio::Role::IO {
     # 1) Grammar parsing of a stream of data (e.g. Cat), which is now considered
     #    a post-6.0 update
 
-    method !chunkify {
+    method next-Seq {
         return if $.fh.eof();
         while $.fh.get -> $chunk {
             if $chunk !~~ /^^\>/ {
-                return ">$chunk";
+                return Bio::Grammar::Fasta.subparse( ">$chunk", actions => $!actions, rule => 'record').ast;
+            } else {
+                return Bio::Grammar::Fasta.subparse( "$chunk", actions => $!actions, rule => 'record').ast;
             }
-            return $chunk;
         }
-    };
-
-    method next-Seq {
-        my $chunk = self!chunkify;
-        return if !?$chunk.defined;
-        my $t = Bio::Grammar::Fasta.subparse($chunk, actions => $!actions, rule => 'record').ast;
-        return $t;
     }
 
     method write-Seq(Bio::PrimarySeq $seq) {