2nd merge attempt

Author: shewitt-au

lib/source/pl/core/ast/ast_node_attribute.cpp

@@ -10,6 +10,7 @@
 #include <pl/patterns/pattern_bitfield.hpp>
 
 #include <bit>
+#include <wolv/utils/charconv.hpp>
 
 namespace pl::core::ast {
 
@@ -348,7 +349,7 @@ namespace pl::core::ast {
         if (!pattern->hasOverriddenColor()) {
             if (const auto &arguments = attributable->getAttributeArguments("color"); arguments.size() == 1) {
                 auto colorString = getAttributeValueAsString(arguments.front(), evaluator);
-                u32 color = strtoul(colorString.c_str(), nullptr, 16);
+                u32 color = wolv::util::from_chars<u32>(colorString, 16).value_or(0);
                 pattern->setColor(hlp::changeEndianess(color, std::endian::big) >> 8);
             } else if (auto singleColor = attributable->hasAttribute("single_color", false); singleColor) {
                 pattern->setColor(pattern->getColor());
@@ -406,7 +407,7 @@ namespace pl::core::ast {
 
         if (const auto &arguments = attributable->getAttributeArguments("color"); arguments.size() == 1) {
             auto colorString = getAttributeValueAsString(arguments.front(), evaluator);
-            u32 color = strtoul(colorString.c_str(), nullptr, 16);
+            u32 color = wolv::util::from_chars<u32>(colorString, 16).value_or(0);
             pattern->setColor(hlp::changeEndianess(color, std::endian::big) >> 8);
         } else if (auto singleColor = attributable->hasAttribute("single_color", false); singleColor) {
             pattern->setColor(pattern->getColor());

lib/source/pl/core/lexer.cpp

@@ -7,6 +7,7 @@
 #include <pl/api.hpp>
 #include <pl/core/token.hpp>
 #include <pl/core/tokens.hpp>
+#include <wolv/utils/charconv.hpp>
 
 #include <lexertl/lookup.hpp>
 #include <lexertl/state_machine.hpp>
@@ -121,22 +122,21 @@ namespace pl::core {
     }
 
     std::optional<double> Lexer::parseFloatingPoint(std::string_view literal, const char suffix, const auto &location) {
-        char *end = nullptr;
-        double val = std::strtod(literal.data(), &end);
+        const auto value = wolv::util::from_chars<double>(literal);
 
-        if(end != literal.data() + literal.size()) {
+        if(!value.has_value()) {
             error(location(), "Invalid float literal: {}", literal);
             return std::nullopt;
         }
 
         switch (suffix) {
             case 'f':
             case 'F':
-                return float(val);
+                return float(*value);
             case 'd':
             case 'D':
             default:
-                return val;
+                return *value;
         }
     }
 
@@ -546,3 +546,4 @@ namespace pl::core {
     }
 
 } // namespace pl::core
+

lib/source/pl/lib/std/string.cpp

@@ -11,6 +11,8 @@
 
 #include <fmt/args.h>
 
+#include <wolv/utils/charconv.hpp>
+
 namespace pl::lib::libstd::string {
 
     void registerFunctions(pl::PatternLanguage &runtime) {
@@ -63,16 +65,18 @@ namespace pl::lib::libstd::string {
                 auto string = params[0].toString(false);
                 auto base   = u64(params[1].toUnsigned());
 
-                // TODO: support 128-bit integers
+                if constexpr (std::integral<i128>)
+                    return wolv::util::from_chars<i128>(string, base).value_or(0);
+                else
+                    return wolv::util::from_chars<i64>(string, base).value_or(0);
 
-                return i128(std::strtoll(string.c_str(), nullptr, base));
             });
 
             /* parse_float(string) */
             runtime.addFunction(nsStdString, "parse_float", FunctionParameterCount::exactly(1), [](Evaluator *, auto params) -> std::optional<Token::Literal> {
                 auto string = params[0].toString(false);
 
-                return double(std::strtod(string.c_str(), nullptr));
+                return wolv::util::from_chars<double>(string).value_or(0.0);
             });
         }