--- deliantra/server/include/shstr.h 2008/12/31 18:07:41 1.25
+++ deliantra/server/include/shstr.h 2010/03/26 01:04:44 1.38
@@ -1,20 +1,21 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 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.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero 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 .
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * .
*
* The authors can be reached via e-mail to
*/
@@ -34,14 +35,16 @@
template
struct shstr_vec
{
+ uint32_t hash;
uint32_t len;
uint32_t refcnt;
- char string[size];
+ // pointer points here
+ char string [size];
};
// this class is a non-refcounted shared string
// it cannot be used to create or store shared strings, but
-// it can be used to apss shared strings around, i.e. as function arguments
+// it can be used to pass shared strings around, i.e. as function arguments
// or return values. their lifetime must not span a gc () call, i.e.
// they are only valid as temporary values within the same server tick.
struct shstr_tmp
@@ -51,6 +54,16 @@
const char *s;
+ static unsigned int &hash (const char *s)
+ {
+ return *((unsigned int *)s - 3);
+ }
+
+ int hash () const
+ {
+ return hash (s);
+ }
+
static unsigned int &length (const char *s)
{
return *((unsigned int *)s - 2);
@@ -70,9 +83,18 @@
return length () >= plen && !strncasecmp (s, prefix, plen);
}
+ // returns true if the substring is contained in the shstr
+ // if the shstr is 0, then this always returns false.
+ // the shstr is (theoretically) treated as a comma/colon/space etc. separated list.
bool contains (const char *substring) const
{
- return strstr (s, substring);
+ return s != null () && strstr (s, substring);
+ }
+
+ //TODO: case sensitive should be eradicated
+ bool eq_nc (const char *otherstring) const
+ {
+ return !strcasecmp (s, otherstring);
}
shstr_tmp ()
@@ -96,6 +118,13 @@
const char *operator &() const { return s; }
operator const char *() const { return s == null () ? 0 : s; }
+
+protected:
+ // dummy is there so it isn't used as type converter accidentally
+ shstr_tmp (int dummy, const char *s)
+ : s(s)
+ {
+ }
};
inline bool operator ==(const shstr_tmp &a, const shstr_tmp &b)
@@ -108,15 +137,12 @@
return a.s != b.s;
}
-inline int strlen (const shstr_tmp &sh)
+inline int strlen (shstr_tmp sh)
{
return sh.length ();
}
-// undefined external reference to catch people using strcmp when they shouldn't
-int strcmp (const shstr_tmp &a, const shstr_tmp &b);
-
-static std::ostream &operator <<(std::ostream &o, shstr_tmp sh)
+static inline std::ostream &operator <<(std::ostream &o, shstr_tmp sh)
{
o.write (sh.s, sh.length ());
@@ -157,8 +183,8 @@
}
explicit shstr (const char *str)
+ : shstr_tmp (0, is_constant (str) && !str ? null () : intern (str))
{
- s = is_constant (str) && !str ? null () : intern (str);
}
~shstr ()
@@ -201,7 +227,13 @@
{
const char *s;
- explicit shstr_cmp (const char *str)
+ // initialies to the non-matching string (as opposed to the null string)
+ shstr_cmp ()
+ {
+ s = 0;
+ }
+
+ shstr_cmp (const char *str)
: s (shstr::find (str))
{
}
@@ -227,9 +259,15 @@
return a.s == b.s;
}
-#define def(str) extern const shstr shstr_ ## str;
+#define def2(id,str) extern const shstr id;
+#define def(id) def2(shstr_ ## id, # id)
# include "shstrinc.h"
#undef def
+#undef def2
+
+// undefined external reference to catch people using str* functions when they shouldn't
+//template void strcmp (const shstr_tmp &a, any b);
+template void strstr (const shstr_tmp &a, any b);
#endif