--- deliantra/server/include/shstr.h	2006/09/03 00:18:41	1.5
+++ deliantra/server/include/shstr.h	2007/05/28 21:15:56	1.16
@@ -1,71 +1,131 @@
+/*
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * 
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * 
+ * Crossfire TRT 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 2 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 Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ */
+
 #ifndef SHSTR_H__
 #define SHSTR_H__
 
-extern int buf_overflow(const char *buf1, const char *buf2, int bufsize);
+#include <sstream>
+
+#include "util.h"
+
+extern int buf_overflow (const char *buf1, const char *buf2, int bufsize);
 
 struct shstr
 {
+  static const char *null;
+
   const char *s;
 
-  int &refcnt ()
+  static int &refcnt (const char *s)
   {
     return *((int *)s - 1);
   }
 
+  static int &length (const char *s)
+  {
+    return *((int *)s - 2);
+  }
+
+  int &refcnt () const
+  {
+    return refcnt (s);
+  }
+
+  int length () const
+  {
+    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);
 
   static void gc (); // garbage collect a few strings
 
-  // this is used for informational messages and the like I/O
-  const char *operator &() const { return s ? s : "<nil>"; }
-
-  const char &operator [](int i) { return s[i]; }
-  operator const char *() const { return s; }
+  // this is used for informational messages and the like
+  const char *operator &() const { return s; }
 
-  int length () const
-  {
-    return s ? *((int *)s - 2) : 0;
-  }
+  const char &operator [](int i) const { return s[i]; }
+  operator const char *() const { return s == null ? 0 : s; }
 
   shstr ()
-  : s (0)
+  : s (null)
   {
   }
 
-  shstr (shstr &sh)
+  shstr (const shstr &sh)
   : s (sh.s)
   {
-    if (s) ++refcnt ();
+    ++refcnt ();
   }
 
   explicit shstr (const char *s)
   : s (intern (s))
   {
-    if (s) ++refcnt ();
   }
 
   ~shstr ()
   {
-    if (s) --refcnt ();
+    --refcnt ();
   }
 
   const shstr &operator =(const shstr &sh)
   {
-    if (s) --refcnt ();
+    --refcnt ();
     s = sh.s;
-    if (s) ++refcnt ();
+    ++refcnt ();
 
     return *this;
   }
 
   const shstr &operator =(const char *str)
   {
-    if (s) --refcnt ();
-    s = intern (str);
+    --refcnt ();
+
+    // this optimises the important case of str == constant 0
+    if (is_constant (str))
+      s = str ? intern (str) : null;
+    else
+      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)
@@ -73,15 +133,54 @@
   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;
 }
 
+extern const shstr undead_name;	/* Used in hit_player() in main.c */
+
 #endif