Math::Complex: fix more parsing corner cases

In particular, '23i' now parses as 0 + 23i, not 2 + 3i. Also handle
'inf', '-inf', 'infi', and '-infi' correctly.

Author: mauke

dist/Math-Complex/lib/Math/Complex.pm

@@ -112,7 +112,7 @@ my %LOGN;
 
 # Regular expression for floating point numbers.
 # These days we could use Scalar::Util::lln(), I guess.
-my $gre = qr'\s*([\+\-]?(?:(?:(?:\d+(?:_\d+)*(?:\.\d*(?:_\d+)*)?|\.\d+(?:_\d+)*)(?:[eE][\+\-]?\d+(?:_\d+)*)?))|inf)'i;
+my $gre = qr'\s*([\+\-]?(?:(?:(?:\d+(?:_\d+)*(?:\.\d*(?:_\d+)*)?|\.\d+(?:_\d+)*)(?:[eE][\+\-]?\d+(?:_\d+)*)?)|inf))'i;
 
 require Exporter;
 
@@ -196,25 +196,31 @@ sub _cannot_make {
     die "@{[(caller(1))[3]]}: Cannot take $_[0] of '$_[1]'.\n";
 }
 
+sub _normalize_num {
+    my $x = shift;
+    $x =~ s/^\+//;
+    $x =~ s/_//g;
+    $x =~ s/^(-?)inf$/$1 ? -Inf() : Inf()/ie if $has_inf;
+    return $x;
+}
+
 sub _make {
     my $arg = shift;
     my ($p, $q);
 
     if ($arg =~ /^$gre$/) {
 	($p, $q) = ($1, 0);
-    } elsif ($arg =~ /^(?:$gre)?$gre\s*i\s*$/) {
+    } elsif ($arg =~ /^(?:$gre(?=\s*[+\-]))?$gre\s*i\s*$/) {
 	($p, $q) = ($1 || 0, $2);
-    } elsif ($arg =~ /^(?:$gre)?\s*([+\-]?)i\s*$/) {
+    } elsif ($arg =~ /^(?:$gre(?=\s*[+\-]))?\s*([+\-]?)i\s*$/) {
         ($p, $q) = ($1 || 0, $2 . '1');
     } elsif ($arg =~ /^\s*\($gre\s*(?:,$gre\s*)?\)\s*$/) {
 	($p, $q) = ($1, $2 || 0);
     }
 
     if (defined $p) {
-	$p =~ s/^\+//;
-	$p =~ s/^(-?)inf$/"${1}9**9**9"/e if $has_inf;
-	$q =~ s/^\+//;
-	$q =~ s/^(-?)inf$/"${1}9**9**9"/e if $has_inf;
+	$p = _normalize_num $p;
+	$q = _normalize_num $q;
     }
 
     return ($p, $q);
@@ -235,10 +241,8 @@ sub _emake {
     }
 
     if (defined $p) {
-	$p =~ s/^\+//;
-	$q =~ s/^\+//;
-	$p =~ s/^(-?)inf$/"${1}9**9**9"/e if $has_inf;
-	$q =~ s/^(-?)inf$/"${1}9**9**9"/e if $has_inf;
+        $p = _normalize_num $p;
+        $q = _normalize_num $q;
     }
 
     return ($p, $q);

dist/Math-Complex/t/Complex.t

@@ -347,6 +347,22 @@ EOS
     print "ok $test\n";
 EOS
 
+    $test++;
+    push @script, <<EOS;
+    print "# make 23i\n";
+    \$z = Math::Complex->make('23i');
+    print "not " unless \$z == cplx(0,23);
+    print "ok $test\n";
+EOS
+
+    $test++;
+    push @script, <<EOS;
+    print "# make i\n";
+    \$z = Math::Complex->make('i');
+    print "not " unless \$z == cplx(0,1);
+    print "ok $test\n";
+EOS
+
     $test++;
     push @script, <<EOS;
     print "# remake 2+i\n";
@@ -363,6 +379,48 @@ EOS
     print "ok $test\n";
 EOS
 
+    if ($has_inf) {
+        $test++;
+        push @script, <<EOS;
+        print "# make inf\n";
+        \$z = Math::Complex->make('inf');
+        print "not " unless \$z == cplx(\$inf, 0);
+        print "ok $test\n";
+EOS
+
+        $test++;
+        push @script, <<EOS;
+        print "# make -inf\n";
+        \$z = Math::Complex->make('-inf');
+        print "not " unless \$z == cplx(-\$inf, 0);
+        print "ok $test\n";
+EOS
+
+        $test++;
+        push @script, <<EOS;
+        print "# make infi\n";
+        \$z = Math::Complex->make('infi');
+        print "not " unless \$z == cplx(0, \$inf);
+        print "ok $test\n";
+EOS
+
+        $test++;
+        push @script, <<EOS;
+        print "# make -infi\n";
+        \$z = Math::Complex->make('-infi');
+        print "not " unless \$z == cplx(0, -\$inf);
+        print "ok $test\n";
+EOS
+
+        $test++;
+        push @script, <<EOS;
+        print "# make -infi\n";
+        \$z = Math::Complex->make('inf+infi');
+        print "not " unless \$z == cplx(\$inf, \$inf);
+        print "ok $test\n";
+EOS
+    }
+
     $test++;
     push @script, <<EOS;
     print "# emake [2,3]\n";