From 68b66c0b28546721519200408c5a36cee6604bbc Mon Sep 17 00:00:00 2001
From: Daniel Kolesa <daniel@octaforge.org>
Date: Tue, 23 Mar 2021 01:49:29 +0100
Subject: [PATCH] move strref implementation to strman

---
 src/cs_strman.cc | 49 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/cs_util.cc   | 45 --------------------------------------------
 2 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/src/cs_strman.cc b/src/cs_strman.cc
index fde2940..0a4d330 100644
--- a/src/cs_strman.cc
+++ b/src/cs_strman.cc
@@ -108,4 +108,53 @@ char *cs_strman::alloc_buf(std::size_t len) const {
     return strp;
 };
 
+/* strref implementation */
+
+/* strref */
+
+LIBCUBESCRIPT_EXPORT cs_strref::cs_strref(
+    cs_shared_state *cs, std::string_view str
+): p_state{cs}
+{
+    p_str = cs->strman->add(str);
+}
+
+LIBCUBESCRIPT_EXPORT cs_strref::cs_strref(cs_state &cs, std::string_view str):
+    p_state{cs.p_state}
+{
+    p_str = p_state->strman->add(str);
+}
+
+LIBCUBESCRIPT_EXPORT cs_strref::cs_strref(cs_strref const &ref):
+    p_state{ref.p_state}, p_str{ref.p_str}
+{
+    p_state->strman->ref(p_str);
+}
+
+/* this can be used by friends to do quick cs_strref creation */
+LIBCUBESCRIPT_EXPORT cs_strref::cs_strref(char const *p, cs_shared_state *cs):
+    p_state{cs}
+{
+    p_str = p_state->strman->ref(p);
+}
+
+LIBCUBESCRIPT_EXPORT cs_strref::~cs_strref() {
+    p_state->strman->unref(p_str);
+}
+
+LIBCUBESCRIPT_EXPORT cs_strref &cs_strref::operator=(cs_strref const &ref) {
+    p_str = ref.p_str;
+    p_state = ref.p_state;
+    p_state->strman->ref(p_str);
+    return *this;
+}
+
+LIBCUBESCRIPT_EXPORT cs_strref::operator std::string_view() const {
+    return p_state->strman->get(p_str);
+}
+
+LIBCUBESCRIPT_EXPORT bool cs_strref::operator==(cs_strref const &s) const {
+    return p_str == s.p_str;
+}
+
 } /* namespace cscript */
diff --git a/src/cs_util.cc b/src/cs_util.cc
index a5363ff..3f634ba 100644
--- a/src/cs_util.cc
+++ b/src/cs_util.cc
@@ -9,51 +9,6 @@
 
 namespace cscript {
 
-/* strref */
-
-cs_strref::cs_strref(cs_shared_state *cs, std::string_view str):
-    p_state{cs}
-{
-    p_str = cs->strman->add(str);
-}
-
-cs_strref::cs_strref(cs_state &cs, std::string_view str):
-    p_state{cs.p_state}
-{
-    p_str = p_state->strman->add(str);
-}
-
-cs_strref::cs_strref(cs_strref const &ref): p_state{ref.p_state}, p_str{ref.p_str}
-{
-    p_state->strman->ref(p_str);
-}
-
-/* this can be used by friends to do quick cs_strref creation */
-cs_strref::cs_strref(char const *p, cs_shared_state *cs):
-    p_state{cs}
-{
-    p_str = p_state->strman->ref(p);
-}
-
-cs_strref::~cs_strref() {
-    p_state->strman->unref(p_str);
-}
-
-cs_strref &cs_strref::operator=(cs_strref const &ref) {
-    p_str = ref.p_str;
-    p_state = ref.p_state;
-    p_state->strman->ref(p_str);
-    return *this;
-}
-
-cs_strref::operator std::string_view() const {
-    return p_state->strman->get(p_str);
-}
-
-bool cs_strref::operator==(cs_strref const &s) const {
-    return p_str == s.p_str;
-}
-
 namespace util {
     LIBCUBESCRIPT_EXPORT char const *parse_string(
         cs_state &cs, std::string_view str, size_t &nlines