]> git.donarmstrong.com Git - perltidy.git/commitdiff
added tests for parameters -dbc -dp -dsc and -nibc
authorSteve Hancock <perltidy@users.sourceforge.net>
Sun, 19 Apr 2020 23:50:43 +0000 (16:50 -0700)
committerSteve Hancock <perltidy@users.sourceforge.net>
Sun, 19 Apr 2020 23:50:43 +0000 (16:50 -0700)
13 files changed:
t/snippets/comments.in
t/snippets/comments1.par
t/snippets/comments2.par
t/snippets/comments5.par [new file with mode: 0644]
t/snippets/expect/comments.comments1
t/snippets/expect/comments.comments2
t/snippets/expect/comments.comments3
t/snippets/expect/comments.comments4
t/snippets/expect/comments.comments5 [new file with mode: 0644]
t/snippets/expect/comments.def
t/snippets/packing_list.txt
t/snippets17.t
t/snippets18.t

index 3c57e797ef8814648bab366409be2a5f1b2df8ff..9fa0ee3595a6bc1b9907a213eb20fcd9d6f05f7c 100644 (file)
@@ -1,8 +1,23 @@
-# test script for side comment and blank line flags
+#!/usr/bin/perl -w
+# an initial hash bang line cannot be deleted with -dp
 sub length { return length($_[0]) }    # side comment
                              # hanging side comment
                              # very longgggggggggggggggggggggggggggggggggggggggggggggggggggg hanging side comment
 
+# side comments following open brace are not currently treated as hanging side comments
+sub macro_get_names { #
+# 
+# %name = macro_get_names();  (key=macrohandle, value=macroname)
+#
+##local(%name);  # a static block comment
+   local(%name)=();
+   for (0..$                                          #mac_ver) {
+      $name{$_} = $mac_ext[$idx{$mac_exti[$_]}];
+   }
+   %name;
+} 
+
+
 
 
 # side comments at different indentation levels should not normally be aligned
@@ -13,10 +28,23 @@ sub length { return length($_[0]) }    # side comment
 
 
 
-
 # some blank lines follow
 
 
 
+=pod
+Some pod before __END__ to delete with -dp
+=cut
+
+
+__END__
+
+
+# text following __END__, not a comment
+
+
+=pod
+Some pod after  __END__ to delete with -dp
+=cut
 
 
index 24bda2561c8275c39afd17ffd2b277d762917825..cd3c986197bf2ada0b17b099072660157cf6c353 100644 (file)
@@ -1 +1 @@
--fpsc=40 -iscl
+-fpsc=40 -iscl -nibc
index 189d47bff8312131cdf863eb93b30a38be2c5b7a..bf263e5b3cf47a706fe2cf851b8c4e36324c75ff 100644 (file)
@@ -1 +1 @@
--msc=10
+-msc=10 -dbc -dp
diff --git a/t/snippets/comments5.par b/t/snippets/comments5.par
new file mode 100644 (file)
index 0000000..52663e5
--- /dev/null
@@ -0,0 +1 @@
+-dsc
index 9c15f38b382a333c0b9089079d13bc41c8963543..5de00718a3cffc289f381890bef9168cb0212f91 100644 (file)
@@ -1,8 +1,22 @@
-# test script for side comment and blank line flags
+#!/usr/bin/perl -w
+# an initial hash bang line cannot be deleted with -dp
 sub length { return length( $_[0] ) }  # side comment
                                        # hanging side comment
                                        # very longgggggggggggggggggggggggggggggggggggggggggggggggggggg hanging side comment
 
+# side comments following open brace are not currently treated as hanging side comments
+sub macro_get_names {                  #
+#
+# %name = macro_get_names();  (key=macrohandle, value=macroname)
+#
+##local(%name);  # a static block comment
+    local (%name) = ();
+    for ( 0 .. $#mac_ver ) {
+        $name{$_} = $mac_ext[ $idx{ $mac_exti[$_] } ];
+    }
+    %name;
+}
+
 # side comments at different indentation levels should not normally be aligned
 {
     {
@@ -16,3 +30,18 @@ sub length { return length( $_[0] ) }  # side comment
 
 # some blank lines follow
 
+=pod
+Some pod before __END__ to delete with -dp
+=cut
+
+__END__
+
+
+# text following __END__, not a comment
+
+
+=pod
+Some pod after  __END__ to delete with -dp
+=cut
+
+
index 3e6da005626875121ead4a209ff937ede8d1cd16..da485912d90239818d5a7f145bf053233d38bb78 100644 (file)
@@ -1,9 +1,16 @@
-# test script for side comment and blank line flags
+#!/usr/bin/perl -w
 sub length { return length( $_[0] ) }          # side comment
                                                # hanging side comment
  # very longgggggggggggggggggggggggggggggggggggggggggggggggggggg hanging side comment
 
-# side comments at different indentation levels should not normally be aligned
+sub macro_get_names {          #
+    local (%name) = ();
+    for ( 0 .. $#mac_ver ) {
+        $name{$_} = $mac_ext[ $idx{ $mac_exti[$_] } ];
+    }
+    %name;
+}
+
 {
     {
         {
@@ -14,5 +21,12 @@ sub length { return length( $_[0] ) }          # side comment
     }          # end level 2
 }          # end level 1
 
-# some blank lines follow
+
+__END__
+
+
+# text following __END__, not a comment
+
+
+
 
index e167541af14907a973921296dd810e5a0fa2fecc..60b3059ef8f056dfa482c6c426283525fdd2c604 100644 (file)
@@ -1,8 +1,22 @@
-# test script for side comment and blank line flags
+#!/usr/bin/perl -w
+# an initial hash bang line cannot be deleted with -dp
 sub length { return length( $_[0] ) }    # side comment
                                          # hanging side comment
  # very longgggggggggggggggggggggggggggggggggggggggggggggggggggg hanging side comment
 
+# side comments following open brace are not currently treated as hanging side comments
+sub macro_get_names {    #
+    #
+    # %name = macro_get_names();  (key=macrohandle, value=macroname)
+    #
+##local(%name);  # a static block comment
+    local (%name) = ();
+    for ( 0 .. $#mac_ver ) {
+        $name{$_} = $mac_ext[ $idx{ $mac_exti[$_] } ];
+    }
+    %name;
+}
+
 
 # side comments at different indentation levels should not normally be aligned
 {
@@ -19,3 +33,19 @@ sub length { return length( $_[0] ) }    # side comment
 # some blank lines follow
 
 
+=pod
+Some pod before __END__ to delete with -dp
+=cut
+
+
+__END__
+
+
+# text following __END__, not a comment
+
+
+=pod
+Some pod after  __END__ to delete with -dp
+=cut
+
+
index d69b7d88ebdaf9793450fbbdb28e74137a493e9d..0216c3886f5dd33e81d8d20438e2366569a0ac48 100644 (file)
@@ -1,8 +1,23 @@
-# test script for side comment and blank line flags
+#!/usr/bin/perl -w
+# an initial hash bang line cannot be deleted with -dp
 sub length { return length( $_[0] ) }    # side comment
                                          # hanging side comment
  # very longgggggggggggggggggggggggggggggggggggggggggggggggggggg hanging side comment
 
+# side comments following open brace are not currently treated as hanging side comments
+sub macro_get_names {    #
+    #
+    # %name = macro_get_names();  (key=macrohandle, value=macroname)
+    #
+##local(%name);  # a static block comment
+    local (%name) = ();
+    for ( 0 .. $#mac_ver ) {
+        $name{$_} = $mac_ext[ $idx{ $mac_exti[$_] } ];
+    }
+    %name;
+}
+
+
 
 
 # side comments at different indentation levels should not normally be aligned
@@ -18,10 +33,23 @@ sub length { return length( $_[0] ) }    # side comment
 
 
 
-
 # some blank lines follow
 
 
 
+=pod
+Some pod before __END__ to delete with -dp
+=cut
+
+
+__END__
+
+
+# text following __END__, not a comment
+
+
+=pod
+Some pod after  __END__ to delete with -dp
+=cut
 
 
diff --git a/t/snippets/expect/comments.comments5 b/t/snippets/expect/comments.comments5
new file mode 100644 (file)
index 0000000..b21bbd1
--- /dev/null
@@ -0,0 +1,45 @@
+#!/usr/bin/perl -w
+# an initial hash bang line cannot be deleted with -dp
+sub length { return length( $_[0] ) }
+
+# side comments following open brace are not currently treated as hanging side comments
+sub macro_get_names {
+    #
+    # %name = macro_get_names();  (key=macrohandle, value=macroname)
+    #
+##local(%name);  # a static block comment
+    local (%name) = ();
+    for ( 0 .. $#mac_ver ) {
+        $name{$_} = $mac_ext[ $idx{ $mac_exti[$_] } ];
+    }
+    %name;
+}
+
+# side comments at different indentation levels should not normally be aligned
+{
+    {
+        {
+            {
+                { ${msg} = "Hello World!"; print "My message: ${msg}\n"; }
+            }
+        }
+    }
+}
+
+# some blank lines follow
+
+=pod
+Some pod before __END__ to delete with -dp
+=cut
+
+__END__
+
+
+# text following __END__, not a comment
+
+
+=pod
+Some pod after  __END__ to delete with -dp
+=cut
+
+
index 18d14c735a7cadde8ae06d741ee15d05becbb289..883c68b1bb8eb0d02d7c83221ec47db5bf9e021d 100644 (file)
@@ -1,8 +1,22 @@
-# test script for side comment and blank line flags
+#!/usr/bin/perl -w
+# an initial hash bang line cannot be deleted with -dp
 sub length { return length( $_[0] ) }    # side comment
                                          # hanging side comment
  # very longgggggggggggggggggggggggggggggggggggggggggggggggggggg hanging side comment
 
+# side comments following open brace are not currently treated as hanging side comments
+sub macro_get_names {    #
+    #
+    # %name = macro_get_names();  (key=macrohandle, value=macroname)
+    #
+##local(%name);  # a static block comment
+    local (%name) = ();
+    for ( 0 .. $#mac_ver ) {
+        $name{$_} = $mac_ext[ $idx{ $mac_exti[$_] } ];
+    }
+    %name;
+}
+
 # side comments at different indentation levels should not normally be aligned
 {
     {
@@ -16,3 +30,18 @@ sub length { return length( $_[0] ) }    # side comment
 
 # some blank lines follow
 
+=pod
+Some pod before __END__ to delete with -dp
+=cut
+
+__END__
+
+
+# text following __END__, not a comment
+
+
+=pod
+Some pod after  __END__ to delete with -dp
+=cut
+
+
index 818c147750adedb2bdb5f7735e282d67513d4554..776266deedae26863c5cea114486161a5e0ae07a 100644 (file)
 ../snippets16.t        rt130394.rt130394
 ../snippets16.t        git18.def
 ../snippets16.t        here2.def
+../snippets17.t        align32.def
+../snippets17.t        bos.bos
+../snippets17.t        bos.def
+../snippets17.t        comments.comments1
+../snippets17.t        comments.comments2
+../snippets17.t        comments.comments3
+../snippets17.t        comments.comments4
+../snippets17.t        comments.def
+../snippets17.t        long_line.def
+../snippets17.t        long_line.long_line
+../snippets17.t        pbp6.def
+../snippets17.t        pbp6.pbp
+../snippets17.t        rperl.def
+../snippets17.t        rperl.rperl
+../snippets17.t        rt132059.def
+../snippets17.t        rt132059.rt132059
+../snippets17.t        signature.def
+../snippets17.t        ternary4.def
+../snippets17.t        wn7.def
+../snippets18.t        wn7.wn
+../snippets18.t        wn8.def
+../snippets18.t        wn8.wn
 ../snippets2.t angle.def
 ../snippets2.t arrows1.def
 ../snippets2.t arrows2.def
 ../snippets9.t rt98902.def
 ../snippets9.t rt98902.rt98902
 ../snippets9.t rt99961.def
-../snippets17.t        align32.def
-../snippets17.t        bos.bos
-../snippets17.t        bos.def
-../snippets17.t        comments.comments1
-../snippets17.t        comments.comments2
-../snippets17.t        comments.comments3
-../snippets17.t        comments.comments4
-../snippets17.t        comments.def
-../snippets17.t        long_line.def
-../snippets17.t        long_line.long_line
-../snippets17.t        pbp6.def
-../snippets17.t        pbp6.pbp
-../snippets17.t        rperl.def
-../snippets17.t        rperl.rperl
-../snippets17.t        rt132059.def
-../snippets17.t        rt132059.rt132059
-../snippets17.t        signature.def
-../snippets17.t        ternary4.def
-../snippets17.t        wn7.def
-../snippets18.t        wn7.wn
-../snippets18.t        wn8.def
-../snippets18.t        wn8.wn
+../snippets18.t        comments.comments5
index 2fed843a7ec49483ed652a02c82e703771d779f0..c9cddd74e4580d4e09c8856f854457b92477f206 100644 (file)
@@ -38,8 +38,8 @@ BEGIN {
     ###########################################
     $rparams = {
         'bos'       => "-bos",
-        'comments1' => "-fpsc=40 -iscl",
-        'comments2' => "-msc=10",
+        'comments1' => "-fpsc=40 -iscl -nibc",
+        'comments2' => "-msc=10 -dbc -dp",
         'comments3' => "-mbl=2",
         'comments4' => "-kbl=2",
         'def'       => "",
@@ -67,11 +67,26 @@ ok IsWindow($c_sub_khwnd), 'IsWindow works on the client';
 ----------
 
         'comments' => <<'----------',
-# test script for side comment and blank line flags
+#!/usr/bin/perl -w
+# an initial hash bang line cannot be deleted with -dp
 sub length { return length($_[0]) }    # side comment
                              # hanging side comment
                              # very longgggggggggggggggggggggggggggggggggggggggggggggggggggg hanging side comment
 
+# side comments following open brace are not currently treated as hanging side comments
+sub macro_get_names { #
+# 
+# %name = macro_get_names();  (key=macrohandle, value=macroname)
+#
+##local(%name);  # a static block comment
+   local(%name)=();
+   for (0..$                                          #mac_ver) {
+      $name{$_} = $mac_ext[$idx{$mac_exti[$_]}];
+   }
+   %name;
+} 
+
+
 
 
 # side comments at different indentation levels should not normally be aligned
@@ -82,11 +97,24 @@ sub length { return length($_[0]) }    # side comment
 
 
 
-
 # some blank lines follow
 
 
 
+=pod
+Some pod before __END__ to delete with -dp
+=cut
+
+
+__END__
+
+
+# text following __END__, not a comment
+
+
+=pod
+Some pod after  __END__ to delete with -dp
+=cut
 
 
 ----------
@@ -223,11 +251,25 @@ ok IsWindow($c_sub_khwnd), 'IsWindow works on the client';
             source => "comments",
             params => "comments1",
             expect => <<'#4...........',
-# test script for side comment and blank line flags
+#!/usr/bin/perl -w
+# an initial hash bang line cannot be deleted with -dp
 sub length { return length( $_[0] ) }  # side comment
                                        # hanging side comment
                                        # very longgggggggggggggggggggggggggggggggggggggggggggggggggggg hanging side comment
 
+# side comments following open brace are not currently treated as hanging side comments
+sub macro_get_names {                  #
+#
+# %name = macro_get_names();  (key=macrohandle, value=macroname)
+#
+##local(%name);  # a static block comment
+    local (%name) = ();
+    for ( 0 .. $#mac_ver ) {
+        $name{$_} = $mac_ext[ $idx{ $mac_exti[$_] } ];
+    }
+    %name;
+}
+
 # side comments at different indentation levels should not normally be aligned
 {
     {
@@ -241,6 +283,21 @@ sub length { return length( $_[0] ) }  # side comment
 
 # some blank lines follow
 
+=pod
+Some pod before __END__ to delete with -dp
+=cut
+
+__END__
+
+
+# text following __END__, not a comment
+
+
+=pod
+Some pod after  __END__ to delete with -dp
+=cut
+
+
 #4...........
         },
 
@@ -248,12 +305,19 @@ sub length { return length( $_[0] ) }  # side comment
             source => "comments",
             params => "comments2",
             expect => <<'#5...........',
-# test script for side comment and blank line flags
+#!/usr/bin/perl -w
 sub length { return length( $_[0] ) }          # side comment
                                                # hanging side comment
  # very longgggggggggggggggggggggggggggggggggggggggggggggggggggg hanging side comment
 
-# side comments at different indentation levels should not normally be aligned
+sub macro_get_names {          #
+    local (%name) = ();
+    for ( 0 .. $#mac_ver ) {
+        $name{$_} = $mac_ext[ $idx{ $mac_exti[$_] } ];
+    }
+    %name;
+}
+
 {
     {
         {
@@ -264,7 +328,14 @@ sub length { return length( $_[0] ) }          # side comment
     }          # end level 2
 }          # end level 1
 
-# some blank lines follow
+
+__END__
+
+
+# text following __END__, not a comment
+
+
+
 
 #5...........
         },
@@ -273,11 +344,25 @@ sub length { return length( $_[0] ) }          # side comment
             source => "comments",
             params => "comments3",
             expect => <<'#6...........',
-# test script for side comment and blank line flags
+#!/usr/bin/perl -w
+# an initial hash bang line cannot be deleted with -dp
 sub length { return length( $_[0] ) }    # side comment
                                          # hanging side comment
  # very longgggggggggggggggggggggggggggggggggggggggggggggggggggg hanging side comment
 
+# side comments following open brace are not currently treated as hanging side comments
+sub macro_get_names {    #
+    #
+    # %name = macro_get_names();  (key=macrohandle, value=macroname)
+    #
+##local(%name);  # a static block comment
+    local (%name) = ();
+    for ( 0 .. $#mac_ver ) {
+        $name{$_} = $mac_ext[ $idx{ $mac_exti[$_] } ];
+    }
+    %name;
+}
+
 
 # side comments at different indentation levels should not normally be aligned
 {
@@ -294,6 +379,22 @@ sub length { return length( $_[0] ) }    # side comment
 # some blank lines follow
 
 
+=pod
+Some pod before __END__ to delete with -dp
+=cut
+
+
+__END__
+
+
+# text following __END__, not a comment
+
+
+=pod
+Some pod after  __END__ to delete with -dp
+=cut
+
+
 #6...........
         },
 
@@ -301,11 +402,26 @@ sub length { return length( $_[0] ) }    # side comment
             source => "comments",
             params => "comments4",
             expect => <<'#7...........',
-# test script for side comment and blank line flags
+#!/usr/bin/perl -w
+# an initial hash bang line cannot be deleted with -dp
 sub length { return length( $_[0] ) }    # side comment
                                          # hanging side comment
  # very longgggggggggggggggggggggggggggggggggggggggggggggggggggg hanging side comment
 
+# side comments following open brace are not currently treated as hanging side comments
+sub macro_get_names {    #
+    #
+    # %name = macro_get_names();  (key=macrohandle, value=macroname)
+    #
+##local(%name);  # a static block comment
+    local (%name) = ();
+    for ( 0 .. $#mac_ver ) {
+        $name{$_} = $mac_ext[ $idx{ $mac_exti[$_] } ];
+    }
+    %name;
+}
+
+
 
 
 # side comments at different indentation levels should not normally be aligned
@@ -321,11 +437,24 @@ sub length { return length( $_[0] ) }    # side comment
 
 
 
-
 # some blank lines follow
 
 
 
+=pod
+Some pod before __END__ to delete with -dp
+=cut
+
+
+__END__
+
+
+# text following __END__, not a comment
+
+
+=pod
+Some pod after  __END__ to delete with -dp
+=cut
 
 
 #7...........
@@ -335,11 +464,25 @@ sub length { return length( $_[0] ) }    # side comment
             source => "comments",
             params => "def",
             expect => <<'#8...........',
-# test script for side comment and blank line flags
+#!/usr/bin/perl -w
+# an initial hash bang line cannot be deleted with -dp
 sub length { return length( $_[0] ) }    # side comment
                                          # hanging side comment
  # very longgggggggggggggggggggggggggggggggggggggggggggggggggggg hanging side comment
 
+# side comments following open brace are not currently treated as hanging side comments
+sub macro_get_names {    #
+    #
+    # %name = macro_get_names();  (key=macrohandle, value=macroname)
+    #
+##local(%name);  # a static block comment
+    local (%name) = ();
+    for ( 0 .. $#mac_ver ) {
+        $name{$_} = $mac_ext[ $idx{ $mac_exti[$_] } ];
+    }
+    %name;
+}
+
 # side comments at different indentation levels should not normally be aligned
 {
     {
@@ -353,6 +496,21 @@ sub length { return length( $_[0] ) }    # side comment
 
 # some blank lines follow
 
+=pod
+Some pod before __END__ to delete with -dp
+=cut
+
+__END__
+
+
+# text following __END__, not a comment
+
+
+=pod
+Some pod after  __END__ to delete with -dp
+=cut
+
+
 #8...........
         },
 
index b4b606e3074657b8537a956d3c3e654bafb6b42d..30d7ae354e857de56c6a793447cb7f3cfa077ee3 100644 (file)
@@ -4,6 +4,7 @@
 #1 wn7.wn
 #2 wn8.def
 #3 wn8.wn
+#4 comments.comments5
 
 # To locate test #13 you can search for its name or the string '#13'
 
@@ -21,8 +22,9 @@ BEGIN {
     # BEGIN SECTION 1: Parameter combinations #
     ###########################################
     $rparams = {
-        'def' => "",
-        'wn'  => "-wn",
+        'comments5' => "-dsc",
+        'def'       => "",
+        'wn'        => "-wn",
     };
 
     ############################
@@ -30,6 +32,59 @@ BEGIN {
     ############################
     $rsources = {
 
+        'comments' => <<'----------',
+#!/usr/bin/perl -w
+# an initial hash bang line cannot be deleted with -dp
+sub length { return length($_[0]) }    # side comment
+                             # hanging side comment
+                             # very longgggggggggggggggggggggggggggggggggggggggggggggggggggg hanging side comment
+
+# side comments following open brace are not currently treated as hanging side comments
+sub macro_get_names { #
+# 
+# %name = macro_get_names();  (key=macrohandle, value=macroname)
+#
+##local(%name);  # a static block comment
+   local(%name)=();
+   for (0..$                                          #mac_ver) {
+      $name{$_} = $mac_ext[$idx{$mac_exti[$_]}];
+   }
+   %name;
+} 
+
+
+
+
+# side comments at different indentation levels should not normally be aligned
+{ { { { { ${msg} = "Hello World!"; print "My message: ${msg}\n"; } } #end level 4
+        } # end level 3
+    } # end level 2
+} # end level 1
+
+
+
+# some blank lines follow
+
+
+
+=pod
+Some pod before __END__ to delete with -dp
+=cut
+
+
+__END__
+
+
+# text following __END__, not a comment
+
+
+=pod
+Some pod after  __END__ to delete with -dp
+=cut
+
+
+----------
+
         'wn7' => <<'----------',
                     # do not weld paren to opening one-line non-paren container
                     $Self->_Add($SortOrderDisplay{$Field->GenerateFieldForSelectSQL()});
@@ -133,6 +188,58 @@ BEGIN {
                 "Cannot delete zone $name: sub-zones or appellations exist.") );
 #3...........
         },
+
+        'comments.comments5' => {
+            source => "comments",
+            params => "comments5",
+            expect => <<'#4...........',
+#!/usr/bin/perl -w
+# an initial hash bang line cannot be deleted with -dp
+sub length { return length( $_[0] ) }
+
+# side comments following open brace are not currently treated as hanging side comments
+sub macro_get_names {
+    #
+    # %name = macro_get_names();  (key=macrohandle, value=macroname)
+    #
+##local(%name);  # a static block comment
+    local (%name) = ();
+    for ( 0 .. $#mac_ver ) {
+        $name{$_} = $mac_ext[ $idx{ $mac_exti[$_] } ];
+    }
+    %name;
+}
+
+# side comments at different indentation levels should not normally be aligned
+{
+    {
+        {
+            {
+                { ${msg} = "Hello World!"; print "My message: ${msg}\n"; }
+            }
+        }
+    }
+}
+
+# some blank lines follow
+
+=pod
+Some pod before __END__ to delete with -dp
+=cut
+
+__END__
+
+
+# text following __END__, not a comment
+
+
+=pod
+Some pod after  __END__ to delete with -dp
+=cut
+
+
+#4...........
+        },
     };
 
     my $ntests = 0 + keys %{$rtests};