[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/01: Fix a false positive in cleaning c++ like comments

This is an automated email from the git hooks/post-receive script.

broucaries-guest pushed a commit to branch master
in repository lintian.

commit c90a86e61d56b73934701f03e08ca65c088430f1
Author: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
Date:   Wed Apr 2 21:50:39 2014 +0200

    Fix a false positive in cleaning c++ like comments
    
    Do not remove \n at end of line for c++ comment. Avoid a false positive in source-is-missing
    
    Signed-off-by: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
---
 checks/cruft.pm                                    |   3 +-
 .../debian/oldfalsepositives/endoflinecomments.js  | 104 +++++++++++++++++++++
 2 files changed, 106 insertions(+), 1 deletion(-)

diff --git a/checks/cruft.pm b/checks/cruft.pm
index baa2bd8..40ed53d 100644
--- a/checks/cruft.pm
+++ b/checks/cruft.pm
@@ -854,8 +854,9 @@ sub _linelength_test {
     my ($entry, $info, $name, $basename, $dirname, $path, $block) = @_;
     my $strip = $block;
     # from perl faq strip comments
+    #$strip =~ s#//[^\n]$//g
     $strip
-      =~ s#/\*[^*]*\*+([^/*][^*]*\*+)*/|//([^\\]|[^\n][\n]?)*?\n|("(\\.|[^"\\])*"|'(\\.|[^'\\])*'|.[^/"'\\]*)#defined $3 ? $3 : ""#gse;
+      =~ s#/\*[^*]*\*+([^/*][^*]*\*+)*/|//([^\\]|[^\n][\n]?)*?(?=\n)|("(\\.|[^"\\])*"|'(\\.|[^'\\])*'|.[^/"'\\]*)#defined $3 ? $3 : ""#gse;
     # strip empty line
     $strip =~ s/^\s*\n//mg;
     # remove last \n
diff --git a/t/tests/cruft-minified-js/debian/oldfalsepositives/endoflinecomments.js b/t/tests/cruft-minified-js/debian/oldfalsepositives/endoflinecomments.js
new file mode 100644
index 0000000..7ab1dda
--- /dev/null
+++ b/t/tests/cruft-minified-js/debian/oldfalsepositives/endoflinecomments.js
@@ -0,0 +1,104 @@
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment
+var longlonglong = 5; // comment

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: