Split net/ from mmo/

3 files changed, 295 insertions, 0 deletions

diff --git a/src/generic/dumb_ptr.cpp b/src/generic/dumb_ptr.cpp
new file mode 100644
index 0000000..77e3080
--- /dev/null
+++ b/src/generic/dumb_ptr.cpp
@@ -0,0 +1,21 @@
+#include "dumb_ptr.hpp"
+//    dumb_ptr.cpp - dummy file to make Make dependencies work
+//
+//    Copyright © 2013 Ben Longbons <b.r.longbons@gmail.com>
+//
+//    This file is part of The Mana World (Athena server)
+//
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "../poison.hpp"
diff --git a/src/generic/dumb_ptr.hpp b/src/generic/dumb_ptr.hpp
new file mode 100644
index 0000000..ed18317
--- /dev/null
+++ b/src/generic/dumb_ptr.hpp
@@ -0,0 +1,271 @@
+#ifndef TMWA_GENERIC_DUMB_PTR_HPP
+#define TMWA_GENERIC_DUMB_PTR_HPP
+//    dumb_ptr.hpp - temporary new/delete wrappers
+//
+//    Copyright © 2013 Ben Longbons <b.r.longbons@gmail.com>
+//
+//    This file is part of The Mana World (Athena server)
+//
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# include "fwd.hpp"
+
+# include <cstring>
+
+# include <algorithm>
+# include <utility>
+
+# include "../strings/astring.hpp"
+# include "../strings/zstring.hpp"
+# include "../strings/xstring.hpp"
+
+// unmanaged new/delete-able pointer
+// should be replaced by std::unique_ptr<T>
+template<class T>
+class dumb_ptr
+{
+    template<class U>
+    friend class dumb_ptr;
+    T *impl;
+public:
+    explicit
+    dumb_ptr(T *p=nullptr)
+    : impl(p)
+    {}
+    template<class U>
+    dumb_ptr(dumb_ptr<U> p)
+    : impl(p.impl)
+    {}
+    dumb_ptr(std::nullptr_t)
+    : impl(nullptr)
+    {}
+
+    void delete_()
+    {
+        delete impl;
+        *this = nullptr;
+    }
+    template<class... A>
+    void new_(A&&... a)
+    {
+        impl = new T(std::forward<A>(a)...);
+    }
+    template<class... A>
+    static
+    dumb_ptr<T> make(A&&... a)
+    {
+        return dumb_ptr<T>(new T(std::forward<A>(a)...));
+    }
+    dumb_ptr& operator = (std::nullptr_t)
+    {
+        impl = nullptr;
+        return *this;
+    }
+
+    T& operator *() const
+    {
+        return *impl;
+    }
+    T *operator->() const
+    {
+        return impl;
+    }
+
+    explicit
+    operator bool() const
+    {
+        return impl;
+    }
+    bool operator !() const
+    {
+        return !impl;
+    }
+
+    friend bool operator == (dumb_ptr l, dumb_ptr r)
+    {
+        return l.impl == r.impl;
+    }
+    friend bool operator != (dumb_ptr l, dumb_ptr r)
+    {
+        return !(l == r);
+    }
+};
+
+// unmanaged new/delete-able pointer
+// should be replaced by std::unique_ptr<T[]> or std::vector<T>
+template<class T>
+class dumb_ptr<T[]>
+{
+    T *impl;
+    size_t sz;
+public:
+    dumb_ptr() : impl(), sz() {}
+    dumb_ptr(std::nullptr_t)
+    : impl(nullptr), sz(0) {}
+    dumb_ptr(T *p, size_t z)
+    : impl(p)
+    , sz(z)
+    {}
+
+    void delete_()
+    {
+        delete[] impl;
+        *this = nullptr;
+    }
+    void new_(size_t z)
+    {
+        impl = new T[z]();
+        sz = z;
+    }
+    static
+    dumb_ptr<T[]> make(size_t z)
+    {
+        return dumb_ptr<T[]>(new T[z](), z);
+    }
+    dumb_ptr& operator = (std::nullptr_t)
+    {
+        impl = nullptr;
+        sz = 0;
+        return *this;
+    }
+
+    size_t size() const
+    {
+        return sz;
+    }
+    void resize(size_t z)
+    {
+        if (z == sz)
+            return;
+        T *np = new T[z]();
+        // not exception-safe, but we don't have a dtor anyway
+        size_t i = std::min(z, sz);
+        while (i-->0)
+            np[i] = std::move(impl[i]);
+        delete[] impl;
+        impl = np;
+        sz = z;
+    }
+
+    T& operator[](size_t i) const
+    {
+        return impl[i];
+    }
+
+    explicit
+    operator bool() const
+    {
+        return impl;
+    }
+    bool operator !() const
+    {
+        return !impl;
+    }
+
+    friend bool operator == (dumb_ptr l, dumb_ptr r)
+    {
+        return l.impl == r.impl;
+    }
+    friend bool operator != (dumb_ptr l, dumb_ptr r)
+    {
+        return !(l == r);
+    }
+};
+
+struct dumb_string
+{
+    dumb_ptr<char[]> impl;
+
+    dumb_string()
+    : impl()
+    {}
+    dumb_string(char *) = delete;
+    // copy ctor, copy assign, and dtor are all default
+
+    static dumb_string copy(const char *b, const char *e)
+    {
+        dumb_string rv;
+        rv.impl.new_((e - b) + 1);
+        std::copy(b, e, &rv.impl[0]);
+        return rv;
+    }
+    static dumb_string copys(XString s)
+    {
+        return dumb_string::copy(&*s.begin(), &*s.end());
+    }
+    static
+# ifndef __clang__
+    __attribute__((warning("shouldn't use this - slice instead")))
+# endif
+    dumb_string copyn(const char *sn, size_t n)
+    {
+        return dumb_string::copy(sn, sn + strnlen(sn, n));
+    }
+
+    static
+    dumb_string fake(ZString p)
+    {
+        dumb_string rv;
+        size_t len = p.size();
+        rv.impl = dumb_ptr<char[]>(const_cast<char *>(p.c_str()), len);
+        return rv;
+    }
+
+    dumb_string dup() const
+    {
+        return dumb_string::copy(&impl[0], &impl[0] + impl.size());
+    }
+    void delete_()
+    {
+        impl.delete_();
+    }
+
+    const char *c_str() const
+    {
+        return &impl[0];
+    }
+
+    operator ZString() const
+    {
+        return ZString(strings::really_construct_from_a_pointer, c_str(), nullptr);
+    }
+
+    AString str() const
+    {
+        return ZString(*this);
+    }
+
+    char& operator[](size_t i) const
+    {
+        return impl[i];
+    }
+
+    explicit
+    operator bool() const
+    {
+        return bool(impl);
+    }
+    bool operator !() const
+    {
+        return !impl;
+    }
+};
+
+inline
+const char *convert_for_printf(dumb_string ds)
+{
+    return ds.c_str();
+}
+
+#endif // TMWA_GENERIC_DUMB_PTR_HPP
diff --git a/src/generic/fwd.hpp b/src/generic/fwd.hpp
index df8485f..fcb1fab 100644
--- a/src/generic/fwd.hpp
+++ b/src/generic/fwd.hpp
@@ -22,5 +22,8 @@
 # include "../sanity.hpp"
 
 // meh, add more when I feel like it
+template<class T>
+class dumb_ptr;
+class dumb_string;
 
 #endif // TMWA_GENERIC_FWD_HPP