Remove ObisId::from_string. Remove DlmsParser::patterns(). Remove extra DlmsParser::register_pattern overloads

Author: PolarGoose

src/dlms_parser/dlms_parser.cpp

@@ -50,14 +50,6 @@ void DlmsParser::load_default_patterns() {
   axdr_parser_.register_pattern("swappedTagObis-value-scalerUnit", "TOW, TV, TSU", 100);
 }
 
-void DlmsParser::register_pattern(const char* dsl) {
-  axdr_parser_.register_pattern("CUSTOM", dsl, 0, ObisId{});
-}
-
-void DlmsParser::register_pattern(const char* name, const char* dsl, const int priority) {
-  axdr_parser_.register_pattern(name, dsl, priority, ObisId{});
-}
-
 void DlmsParser::register_pattern(const char* name, const char* dsl, const int priority, const ObisId default_obis) {
   axdr_parser_.register_pattern(name, dsl, priority, default_obis);
 }

src/dlms_parser/dlms_parser.h

@@ -21,12 +21,8 @@ class DlmsParser final : NonCopyableAndNonMovable {
   // Load built-in patterns.
   void load_default_patterns();
 
-  void register_pattern(const char* dsl);
-  void register_pattern(const char* name, const char* dsl, int priority = 0);
   void register_pattern(const char* name, const char* dsl, int priority, ObisId default_obis);
 
-  [[nodiscard]] std::span<const AxdrDescriptorPattern> patterns() const { return axdr_parser_.patterns(); }
-
   // Parse a full frame (in-place). buf is modified during parsing.
   ParseResult parse(std::span<uint8_t> buf);
 

src/dlms_parser/obis_id.h

@@ -4,7 +4,6 @@
 #include <compare>
 #include <cstdio>
 #include <cstdint>
-#include <optional>
 #include <span>
 #include <string_view>
 #include <algorithm>
@@ -22,40 +21,6 @@ struct ObisId final {
 
   [[nodiscard]] bool empty() const { return v == std::array<uint8_t, 6>{}; }
 
-  [[nodiscard]] static std::optional<ObisId> from_string(const std::string_view str) noexcept {
-    std::array<uint8_t, 6> values{};
-    size_t count = 0;
-    size_t pos = 0;
-
-    while (pos < str.size()) {
-      if (count == values.size()) return std::nullopt;
-      if (str[pos] < '0' || str[pos] > '9') return std::nullopt;
-
-      unsigned value = 0;
-      while (pos < str.size() && str[pos] >= '0' && str[pos] <= '9') {
-        value = value * 10U + static_cast<unsigned>(str[pos] - '0');
-        if (value > 255U) return std::nullopt;
-        ++pos;
-      }
-
-      values[count++] = static_cast<uint8_t>(value);
-
-      if (pos == str.size()) break;
-      if (str[pos] != '.' && str[pos] != '-') return std::nullopt;
-
-      ++pos;
-      if (pos == str.size()) return std::nullopt;
-    }
-
-    if (count == 5) {
-      values[5] = 255;
-    } else if (count != values.size()) {
-      return std::nullopt;
-    }
-
-    return ObisId(values[0], values[1], values[2], values[3], values[4], values[5]);
-  }
-
   [[nodiscard]] std::string_view to_string(std::span<char> buffer) const {
     if (buffer.empty()) return {};
     const int len = snprintf(buffer.data(), buffer.size(), "%u.%u.%u.%u.%u.%u", v[0], v[1], v[2], v[3], v[4], v[5]);