Removed LiteralInt but kept the _encode_underscoresfunction.

Author: nedtwigg

python/selfie-lib/selfie_lib/Literals.py

@@ -44,36 +44,22 @@ def parse(self, string: str, language: Language) -> T:
 PADDING_SIZE = len(str(MAX_RAW_NUMBER)) - 1
 
 
-class LiteralInt(LiteralFormat[int]):
-    def _encode_underscores(
-        self, buffer: io.StringIO, value: int, language: Language
-    ) -> io.StringIO:
-        if value >= MAX_RAW_NUMBER:
-            mod = value % MAX_RAW_NUMBER
-            left_padding = PADDING_SIZE - len(str(mod))
-            self._encode_underscores(buffer, value // MAX_RAW_NUMBER, language)
-            buffer.write("_")
-            buffer.write("0" * left_padding)
-            buffer.write(str(mod))
-            return buffer
-        elif value < 0:
-            buffer.write("-")
-            self._encode_underscores(buffer, abs(value), language)
-            return buffer
-        else:
-            buffer.write(str(value))
-            return buffer
-
-    def encode(
-        self,
-        value: int,
-        language: Language,
-        encoding_policy: EscapeLeadingWhitespace,  # noqa: ARG002
-    ) -> str:
-        return self._encode_underscores(io.StringIO(), value, language).getvalue()
-
-    def parse(self, string: str, language: Language) -> int:  # noqa: ARG002
-        return int(string.replace("_", ""))
+def _encode_int_underscores(buffer: io.StringIO, value: int) -> str:
+    if value >= MAX_RAW_NUMBER:
+        mod = value % MAX_RAW_NUMBER
+        left_padding = PADDING_SIZE - len(str(mod))
+        _encode_int_underscores(buffer, value // MAX_RAW_NUMBER)
+        buffer.write("_")
+        buffer.write("0" * left_padding)
+        buffer.write(str(mod))
+        return buffer.getvalue()
+    elif value < 0:
+        buffer.write("-")
+        _encode_int_underscores(buffer, abs(value))
+        return buffer.getvalue()
+    else:
+        buffer.write(str(value))
+        return buffer.getvalue()
 
 
 TRIPLE_QUOTE = '"""'
@@ -252,10 +238,13 @@ def handle_escape_sequences(line: str) -> str:
 
 class LiteralRepr(LiteralFormat[Any]):
     def encode(
-        self, value: Any, language: Language, encoding_policy: EscapeLeadingWhitespace
+        self,
+        value: Any,
+        language: Language,  # noqa: ARG002
+        encoding_policy: EscapeLeadingWhitespace,  # noqa: ARG002
     ) -> str:
         if isinstance(value, int):
-            return LiteralInt().encode(value, language, encoding_policy)
+            return _encode_int_underscores(io.StringIO(), value)
         else:
             return repr(value)
 

python/selfie-lib/tests/LiteralInt_test.py

@@ -1,17 +1,11 @@
-from selfie_lib.EscapeLeadingWhitespace import EscapeLeadingWhitespace
-from selfie_lib.Literals import Language, LiteralInt
+import io
 
-
-def _encode(value: int, expected: str):
-    literal_int = LiteralInt()
-    actual = literal_int.encode(value, Language.PYTHON, EscapeLeadingWhitespace.NEVER)
-    assert actual == expected, f"Expected '{expected}', but got '{actual}'"
+from selfie_lib.Literals import _encode_int_underscores
 
 
-def _decode(value: str, expected: int):
-    literal_int = LiteralInt()
-    actual = literal_int.parse(value, Language.PYTHON)
-    assert actual == expected, f"Expected '{expected}', but got '{actual}'"
+def _encode(value: int, expected: str):
+    actual = _encode_int_underscores(io.StringIO(), value)
+    assert actual == expected
 
 
 class TestLiteralInt:
@@ -35,18 +29,3 @@ def test_encode(self):
         ]
         for value, expected in test_cases:
             _encode(value, expected)
-
-    def test_decode(self):
-        test_cases = [
-            ("0", 0),
-            ("1", 1),
-            ("-1", -1),
-            ("999", 999),
-            ("9_99", 999),
-            ("9_9_9", 999),
-            ("-999", -999),
-            ("-9_99", -999),
-            ("-9_9_9", -999),
-        ]
-        for value, expected in test_cases:
-            _decode(value, expected)