--- deliantra/server/include/shstr.h	2006/09/03 23:33:01	1.8
+++ deliantra/server/include/shstr.h	2007/11/08 19:43:25	1.20
@@ -1,8 +1,33 @@
+/*
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ * 
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * 
+ * Deliantra 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/>.
+ * 
+ * The authors can be reached via e-mail to <support@deliantra.net>
+ */
+
 #ifndef SHSTR_H__
 #define SHSTR_H__
 
+#include <sstream>
+
 #include "util.h"
 
+extern size_t shstr_alloc;
+
 extern int buf_overflow (const char *buf1, const char *buf2, int bufsize);
 
 struct shstr
@@ -31,6 +56,14 @@
     return length (s);
   }
 
+  // returns wether this shared string begins with the given prefix,
+  // used mainly for searched when users give only the start of a name.
+  bool begins_with (const char *prefix) const
+  {
+    int plen = strlen (prefix);
+    return !strncasecmp (s, prefix, plen) && length () >= plen;
+  }
+
   static const char *find (const char *s);
   static const char *intern (const char *s);
 
@@ -76,16 +109,24 @@
   {
     --refcnt ();
 
-#if 0
     // this optimises the important case of str == constant 0
     if (is_constant (str))
       s = str ? intern (str) : null;
     else
-#endif
       s = intern (str);
 
     return *this;
   }
+
+  bool operator ==(const shstr &b)
+  {
+    return s == b.s;
+  }
+
+  bool operator !=(const shstr &b)
+  {
+    return !(*this == b);
+  }
 };
 
 inline int strlen (const shstr &sh)
@@ -93,15 +134,56 @@
   return sh.length ();
 }
 
-inline bool operator ==(const shstr &a, const shstr &b)
+inline int strcmp (const shstr &a, const shstr &b)
+{
+  // TODO: use this to find all the occurences of people using strcmp
+  // all uses should be bogus, as we should be never interested in
+  // comparing shstr's alphabetically
+#if 0
+  extern void do_not_use_strcmp_to_compare_shstr_values ();
+  do_not_use_strcmp_to_compare_shstr_values ();
+#endif
+  return a != b;
+}
+
+static std::ostream &operator <<(std::ostream &o, const shstr &sh)
+{
+  o.write (sh.s, sh.length ());
+  return o;
+}
+
+// only good for mass comparisons to shstr objects
+struct shstr_cmp
+{
+  const char *s;
+
+  explicit shstr_cmp (const char *s)
+  : s (shstr::find (s))
+  {
+  }
+
+  shstr_cmp (const shstr_cmp &sh)
+  : s (sh.s)
+  {
+  }
+
+  shstr_cmp &operator =(const shstr_cmp sh) { s = sh.s; return *this; }
+  operator const char *() const { return s; }
+};
+
+inline bool operator ==(const shstr_cmp &a, const shstr &b)
 {
   return a.s == b.s;
 }
 
-inline bool operator !=(const shstr &a, const shstr &b)
+inline bool operator ==(const shstr &a, const shstr_cmp &b)
 {
-  return !(a == b);
+  return b == a;
 }
 
+#define def(str) extern const shstr shstr_ ## str;
+# include "shstrinc.h"
+#undef def
+
 #endif