From a2c081f219543dd9d316e12929f609e0bf4f543a Mon Sep 17 00:00:00 2001 From: apio Date: Mon, 19 Jun 2023 00:58:02 +0200 Subject: [PATCH] libluna: Allow passing a base to scan_(un)signed_integer() --- libluna/include/luna/NumberParsing.h | 4 ++-- libluna/src/NumberParsing.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libluna/include/luna/NumberParsing.h b/libluna/include/luna/NumberParsing.h index ca00841c..85ddf9a3 100644 --- a/libluna/include/luna/NumberParsing.h +++ b/libluna/include/luna/NumberParsing.h @@ -2,10 +2,10 @@ #include // Parse an unsigned integer and advance *str to point to the first non-digit character after the number. -usize scan_unsigned_integer(const char** str); +usize scan_unsigned_integer(const char** str, int base = 10); // Parse a signed integer and advance *str to point to the first non-digit character after the number. -isize scan_signed_integer(const char** str); +isize scan_signed_integer(const char** str, int base = 10); // Parse an unsigned integer, similar to strtoull(). usize parse_unsigned_integer(const char* str, const char** endptr, int base); diff --git a/libluna/src/NumberParsing.cpp b/libluna/src/NumberParsing.cpp index b9345452..7d3855eb 100644 --- a/libluna/src/NumberParsing.cpp +++ b/libluna/src/NumberParsing.cpp @@ -89,12 +89,12 @@ isize parse_signed_integer(const char* str, const char** endptr, int base) return negative ? -(isize)rc : (isize)rc; } -usize scan_unsigned_integer(const char** str) +usize scan_unsigned_integer(const char** str, int base) { - return parse_unsigned_integer(*str, str, 10); + return parse_unsigned_integer(*str, str, base); } -isize scan_signed_integer(const char** str) +isize scan_signed_integer(const char** str, int base) { - return parse_signed_integer(*str, str, 10); + return parse_signed_integer(*str, str, base); }