libcore: RegExp capture as CString; hash function for Id

skyjake · Sep 1, 2019 · e78c0aa · e78c0aa
1 parent 6c57539
commit e78c0aa
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 21 deletions.
diff --git a/doomsday/libs/core/include/de/core/id.h b/doomsday/libs/core/include/de/core/id.h
@@ -102,9 +102,7 @@ class DE_PUBLIC Id : public ISerializable, public LogEntry::Arg::Base
     Type _id;
 };
 
-//DE_PUBLIC QTextStream &operator << (QTextStream &os, Id const &id);
-
-//inline uint qHash(Id const &id) { return id; }
+DE_PUBLIC std::ostream &operator<<(std::ostream &os, Id const &id);
 
 /**
  * Utility for declaring identifiers that are initially uninitialized.
@@ -118,4 +116,14 @@ class DE_PUBLIC NoneId : public Id
 
 } // namespace de
 
+namespace std
+{
+    template<>
+    struct hash<de::Id> {
+        std::size_t operator()(const de::Id &key) const {
+            return hash<uint32_t>()(key.asUInt32());
+        }
+    };
+}
+
 #endif // LIBCORE_ID_H
diff --git a/doomsday/libs/core/include/de/data/binarytree.h b/doomsday/libs/core/include/de/data/binarytree.h
@@ -132,7 +132,7 @@ class BinaryTree
             return *_parent;
         }
         /// @throw MissingParentError Attempted with no parent linked.
-        throw MissingParentError("BinaryTree::parent", QString("No parent is linked"));
+        throw MissingParentError("BinaryTree::parent", "No parent is linked");
     }
 
     /**
@@ -255,8 +255,8 @@ class BinaryTree
             return **adr;
         }
         /// @throw MissingChildError Attempted with no child linked.
-        throw MissingChildError("BinaryTree::child", QString("No %1 child is linked")
-                                                        .arg(which? "Left" : "Right"));
+        throw MissingChildError("BinaryTree::child",
+                                stringf("No %s child is linked", which ? "Left" : "Right"));
     }
 
     /**
@@ -331,7 +331,7 @@ class BinaryTree
      * Retrieve the height of this tree.
      * @return  Tree height.
      */
-    size_t height() const
+    dsize height() const
     {
         if (!isLeaf())
         {
@@ -409,7 +409,7 @@ class BinaryTree
      * @return  @c 0= iff all callbacks complete wholly else the return value of the
      * callback last made.
      */
-    int traversePreOrder(int (*callback) (BinaryTree &, void *), void *parameters = 0)
+    int traversePreOrder(int (*callback) (BinaryTree &, void *), void *parameters = nullptr)
     {
         if (!callback) return false; // Continue iteration.
 
@@ -444,7 +444,7 @@ class BinaryTree
      * @return  @c 0= iff all callbacks complete wholly else the return value of the
      * callback last made.
      */
-    int traverseInOrder(int (*callback) (BinaryTree &, void *), void *parameters = 0)
+    int traverseInOrder(int (*callback) (BinaryTree &, void *), void *parameters = nullptr)
     {
         if (!callback) return false; // Continue iteration.
 
@@ -479,7 +479,7 @@ class BinaryTree
      * @return  @c 0= iff all callbacks complete wholly else the return value of the
      * callback last made.
      */
-    int traversePostOrder(int (*callback) (BinaryTree &, void *), void *parameters = 0)
+    int traversePostOrder(int (*callback) (BinaryTree &, void *), void *parameters = nullptr)
     {
         if (!callback) return false; // Continue iteration.
 
@@ -504,14 +504,12 @@ class BinaryTree
      */
     String summary() const
     {
-        String text = String("%1 nodes, %2 leafs")
-                        .arg(nodeCount())
-                        .arg(leafCount());
+        String text = String::format("%i nodes, %i leafs", nodeCount(), leafCount());
         if (!isLeaf())
         {
-            text += String(" (balance is %1:%2)")
-                        .arg(hasRight()? right().height() : 0)
-                        .arg(hasLeft() ? left ().height() : 0);
+            text += stringf(" (balance is %zu:%zu)",
+                            hasRight() ? right().height() : 0,
+                            hasLeft() ? left().height() : 0);
         }
         return text;
     }

diff --git a/doomsday/libs/core/include/de/data/regexp.h b/doomsday/libs/core/include/de/data/regexp.h
@@ -19,7 +19,7 @@
 #ifndef LIBCORE_REGEXP_H
 #define LIBCORE_REGEXP_H
 
-#include "../String"
+#include "../CString"
 #include <c_plus/regexp.h>
 
 namespace de {
@@ -34,8 +34,9 @@ class DE_PUBLIC RegExpMatch
     const char *begin() const;
     const char *end() const;
 
-    void   clear();
-    String captured(int index = 0) const;
+    void    clear();
+    String  captured(int index = 0) const;
+    CString capturedCStr(int index = 0) const;
 };
 
 /**

diff --git a/doomsday/libs/core/include/de/libcore.h b/doomsday/libs/core/include/de/libcore.h
@@ -351,8 +351,8 @@
 #if defined(__cplusplus) && !defined(DE_C_API_ONLY)
 namespace de {
 
-DE_PUBLIC void debug(const char *, ...);
-DE_PUBLIC void warning(const char *, ...);
+DE_PUBLIC void debug    (const char *, ...);
+DE_PUBLIC void warning  (const char *, ...);
 
 /**
  * Formats a string using the standard C printf() syntax.

diff --git a/doomsday/libs/core/src/data/regexp.cpp b/doomsday/libs/core/src/data/regexp.cpp
@@ -47,6 +47,13 @@ String RegExpMatch::captured(int index) const
     return String::take(captured_RegExpMatch(&match, index));
 }
 
+CString RegExpMatch::capturedCStr(int index) const
+{
+    iRangecc range;
+    capturedRange_RegExpMatch(&match, index, &range);
+    return range;
+}
+
 RegExp::RegExp(const String &expression, Sensitivity cs)
 {
     _d = new_RegExp(expression, cs == CaseSensitive? caseSensitive_RegExpOption