diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Math/BigInt.pm | 24 | ||||
| -rw-r--r-- | lib/bigint.pl | 24 |
2 files changed, 34 insertions, 14 deletions
diff --git a/lib/Math/BigInt.pm b/lib/Math/BigInt.pm index 68856aea6e..a4d8b6bd18 100644 --- a/lib/Math/BigInt.pm +++ b/lib/Math/BigInt.pm @@ -106,13 +106,23 @@ sub bcmp { #(num_str, num_str) return cond_code sub cmp { # post-normalized compare for internal use local($cx, $cy) = @_; - $cx cmp $cy - && - ( - ord($cy) <=> ord($cx) - || - ($cx cmp ',') * (length($cy) <=> length($cx) || $cy cmp $cx) - ); + + return 0 if ($cx eq $cy); + + local($sx, $sy) = (substr($cx, 0, 1), substr($cy, 0, 1)); + local($ld); + + if ($sx eq '+') { + return 1 if ($sy eq '-' || $cy eq '+0'); + $ld = length($cx) - length($cy); + return $ld if ($ld); + return $cx cmp $cy; + } else { # $sx eq '-' + return -1 if ($sy eq '+'); + $ld = length($cy) - length($cx); + return $ld if ($ld); + return $cy cmp $cx; + } } sub badd { #(num_str, num_str) return num_str diff --git a/lib/bigint.pl b/lib/bigint.pl index e6ba644e3b..a274736e44 100644 --- a/lib/bigint.pl +++ b/lib/bigint.pl @@ -103,13 +103,23 @@ sub main'bcmp { #(num_str, num_str) return cond_code sub cmp { # post-normalized compare for internal use local($cx, $cy) = @_; - $cx cmp $cy - && - ( - ord($cy) <=> ord($cx) - || - ($cx cmp ',') * (length($cy) <=> length($cx) || $cy cmp $cx) - ); + return 0 if ($cx eq $cy); + + local($sx, $sy) = (substr($cx, 0, 1), substr($cy, 0, 1)); + local($ld); + + if ($sx eq '+') { + return 1 if ($sy eq '-' || $cy eq '+0'); + $ld = length($cx) - length($cy); + return $ld if ($ld); + return $cx cmp $cy; + } else { # $sx eq '-' + return -1 if ($sy eq '+'); + $ld = length($cy) - length($cx); + return $ld if ($ld); + return $cy cmp $cx; + } + } sub main'badd { #(num_str, num_str) return num_str |