update to v2.1.0\nremove failure for valid comment lines

tbrowder · Feb 12, 2020 · e373220 · e373220
1 parent 603cb75
commit e373220
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v2.1.0] - 2020-02-12
+- remove the sub strip-comment check and fail lines with only the
+  comment char at the beginning of the line and no other content
+- modify tests to check the new behavior
+
 ## [v2.0.1] - 2019-12-18
 - add test to ensure tabs are handled properly
 - note that v2.0.0 was never uploaded to CPAN

diff --git a/META6.json b/META6.json
@@ -1,7 +1,7 @@
 {
     "perl"        : "6.*",
     "name"        : "Text::Utils",
-    "version"     : "2.0.1",
+    "version"     : "2.1.0",
     "api"         : "2",
     "description" : "Provides some additional text functions (replaces module Text::More)",
     "auth"        : "github:tbrowder",

diff --git a/lib/Text/Utils.pm6 b/lib/Text/Utils.pm6
@@ -45,10 +45,6 @@ multi strip-comment($line is copy,       #= string of text with possible comment
                     :$normalize,         #= if true, normalize returned strings
                     :$last,              #= if true, use the last instead of first comment char
                    ) is export(:strip-comment) {
-    # failure condition:
-    if $line eq $mark {
-        die "FATAL: The input line is the same as the comment char: '$line'";
-    }
     my $comment = '';
     my $clen    = $mark.chars;
     my $idx     = $last ?? rindex $line, $mark
@@ -74,13 +70,6 @@ multi strip-comment($line is copy,       #= string of text with possible comment
                     :$normalize,         #= if true, normalize returned strings
                     :$last,              #= if true, use the last instead of first comment char
                    ) is export(:strip-comment) {
-    # failure condition:
-    if $line eq $comment-char {
-        note "FATAL: The input line is the same as the comment char: '$line'";
-        note "       This signature is deprecated.";
-        note "       Use the ':mark<$line>' named param for the comment char.";
-        die  "DEPRECATED SIGNATURE--USE THE MARK NOTATION IN THE FUTURE";
-    }
     my $comment = '';
     my $clen    = $comment-char.chars;
     my $idx     = $last ?? rindex $line, $comment-char

diff --git a/t/020-strip-comment.t b/t/020-strip-comment.t
@@ -11,14 +11,16 @@ my (@s, @stripped);
 'some text',
 'text # coment...',
 ' #comment',
-'more text'
+'more text',
+'#',
 );
 
 @stripped = (
 'some text',
 'text ',
 ' ',
-'more text'
+'more text',
+'',
 );
 
 # return the stripped strings
@@ -36,7 +38,8 @@ for 0..^+@s -> $i {
 'some text',
 'text ; coment...',
 ' ;comment',
-'more text'
+'more text',
+';',
 );
 
 # return the stripped strings
@@ -96,16 +99,10 @@ is $comm, ' some  comment ';
 is $text, 'some text %% text';
 is $comm, 'some comment';
 
-# bad input by user
-dies-ok { $text = strip-comment '#'; }, 'dies when line is same as comment char';
-
 #===== END OF ORIGINAL SIGNATURE IS DEPRECATED =====
 
 # test the new signature
 
-# bad input by user
-dies-ok { $text = strip-comment '%', :mark<%>; }, 'dies when line is same as comment (:mark) char';
-
 ($text, $comm) = strip-comment $tstr, :mark<%%>, :last, :save-comment, :normalize;
 is $text, 'some text %% text';
 is $comm, 'some comment';