* demos/perl/GMP/Mpf.pm (overload_string): Corrections to $# usage.

1 files changed, 10 insertions, 7 deletions

diff --git a/demos/perl/GMP/Mpf.pm b/demos/perl/GMP/Mpf.pm
index 308457bd5..efa0a0a7b 100644
--- a/demos/perl/GMP/Mpf.pm
+++ b/demos/perl/GMP/Mpf.pm
@@ -73,15 +73,18 @@ sub import {
 
 sub overload_string {
   my $fmt;
-  if (! defined $OFMT) {
-    $fmt = '%.Fg';
-  } else {
+  no warnings;
+  if (defined ($#)) {
+    $fmt = $#;
+    use warnings;
     # protect against calling sprintf_internal with a bad format
-    if ($OFMT !~ /^(%%|[^%])*%[-+ .\d]*[eEfgG](%%|[^%])*$/) {
-      die "GMP::Mpf: invalid \$# format: $OFMT\n";
+    if ($fmt !~ /^((%%|[^%])*%[-+ .\d]*)([eEfgG](%%|[^%])*)$/) {
+      die "GMP::Mpf: invalid \$# format: $#\n";
     }
-    $fmt = $OFMT;
-    $fmt =~ s/(.)$/F$1/;
+    $fmt = $1 . 'F' . $3;
+  } else {
+    use warnings;
+    $fmt = '%.Fg';
   }
   GMP::sprintf_internal ($fmt, $_[0]);
 }