… | |
… | |
7 | |
7 | |
8 | #include <glib.h> |
8 | #include <glib.h> |
9 | |
9 | |
10 | #include <tr1/unordered_set> |
10 | #include <tr1/unordered_set> |
11 | |
11 | |
12 | #include "shstr.h" |
|
|
13 | #include "util.h" |
12 | #include "global.h" |
14 | |
13 | |
15 | typedef std::tr1::unordered_set<const char *, str_hash, str_equal> HT; |
14 | typedef std::tr1::unordered_set <const char *, str_hash, str_equal, slice_allocator<const char *>, true> HT; |
16 | |
15 | |
17 | static HT ht; |
16 | static HT ht; |
18 | |
17 | |
19 | static const char *makevec (const char *s) |
18 | static const char * |
|
|
19 | makevec (const char *s) |
20 | { |
20 | { |
21 | int len = strlen (s); |
21 | int len = strlen (s); |
22 | |
22 | |
23 | const char *v = (const char *)(2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1)); |
23 | const char *v = (const char *) (2 + (int *)g_slice_alloc (sizeof (int) * 2 + len + 1)); |
24 | |
24 | |
25 | shstr::length (v) = len; |
25 | shstr::length (v) = len; |
26 | shstr::refcnt (v) = 1; |
26 | shstr::refcnt (v) = 1; |
27 | |
27 | |
28 | memcpy ((char *)v, s, len + 1); |
28 | memcpy ((char *) v, s, len + 1); |
29 | |
29 | |
30 | return v; |
30 | return v; |
31 | } |
31 | } |
32 | |
32 | |
|
|
33 | static const char * |
|
|
34 | makenull () |
|
|
35 | { |
33 | const char *shstr::null = makevec ("<nil>"); |
36 | const char *s = makevec ("(null)"); |
|
|
37 | shstr::length (s) = 0; |
|
|
38 | return s; |
|
|
39 | } |
34 | |
40 | |
35 | // what weird misoptimisation is this again? |
41 | const char *shstr::null = makenull (); |
36 | const shstr undead_name ("undead"); |
|
|
37 | |
42 | |
38 | const char * |
43 | const char * |
39 | shstr::find (const char *s) |
44 | shstr::find (const char *s) |
40 | { |
45 | { |
41 | if (!s) |
46 | if (!s) |
42 | return s; |
47 | return s; |
43 | |
48 | |
44 | HT::iterator i = ht.find (s); |
49 | HT::iterator i = ht.find (s); |
45 | |
50 | |
46 | return i != ht.end () |
51 | return i != ht.end ()? *i : 0; |
47 | ? *i |
|
|
48 | : 0; |
|
|
49 | } |
52 | } |
50 | |
53 | |
51 | const char * |
54 | const char * |
52 | shstr::intern (const char *s) |
55 | shstr::intern (const char *s) |
53 | { |
56 | { |
… | |
… | |
91 | break; |
94 | break; |
92 | else if (!refcnt (*i)) |
95 | else if (!refcnt (*i)) |
93 | { |
96 | { |
94 | HT::iterator o = i++; |
97 | HT::iterator o = i++; |
95 | const char *s = *o; |
98 | const char *s = *o; |
|
|
99 | |
96 | ht.erase (o); |
100 | ht.erase (o); |
97 | |
101 | |
98 | //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); |
102 | //printf ("GC %4d %3d %d >%s<%d\n", (int)ht.size (), n, shstr::refcnt (s), s, shstr::length (s)); |
99 | g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *)s); |
103 | g_slice_free1 (sizeof (int) * 2 + length (s) + 1, -2 + (int *) s); |
100 | } |
104 | } |
101 | else |
105 | else |
102 | ++i; |
106 | ++i; |
103 | } |
107 | } |
104 | |
108 | |
105 | curpos = *i; |
109 | curpos = *i; |
106 | } |
110 | } |
107 | |
111 | |
|
|
112 | shstr skill_names[NUM_SKILLS]; |
|
|
113 | |
|
|
114 | // what weird misoptimisation is this again? |
|
|
115 | const shstr undead_name ("undead"); |
|
|
116 | |
108 | //TODO: this should of course not be here |
117 | //TODO: this should of course not be here |
|
|
118 | |
109 | /* buf_overflow() - we don't want to exceed the buffer size of |
119 | /* buf_overflow() - we don't want to exceed the buffer size of |
110 | * buf1 by adding on buf2! Returns true if overflow will occur. |
120 | * buf1 by adding on buf2! Returns true if overflow will occur. |
111 | */ |
121 | */ |
112 | |
122 | |
113 | int |
123 | int |
114 | buf_overflow (const char *buf1, const char *buf2, int bufsize) |
124 | buf_overflow (const char *buf1, const char *buf2, int bufsize) |
115 | { |
125 | { |
116 | int len1 = 0, len2 = 0; |
126 | int len1 = 0, len2 = 0; |
117 | |
127 | |
118 | if (buf1) |
128 | if (buf1) |
119 | len1 = strlen (buf1); |
129 | len1 = strlen (buf1); |
120 | if (buf2) |
130 | if (buf2) |
121 | len2 = strlen (buf2); |
131 | len2 = strlen (buf2); |
122 | if ((len1 + len2) >= bufsize) |
132 | if ((len1 + len2) >= bufsize) |
123 | return 1; |
|
|
124 | return 0; |
133 | return 1; |
|
|
134 | return 0; |
125 | } |
135 | } |
126 | |
|
|