added test case for RPerl

diff --git a/lib/Perl/Tidy.pm b/lib/Perl/Tidy.pm
index 49583b2472e3b6c9da372762b3f0085bc3d5a32a..d9433dffe51db8196df8ab2f1aec0bc38d505c7c 100644 (file)
--- a/lib/Perl/Tidy.pm
+++ b/lib/Perl/Tidy.pm
@@ -970,10 +970,6 @@ EOM
         # Case 4. Decode with a specific encoding
         else {
             $encoding_in = $rOpts_character_encoding;
-
-            # a string or string ref passed to by a module call may or
-            # may not have already been decoded, so we have to be careful
-            # not to try to do it again.
             eval {
                 $buf = Encode::decode( $encoding_in, $buf,
                     Encode::FB_CROAK | Encode::LEAVE_SRC );
@@ -983,7 +979,7 @@ EOM
                 # Quit if we cannot decode by the requested encoding;
                 # Something is not right.
                 Warn(
-"skipping file: $input_file: Unable to decode source as $encoding_in\n"
+"skipping file: $display_name: Unable to decode source as $encoding_in\n"
                 );
                 next;
             }

diff --git a/t/snippets/expect/rperl.def b/t/snippets/expect/rperl.def
new file mode 100644 (file)
index 0000000..82092f5
--- /dev/null
+++ b/t/snippets/expect/rperl.def
@@ -0,0 +1,18 @@
+# Some test cases for RPerl, https://github.com/wbraswell/rperl/
+# These must not remain as single lines with default formatting and long lines
+sub multiply_return_F {
+    { my number $RETURN_TYPE };
+    ( my integer $multiplicand, my number $multiplier ) = @ARG;
+    return $multiplicand * $multiplier;
+}
+
+sub empty_method {
+    { my void::method $RETURN_TYPE };
+    return 2;
+}
+
+sub foo_subroutine_in_main {
+    { my void $RETURN_TYPE };
+    print 'Howdy from foo_subroutine_in_main()...', "\n";
+    return;
+}

diff --git a/t/snippets/expect/rperl.rperl b/t/snippets/expect/rperl.rperl
new file mode 100644 (file)
index 0000000..82092f5
--- /dev/null
+++ b/t/snippets/expect/rperl.rperl
@@ -0,0 +1,18 @@
+# Some test cases for RPerl, https://github.com/wbraswell/rperl/
+# These must not remain as single lines with default formatting and long lines
+sub multiply_return_F {
+    { my number $RETURN_TYPE };
+    ( my integer $multiplicand, my number $multiplier ) = @ARG;
+    return $multiplicand * $multiplier;
+}
+
+sub empty_method {
+    { my void::method $RETURN_TYPE };
+    return 2;
+}
+
+sub foo_subroutine_in_main {
+    { my void $RETURN_TYPE };
+    print 'Howdy from foo_subroutine_in_main()...', "\n";
+    return;
+}

diff --git a/t/snippets/packing_list.txt b/t/snippets/packing_list.txt
index 47ac806e6195570a5832e9fc7db262c065b5103e..c9b77898beee03ad0833eeb5f631c465da5d3b3c 100644 (file)
--- a/t/snippets/packing_list.txt
+++ b/t/snippets/packing_list.txt
@@ -158,6 +158,8 @@
 ../snippets17.t        rt132059.def
 ../snippets17.t        rt132059.rt132059
 ../snippets17.t        signature.def
+../snippets17.t        rperl.def
+../snippets17.t        rperl.rperl
 ../snippets2.t angle.def
 ../snippets2.t arrows1.def
 ../snippets2.t arrows2.def

diff --git a/t/snippets/rperl.in b/t/snippets/rperl.in
new file mode 100644 (file)
index 0000000..1a44b9d
--- /dev/null
+++ b/t/snippets/rperl.in
@@ -0,0 +1,7 @@
+# Some test cases for RPerl, https://github.com/wbraswell/rperl/
+# These must not remain as single lines with default formatting and long lines
+sub multiply_return_F { { my number $RETURN_TYPE }; ( my integer $multiplicand, my number $multiplier ) = @ARG; return $multiplicand * $multiplier; }
+
+sub empty_method { { my void::method $RETURN_TYPE }; return 2; }
+
+sub foo_subroutine_in_main { { my void $RETURN_TYPE }; print 'Howdy from foo_subroutine_in_main()...', "\n"; return; }

diff --git a/t/snippets/rperl.par b/t/snippets/rperl.par
new file mode 100644 (file)
index 0000000..7e615cc
--- /dev/null
+++ b/t/snippets/rperl.par
@@ -0,0 +1 @@
+-l=0

diff --git a/t/snippets17.t b/t/snippets17.t
index 61a73748c948941ccb5739858294047526559a11..c64b603a7c3d302eaa4a915fafa0a2051f55b940 100644 (file)
--- a/t/snippets17.t
+++ b/t/snippets17.t
@@ -4,6 +4,8 @@
 #1 rt132059.def
 #2 rt132059.rt132059
 #3 signature.def
+#4 rperl.def
+#5 rperl.rperl
 
 # To locate test #13 you can search for its name or the string '#13'
 
@@ -22,6 +24,7 @@ BEGIN {
     ###########################################
     $rparams = {
         'def'      => "",
+        'rperl'    => "-l=0",
         'rt132059' => "-dac",
     };
 
@@ -30,6 +33,16 @@ BEGIN {
     ############################
     $rsources = {
 
+        'rperl' => <<'----------',
+# Some test cases for RPerl, https://github.com/wbraswell/rperl/
+# These must not remain as single lines with default formatting and long lines
+sub multiply_return_F { { my number $RETURN_TYPE }; ( my integer $multiplicand, my number $multiplier ) = @ARG; return $multiplicand * $multiplier; }
+
+sub empty_method { { my void::method $RETURN_TYPE }; return 2; }
+
+sub foo_subroutine_in_main { { my void $RETURN_TYPE }; print 'Howdy from foo_subroutine_in_main()...', "\n"; return; }
+----------
+
         'rt132059' => <<'----------',
 # Test deleting comments and pod
 $1=2;
@@ -139,6 +152,56 @@ my $subref = sub ( $cat, $id = do { state $auto_id = 0; $auto_id++ } ) {
 };
 #3...........
         },
+
+        'rperl.def' => {
+            source => "rperl",
+            params => "def",
+            expect => <<'#4...........',
+# Some test cases for RPerl, https://github.com/wbraswell/rperl/
+# These must not remain as single lines with default formatting and long lines
+sub multiply_return_F {
+    { my number $RETURN_TYPE };
+    ( my integer $multiplicand, my number $multiplier ) = @ARG;
+    return $multiplicand * $multiplier;
+}
+
+sub empty_method {
+    { my void::method $RETURN_TYPE };
+    return 2;
+}
+
+sub foo_subroutine_in_main {
+    { my void $RETURN_TYPE };
+    print 'Howdy from foo_subroutine_in_main()...', "\n";
+    return;
+}
+#4...........
+        },
+
+        'rperl.rperl' => {
+            source => "rperl",
+            params => "rperl",
+            expect => <<'#5...........',
+# Some test cases for RPerl, https://github.com/wbraswell/rperl/
+# These must not remain as single lines with default formatting and long lines
+sub multiply_return_F {
+    { my number $RETURN_TYPE };
+    ( my integer $multiplicand, my number $multiplier ) = @ARG;
+    return $multiplicand * $multiplier;
+}
+
+sub empty_method {
+    { my void::method $RETURN_TYPE };
+    return 2;
+}
+
+sub foo_subroutine_in_main {
+    { my void $RETURN_TYPE };
+    print 'Howdy from foo_subroutine_in_main()...', "\n";
+    return;
+}
+#5...........
+        },
     };
 
     my $ntests = 0 + keys %{$rtests};