fix: ef parsing for large numbers

lbressler13 · Feb 20, 2024 · 7cf68f2 · 7cf68f2
1 parent 814cec0
commit 7cf68f2
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 126 deletions.
diff --git a/exact-numbers/build.gradle.kts b/exact-numbers/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "xyz.lbres"
-version = "1.0.1"
+version = "1.0.2"
 
 val githubUsername: String? = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
 val githubPassword: String? = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN")

diff --git a/exact-numbers/src/main/kotlin/xyz/lbres/exactnumbers/exactfraction/exactFractionParsing.kt b/exact-numbers/src/main/kotlin/xyz/lbres/exactnumbers/exactfraction/exactFractionParsing.kt
@@ -2,7 +2,6 @@ package xyz.lbres.exactnumbers.exactfraction
 
 import xyz.lbres.kotlinutils.general.simpleIf
 import xyz.lbres.kotlinutils.general.succeeds
-import xyz.lbres.kotlinutils.string.ext.isInt
 import java.math.BigDecimal
 import java.math.BigInteger
 
@@ -87,5 +86,5 @@ internal fun checkIsEFString(s: String): Boolean {
     }
 
     val numbers = trimmed.substring(efPrefix.length, s.length - efSuffix.length).split(' ')
-    return numbers.size == 2 && numbers[0].isInt() && numbers[1].isInt()
+    return numbers.size == 2 && succeeds { BigInteger(numbers[0]) } && succeeds { BigInteger(numbers[1]) }
 }
diff --git a/...ers/src/test/kotlin/xyz/lbres/exactnumbers/exactfraction/ExactFractionConstructorsTest.kt b/...ers/src/test/kotlin/xyz/lbres/exactnumbers/exactfraction/ExactFractionConstructorsTest.kt
@@ -26,6 +26,11 @@ class ExactFractionConstructorsTest {
         assertEquals(BigInteger("-7"), ef.numerator)
         assertEquals(BigInteger("3"), ef.denominator)
 
+        // large value
+        ef = ExactFraction("4444444444444444444444444444444444444444444")
+        assertEquals(BigInteger("4444444444444444444444444444444444444444444"), ef.numerator)
+        assertEquals(BigInteger.ONE, ef.denominator)
+
         // invalid
         assertFailsWithMessage<NumberFormatException>("Error parsing []") { ExactFraction("[]") }
     }

diff --git a/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/exactfraction/constructorTests.kt b/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/exactfraction/constructorTests.kt
diff --git a/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/exactfraction/stringTests.kt b/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/exactfraction/stringTests.kt
@@ -95,6 +95,10 @@ fun runParseDecimalTests() {
     expected = ExactFraction(BigInteger(n), BigInteger(d))
     assertEquals(expected, parseDecimal(s))
 
+    s = "4444444444444444444444444444444444444444444"
+    expected = ExactFraction(BigInteger(s), 1)
+    assertEquals(expected, parseDecimal(s))
+
     // e-notation
     s = "3.90E-3" // 0.00390
     expected = ExactFraction(39, 10000)
@@ -177,6 +181,10 @@ fun runParseEFStringTests() {
     expected = ExactFraction(-17, 29)
     assertEquals(expected, parseEFString(s))
 
+    s = "EF[4444444444444444444444444444444444444444444 1]"
+    expected = ExactFraction(BigInteger("4444444444444444444444444444444444444444444"), 1)
+    assertEquals(expected, parseEFString(s))
+
     // errors
     s = "EF[1 0]"
     assertDivByZero { parseEFString(s) }

diff --git a/signatures/v1.0.0/v1.0.0.md b/signatures/v1.0.0/v1.0.0.md
@@ -1,4 +1,4 @@
-*Versions: v1.0.0, v1.0.1*
+*Versions: v1.0.0, v1.0.1, v1.0.2*
 
 ### xyz.lbres.exactnumbers.exactfraction