From cd2f4403d34a8138893a6ad353ab1fc985d8bfe8 Mon Sep 17 00:00:00 2001
From: Dave Hall <dave@etianen.com>
Date: Sat, 20 Jan 2024 17:17:17 +0000
Subject: [PATCH 1/4] wip

---
 logot/_match.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/logot/_match.py b/logot/_match.py
index e5118eed..93e215af 100644
--- a/logot/_match.py
+++ b/logot/_match.py
@@ -7,7 +7,7 @@
 
 # Mapping of conversion types to regex matchers.
 _CONVERSION_INT = r"\-?\d+"
-_CONVERSION_STR = r".*"
+_CONVERSION_STR = r".*?"
 _CONVERSION_MAP = {
     # Integer conversion.
     "d": _CONVERSION_INT,
@@ -17,12 +17,12 @@
     "x": r"\-?[\da-f]+",
     "X": r"\-?[\dA-F]+",
     # Float conversion.
-    "e": r"\-?(?:\d+.\d+e[\-\+]+\d{2,3}|inf|nan)",
-    "E": r"\-?(?:\d+.\d+E[\-\+]+\d{2,3}|INF|NAN)",
+    "e": r"\-?(?:\d+.\d+e[\-\+]?\d{2,3}|inf|nan)",
+    "E": r"\-?(?:\d+.\d+E[\-\+]?\d{2,3}|INF|NAN)",
     "f": r"\-?(?:\d+.\d+|inf|nan)",
     "F": r"\-?(?:\d+.\d+|INF|NAN)",
-    "g": r"\-?(?:\d+(?:.\d+|)(?:e[\-\+]+\d{2,3}|)|inf|nan)",
-    "G": r"\-?(?:\d+(?:.\d+|)(?:E[\-\+]+\d{2,3}|)|INF|NAN)",
+    "g": r"\-?(?:\d+(?:.\d+|)(?:e[\-\+]?\d{2,3}|)|inf|nan)",
+    "G": r"\-?(?:\d+(?:.\d+|)(?:E[\-\+]?\d{2,3}|)|INF|NAN)",
     # Character conversion.
     "c": r".",
     # String conversion.

From 2359581660cab90a2e8b26738b1d07af220ea4f8 Mon Sep 17 00:00:00 2001
From: Dave Hall <dave@etianen.com>
Date: Sat, 20 Jan 2024 17:18:34 +0000
Subject: [PATCH 2/4] wip

---
 logot/_match.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/logot/_match.py b/logot/_match.py
index 93e215af..1e52513b 100644
--- a/logot/_match.py
+++ b/logot/_match.py
@@ -21,8 +21,8 @@
     "E": r"\-?(?:\d+.\d+E[\-\+]?\d{2,3}|INF|NAN)",
     "f": r"\-?(?:\d+.\d+|inf|nan)",
     "F": r"\-?(?:\d+.\d+|INF|NAN)",
-    "g": r"\-?(?:\d+(?:.\d+|)(?:e[\-\+]?\d{2,3}|)|inf|nan)",
-    "G": r"\-?(?:\d+(?:.\d+|)(?:E[\-\+]?\d{2,3}|)|INF|NAN)",
+    "g": r"\-?(?:\d+(?:.\d+)?(?:e[\-\+]?\d{2,3})?|inf|nan)",
+    "G": r"\-?(?:\d+(?:.\d+)?(?:E[\-\+]?\d{2,3})?|INF|NAN)",
     # Character conversion.
     "c": r".",
     # String conversion.

From dc3baa854d352b46370af3a728ac8bb622411c5a Mon Sep 17 00:00:00 2001
From: Dave Hall <dave@etianen.com>
Date: Sat, 20 Jan 2024 17:21:11 +0000
Subject: [PATCH 3/4] wip

---
 logot/_match.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/logot/_match.py b/logot/_match.py
index 1e52513b..9e7d9297 100644
--- a/logot/_match.py
+++ b/logot/_match.py
@@ -17,12 +17,12 @@
     "x": r"\-?[\da-f]+",
     "X": r"\-?[\dA-F]+",
     # Float conversion.
-    "e": r"\-?(?:\d+.\d+e[\-\+]?\d{2,3}|inf|nan)",
-    "E": r"\-?(?:\d+.\d+E[\-\+]?\d{2,3}|INF|NAN)",
+    "e": r"\-?(?:\d+.\d+e[\-\+]\d{2,3}|inf|nan)",
+    "E": r"\-?(?:\d+.\d+E[\-\+]\d{2,3}|INF|NAN)",
     "f": r"\-?(?:\d+.\d+|inf|nan)",
     "F": r"\-?(?:\d+.\d+|INF|NAN)",
-    "g": r"\-?(?:\d+(?:.\d+)?(?:e[\-\+]?\d{2,3})?|inf|nan)",
-    "G": r"\-?(?:\d+(?:.\d+)?(?:E[\-\+]?\d{2,3})?|INF|NAN)",
+    "g": r"\-?(?:\d+(?:.\d+)?(?:e[\-\+]\d{2,3})?|inf|nan)",
+    "G": r"\-?(?:\d+(?:.\d+)?(?:E[\-\+]\d{2,3})?|INF|NAN)",
     # Character conversion.
     "c": r".",
     # String conversion.

From 38cd7e5a5af09aeca85f21f473941fb395391367 Mon Sep 17 00:00:00 2001
From: Dave Hall <dave@etianen.com>
Date: Sat, 20 Jan 2024 17:22:41 +0000
Subject: [PATCH 4/4] wip

---
 logot/_match.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/logot/_match.py b/logot/_match.py
index 9e7d9297..b4c032c8 100644
--- a/logot/_match.py
+++ b/logot/_match.py
@@ -17,12 +17,12 @@
     "x": r"\-?[\da-f]+",
     "X": r"\-?[\dA-F]+",
     # Float conversion.
-    "e": r"\-?(?:\d+.\d+e[\-\+]\d{2,3}|inf|nan)",
-    "E": r"\-?(?:\d+.\d+E[\-\+]\d{2,3}|INF|NAN)",
-    "f": r"\-?(?:\d+.\d+|inf|nan)",
-    "F": r"\-?(?:\d+.\d+|INF|NAN)",
-    "g": r"\-?(?:\d+(?:.\d+)?(?:e[\-\+]\d{2,3})?|inf|nan)",
-    "G": r"\-?(?:\d+(?:.\d+)?(?:E[\-\+]\d{2,3})?|INF|NAN)",
+    "e": r"\-?(?:\d+\.\d+e[\-\+]\d{2,3}|inf|nan)",
+    "E": r"\-?(?:\d+\.\d+E[\-\+]\d{2,3}|INF|NAN)",
+    "f": r"\-?(?:\d+\.\d+|inf|nan)",
+    "F": r"\-?(?:\d+\.\d+|INF|NAN)",
+    "g": r"\-?(?:\d+(?:\.\d+)?(?:e[\-\+]\d{2,3})?|inf|nan)",
+    "G": r"\-?(?:\d+(?:\.\d+)?(?:E[\-\+]\d{2,3})?|INF|NAN)",
     # Character conversion.
     "c": r".",
     # String conversion.