ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/shstr.h
(Generate patch)

Comparing deliantra/server/include/shstr.h (file contents):
Revision 1.28 by root, Thu Jan 1 11:41:17 2009 UTC vs.
Revision 1.33 by root, Mon Oct 12 14:00:58 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Deliantra is free software: you can redistribute it and/or modify 6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * it under the terms of the GNU General Public License as published by 7 * the terms of the Affero GNU General Public License as published by the
8 * the Free Software Foundation, either version 3 of the License, or 8 * Free Software Foundation, either version 3 of the License, or (at your
9 * (at your option) any later version. 9 * option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
17 * along with this program. If not, see <http://www.gnu.org/licenses/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
18 * 19 *
19 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
20 */ 21 */
21 22
22#ifndef SHSTR_H__ 23#ifndef SHSTR_H__
… …
68 int plen = strlen (prefix); 69 int plen = strlen (prefix);
69 70
70 return length () >= plen && !strncasecmp (s, prefix, plen); 71 return length () >= plen && !strncasecmp (s, prefix, plen);
71 } 72 }
72 73
74 // returns true if the substring is contained in the shstr
75 // if the shstr is 0, then this always returns false.
76 // the shstr is (theoretically) treated as a comma/colon/space etc. separated list.
73 bool contains (const char *substring) const 77 bool contains (const char *substring) const
74 { 78 {
75 return strstr (s, substring); 79 return s != null () && strstr (s, substring);
76 } 80 }
77 81
78 //TODO: case sensitive should be eradicated 82 //TODO: case sensitive should be eradicated
79 bool eq_nc (const char *otherstring) const 83 bool eq_nc (const char *otherstring) const
80 { 84 {
… …
119inline bool operator !=(const shstr_tmp &a, const shstr_tmp &b) 123inline bool operator !=(const shstr_tmp &a, const shstr_tmp &b)
120{ 124{
121 return a.s != b.s; 125 return a.s != b.s;
122} 126}
123 127
124inline int strlen (const shstr_tmp &sh) 128inline int strlen (shstr_tmp sh)
125{ 129{
126 return sh.length (); 130 return sh.length ();
127} 131}
128 132
129static std::ostream &operator <<(std::ostream &o, shstr_tmp sh) 133static std::ostream &operator <<(std::ostream &o, shstr_tmp sh)
… …
241inline bool operator ==(const shstr_tmp &a, const shstr_cmp &b) 245inline bool operator ==(const shstr_tmp &a, const shstr_cmp &b)
242{ 246{
243 return a.s == b.s; 247 return a.s == b.s;
244} 248}
245 249
246#define def2(id,str) extern const shstr shstr_ ## id; 250#define def2(id,str) extern const shstr id;
247#define def(id) def2(id, # id) 251#define def(id) def2(shstr_ ## id, # id)
248# include "shstrinc.h" 252# include "shstrinc.h"
249#undef def 253#undef def
250#undef def2 254#undef def2
251 255
252// undefined external reference to catch people using str* functions when they shouldn't 256// undefined external reference to catch people using str* functions when they shouldn't
253//template<class any> void strcmp (const shstr_tmp &a, any b); 257//template<class any> void strcmp (const shstr_tmp &a, any b);
254//template<class any> void strstr (const shstr_tmp &a, any b); 258template<class any> void strstr (const shstr_tmp &a, any b);
255 259
256#endif 260#endif
257 261

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines