New ast module for for npc parsing

Will eventually put most/all parsers there.

3 files changed, 277 insertions, 1 deletions

diff --git a/src/mmo/extract.cpp b/src/mmo/extract.cpp
index a480984..9123237 100644
--- a/src/mmo/extract.cpp
+++ b/src/mmo/extract.cpp
@@ -30,6 +30,9 @@
 #include "../poison.hpp"
 
 
+// TODO move this whole file to io/ or something.
+// It needs to be lower in the include hierarchy so it can be implemented
+// for library types. Also it should pass an io::LineSpan around.
 namespace tmwa
 {
 bool extract(XString str, XString *rv)
@@ -38,6 +41,12 @@ bool extract(XString str, XString *rv)
     return true;
 }
 
+bool extract(XString str, RString *rv)
+{
+    *rv = str;
+    return true;
+}
+
 bool extract(XString str, AString *rv)
 {
     *rv = str;
@@ -98,4 +107,174 @@ bool extract(XString str, CharName *out)
     }
     return false;
 }
+
+bool extract(XString str, std::chrono::nanoseconds *ns)
+{
+    std::chrono::nanoseconds::rep rep;
+    if (extract(str, &rep))
+    {
+        *ns = std::chrono::nanoseconds(rep);
+        return true;
+    }
+    if (str.endswith("ns"_s))
+    {
+        if (extract(str.xrslice_h("ns"_s.size()), &rep))
+        {
+            *ns = std::chrono::nanoseconds(rep);
+            return true;
+        }
+        return false;
+    }
+    std::chrono::microseconds bigger;
+    if (extract(str, &bigger))
+    {
+        *ns = bigger;
+        return *ns == bigger;
+    }
+    return false;
+}
+bool extract(XString str, std::chrono::microseconds *us)
+{
+    std::chrono::microseconds::rep rep;
+    if (extract(str, &rep))
+    {
+        *us = std::chrono::microseconds(rep);
+        return true;
+    }
+    if (str.endswith("us"_s))
+    {
+        if (extract(str.xrslice_h("us"_s.size()), &rep))
+        {
+            *us = std::chrono::microseconds(rep);
+            return true;
+        }
+        return false;
+    }
+    std::chrono::milliseconds bigger;
+    if (extract(str, &bigger))
+    {
+        *us = bigger;
+        return *us == bigger;
+    }
+    return false;
+}
+bool extract(XString str, std::chrono::milliseconds *ms)
+{
+    std::chrono::milliseconds::rep rep;
+    if (extract(str, &rep))
+    {
+        *ms = std::chrono::milliseconds(rep);
+        return true;
+    }
+    if (str.endswith("ms"_s))
+    {
+        if (extract(str.xrslice_h("ms"_s.size()), &rep))
+        {
+            *ms = std::chrono::milliseconds(rep);
+            return true;
+        }
+        return false;
+    }
+    std::chrono::seconds bigger;
+    if (extract(str, &bigger))
+    {
+        *ms = bigger;
+        return *ms == bigger;
+    }
+    return false;
+}
+bool extract(XString str, std::chrono::seconds *s)
+{
+    std::chrono::seconds::rep rep;
+    if (extract(str, &rep))
+    {
+        *s = std::chrono::seconds(rep);
+        return true;
+    }
+    if (str.endswith("s"_s))
+    {
+        if (extract(str.xrslice_h("s"_s.size()), &rep))
+        {
+            *s = std::chrono::seconds(rep);
+            return true;
+        }
+        return false;
+    }
+    std::chrono::minutes bigger;
+    if (extract(str, &bigger))
+    {
+        *s = bigger;
+        return *s == bigger;
+    }
+    return false;
+}
+bool extract(XString str, std::chrono::minutes *min)
+{
+    std::chrono::minutes::rep rep;
+    if (extract(str, &rep))
+    {
+        *min = std::chrono::minutes(rep);
+        return true;
+    }
+    if (str.endswith("min"_s))
+    {
+        if (extract(str.xrslice_h("min"_s.size()), &rep))
+        {
+            *min = std::chrono::minutes(rep);
+            return true;
+        }
+        return false;
+    }
+    std::chrono::hours bigger;
+    if (extract(str, &bigger))
+    {
+        *min = bigger;
+        return *min == bigger;
+    }
+    return false;
+}
+bool extract(XString str, std::chrono::hours *h)
+{
+    std::chrono::hours::rep rep;
+    if (extract(str, &rep))
+    {
+        *h = std::chrono::hours(rep);
+        return true;
+    }
+    if (str.endswith("h"_s))
+    {
+        if (extract(str.xrslice_h("h"_s.size()), &rep))
+        {
+            *h = std::chrono::hours(rep);
+            return true;
+        }
+        return false;
+    }
+    std::chrono::duration<int, std::ratio<60*60*24>> bigger;
+    if (extract(str, &bigger))
+    {
+        *h = bigger;
+        return *h == bigger;
+    }
+    return false;
+}
+bool extract(XString str, std::chrono::duration<int, std::ratio<60*60*24>> *d)
+{
+    std::chrono::duration<int, std::ratio<60*60*24>>::rep rep;
+    if (extract(str, &rep))
+    {
+        *d = std::chrono::duration<int, std::ratio<60*60*24>>(rep);
+        return true;
+    }
+    if (str.endswith("d"_s))
+    {
+        if (extract(str.xrslice_h("d"_s.size()), &rep))
+        {
+            *d = std::chrono::duration<int, std::ratio<60*60*24>>(rep);
+            return true;
+        }
+        return false;
+    }
+    return false;
+}
 } // namespace tmwa
diff --git a/src/mmo/extract.hpp b/src/mmo/extract.hpp
index ed2eb78..152d1b7 100644
--- a/src/mmo/extract.hpp
+++ b/src/mmo/extract.hpp
@@ -24,6 +24,7 @@
 #include <cstdlib>
 
 #include <algorithm>
+#include <chrono>
 #include <vector>
 
 #include "../ints/wrap.hpp"
@@ -93,7 +94,7 @@ bool extract_as_int(XString str, T *iv)
 }
 
 bool extract(XString str, XString *rv);
-
+bool extract(XString str, RString *rv);
 bool extract(XString str, AString *rv);
 
 template<uint8_t N>
@@ -228,4 +229,12 @@ bool extract(XString str, Wrapped<R> *w)
 {
     return extract(str, &w->_value);
 }
+
+bool extract(XString str, std::chrono::nanoseconds *ns);
+bool extract(XString str, std::chrono::microseconds *us);
+bool extract(XString str, std::chrono::milliseconds *ms);
+bool extract(XString str, std::chrono::seconds *s);
+bool extract(XString str, std::chrono::minutes *min);
+bool extract(XString str, std::chrono::hours *h);
+bool extract(XString str, std::chrono::duration<int, std::ratio<60*60*24>> *d);
 } // namespace tmwa
diff --git a/src/mmo/extract_test.cpp b/src/mmo/extract_test.cpp
index e6dc7b2..9c203ac 100644
--- a/src/mmo/extract_test.cpp
+++ b/src/mmo/extract_test.cpp
@@ -357,4 +357,92 @@ TEST(extract, mapname)
     EXPECT_TRUE(extract("abcdefghijklmno.gat"_s, &map));
     EXPECT_EQ(map, "abcdefghijklmno"_s);
 }
+
+TEST(extract, chrono)
+{
+    std::chrono::nanoseconds ns;
+    std::chrono::microseconds us;
+    std::chrono::milliseconds ms;
+    std::chrono::seconds s;
+    std::chrono::minutes min;
+    std::chrono::hours h;
+    std::chrono::duration<int, std::ratio<60*60*24>> d;
+
+    EXPECT_TRUE(extract("1"_s, &ns));
+    EXPECT_EQ(ns, 1_ns);
+    EXPECT_TRUE(extract("3ns"_s, &ns));
+    EXPECT_EQ(ns, 3_ns);
+    EXPECT_TRUE(extract("4us"_s, &ns));
+    EXPECT_EQ(ns, 4_us);
+    EXPECT_TRUE(extract("5ms"_s, &ns));
+    EXPECT_EQ(ns, 5_ms);
+    EXPECT_TRUE(extract("6s"_s, &ns));
+    EXPECT_EQ(ns, 6_s);
+    EXPECT_TRUE(extract("7min"_s, &ns));
+    EXPECT_EQ(ns, 7_min);
+    EXPECT_TRUE(extract("8h"_s, &ns));
+    EXPECT_EQ(ns, 8_h);
+    EXPECT_TRUE(extract("9d"_s, &ns));
+    EXPECT_EQ(ns, 9_d);
+
+    EXPECT_TRUE(extract("1"_s, &us));
+    EXPECT_EQ(us, 1_us);
+    EXPECT_TRUE(extract("4us"_s, &us));
+    EXPECT_EQ(us, 4_us);
+    EXPECT_TRUE(extract("5ms"_s, &us));
+    EXPECT_EQ(us, 5_ms);
+    EXPECT_TRUE(extract("6s"_s, &us));
+    EXPECT_EQ(us, 6_s);
+    EXPECT_TRUE(extract("7min"_s, &us));
+    EXPECT_EQ(us, 7_min);
+    EXPECT_TRUE(extract("8h"_s, &us));
+    EXPECT_EQ(us, 8_h);
+    EXPECT_TRUE(extract("9d"_s, &us));
+    EXPECT_EQ(us, 9_d);
+
+    EXPECT_TRUE(extract("1"_s, &ms));
+    EXPECT_EQ(ms, 1_ms);
+    EXPECT_TRUE(extract("5ms"_s, &ms));
+    EXPECT_EQ(ms, 5_ms);
+    EXPECT_TRUE(extract("6s"_s, &ms));
+    EXPECT_EQ(ms, 6_s);
+    EXPECT_TRUE(extract("7min"_s, &ms));
+    EXPECT_EQ(ms, 7_min);
+    EXPECT_TRUE(extract("8h"_s, &ms));
+    EXPECT_EQ(ms, 8_h);
+    EXPECT_TRUE(extract("9d"_s, &ms));
+    EXPECT_EQ(ms, 9_d);
+
+    EXPECT_TRUE(extract("1"_s, &s));
+    EXPECT_EQ(s, 1_s);
+    EXPECT_TRUE(extract("6s"_s, &s));
+    EXPECT_EQ(s, 6_s);
+    EXPECT_TRUE(extract("7min"_s, &s));
+    EXPECT_EQ(s, 7_min);
+    EXPECT_TRUE(extract("8h"_s, &s));
+    EXPECT_EQ(s, 8_h);
+    EXPECT_TRUE(extract("9d"_s, &s));
+    EXPECT_EQ(s, 9_d);
+
+    EXPECT_TRUE(extract("1"_s, &min));
+    EXPECT_EQ(min, 1_min);
+    EXPECT_TRUE(extract("7min"_s, &min));
+    EXPECT_EQ(min, 7_min);
+    EXPECT_TRUE(extract("8h"_s, &min));
+    EXPECT_EQ(min, 8_h);
+    EXPECT_TRUE(extract("9d"_s, &min));
+    EXPECT_EQ(min, 9_d);
+
+    EXPECT_TRUE(extract("1"_s, &h));
+    EXPECT_EQ(h, 1_h);
+    EXPECT_TRUE(extract("8h"_s, &h));
+    EXPECT_EQ(h, 8_h);
+    EXPECT_TRUE(extract("9d"_s, &h));
+    EXPECT_EQ(h, 9_d);
+
+    EXPECT_TRUE(extract("1"_s, &d));
+    EXPECT_EQ(d, 1_d);
+    EXPECT_TRUE(extract("9d"_s, &d));
+    EXPECT_EQ(d, 9_d);
+}
 } // namespace tmwa