Passing tests

ingydotnet · Jan 6, 2017 · df1181a · df1181a
1 parent 3e2f2e5
commit df1181a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/lib/TestML/Compiler/Lite.pm b/lib/TestML/Compiler/Lite.pm
@@ -186,9 +186,9 @@ sub compile_data {
                 die "Failed to parse TestML string:\n$string_block";
             }
             $block->{points} ||= {};
-            $value =~ s/(\r?\n)\s*\z//;
+            my $eol = ($value =~ s/(\r?\n)\s*\z//) ? $1 : '';
             if (length $value) {
-                $value .= $1;
+                $value .= $eol;
             }
             $block->{points}{$key} = $value;
 

diff --git a/lib/TestML/Compiler/Pegex/AST.pm b/lib/TestML/Compiler/Pegex/AST.pm
@@ -192,9 +192,12 @@ sub got_data_block {
 
 sub got_block_point {
     my ($self, $point) = @_;
-    return {
-        $point->[0] => $point->[1],
-    };
+    my ($name, $value) = @$point;
+    my $eol = ($value =~ s/(\r?\n)\s*\z//) ? $1 : '';
+    if (length $value) {
+        $value .= $eol;
+    }
+    return { $name => $value };
 }
 
 1;
diff --git a/test/ast/basic.tml b/test/ast/basic.tml
@@ -73,8 +73,6 @@ data:
 
       Don''t spray it.
 
-
-
 '
     lower: 'say it,