| … | |
… | |
| 139 | |
139 | |
| 140 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
140 | /* Returns TRUE if every key_values in wants has a partner with the same value in has. */ |
| 141 | static bool |
141 | static bool |
| 142 | compare_ob_value_lists_one (const object *wants, const object *has) |
142 | compare_ob_value_lists_one (const object *wants, const object *has) |
| 143 | { |
143 | { |
| 144 | key_value *wants_field; |
|
|
| 145 | |
|
|
| 146 | /* n-squared behaviour (see get_ob_key_link()), but I'm hoping both |
144 | /* n-squared behaviour (see kv_get), but I'm hoping both |
| 147 | * objects with lists are rare, and lists stay short. If not, use a |
145 | * objects with lists are rare, and lists stay short. If not, use a |
| 148 | * different structure or at least keep the lists sorted... |
146 | * different structure or at least keep the lists sorted... |
| 149 | */ |
147 | */ |
| 150 | |
148 | |
| 151 | /* For each field in wants, */ |
149 | /* For each field in wants, */ |
| 152 | for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next) |
150 | for (key_value *kv = wants->key_values; kv; kv = kv->next) |
| 153 | { |
151 | if (has->kv_get (kv->key) != kv->value) |
| 154 | key_value *has_field; |
152 | return false; |
| 155 | |
|
|
| 156 | /* Look for a field in has with the same key. */ |
|
|
| 157 | has_field = get_ob_key_link (has, wants_field->key); |
|
|
| 158 | |
|
|
| 159 | if (!has_field) |
|
|
| 160 | return 0; /* No field with that name. */ |
|
|
| 161 | |
|
|
| 162 | /* Found the matching field. */ |
|
|
| 163 | if (has_field->value != wants_field->value) |
|
|
| 164 | return 0; /* Values don't match, so this half of the comparison is false. */ |
|
|
| 165 | |
|
|
| 166 | /* If we get here, we found a match. Now for the next field in wants. */ |
|
|
| 167 | } |
|
|
| 168 | |
153 | |
| 169 | /* If we get here, every field in wants has a matching field in has. */ |
154 | /* If we get here, every field in wants has a matching field in has. */ |
| 170 | return 1; |
155 | return true; |
| 171 | } |
156 | } |
| 172 | |
157 | |
| 173 | /* Returns TRUE if ob1 has the same key_values as ob2. */ |
158 | /* Returns TRUE if ob1 has the same key_values as ob2. */ |
| 174 | static bool |
159 | static bool |
| 175 | compare_ob_value_lists (const object *ob1, const object *ob2) |
160 | compare_ob_value_lists (const object *ob1, const object *ob2) |
| 176 | { |
161 | { |
| 177 | /* However, there may be fields in has which aren't partnered in wants, |
162 | /* However, there may be fields in has which aren't partnered in wants, |
| 178 | * so we need to run the comparison *twice*. :( |
163 | * so we need to run the comparison *twice*. :( |
| 179 | */ |
164 | */ |
| 180 | return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1); |
165 | return compare_ob_value_lists_one (ob1, ob2) |
|
|
166 | && compare_ob_value_lists_one (ob2, ob1); |
| 181 | } |
167 | } |
| 182 | |
168 | |
| 183 | /* Function examines the 2 objects given to it, and returns true if |
169 | /* Function examines the 2 objects given to it, and returns true if |
| 184 | * they can be merged together. |
170 | * they can be merged together. |
| 185 | * |
171 | * |
| … | |
… | |
| 2374 | return tmp; |
2360 | return tmp; |
| 2375 | |
2361 | |
| 2376 | return 0; |
2362 | return 0; |
| 2377 | } |
2363 | } |
| 2378 | |
2364 | |
| 2379 | /* If ob has a field named key, return the link from the list, |
2365 | const shstr & |
| 2380 | * otherwise return NULL. |
2366 | object::kv_get (const shstr &key) const |
| 2381 | * |
|
|
| 2382 | * key must be a passed in shared string - otherwise, this won't |
|
|
| 2383 | * do the desired thing. |
|
|
| 2384 | */ |
|
|
| 2385 | key_value * |
|
|
| 2386 | get_ob_key_link (const object *ob, const char *key) |
|
|
| 2387 | { |
2367 | { |
| 2388 | for (key_value *link = ob->key_values; link; link = link->next) |
2368 | for (key_value *kv = key_values; kv; kv = kv->next) |
| 2389 | if (link->key == key) |
2369 | if (kv->key == key) |
| 2390 | return link; |
|
|
| 2391 | |
|
|
| 2392 | return 0; |
|
|
| 2393 | } |
|
|
| 2394 | |
|
|
| 2395 | /* |
|
|
| 2396 | * Returns the value of op has an extra_field for key, or NULL. |
|
|
| 2397 | * |
|
|
| 2398 | * The argument doesn't need to be a shared string. |
|
|
| 2399 | * |
|
|
| 2400 | * The returned string is shared. |
|
|
| 2401 | */ |
|
|
| 2402 | const char * |
|
|
| 2403 | get_ob_key_value (const object *op, const char *const key) |
|
|
| 2404 | { |
|
|
| 2405 | key_value *link; |
|
|
| 2406 | shstr_cmp canonical_key (key); |
|
|
| 2407 | |
|
|
| 2408 | if (!canonical_key) |
|
|
| 2409 | { |
|
|
| 2410 | /* 1. There being a field named key on any object |
|
|
| 2411 | * implies there'd be a shared string to find. |
|
|
| 2412 | * 2. Since there isn't, no object has this field. |
|
|
| 2413 | * 3. Therefore, *this* object doesn't have this field. |
|
|
| 2414 | */ |
|
|
| 2415 | return 0; |
|
|
| 2416 | } |
|
|
| 2417 | |
|
|
| 2418 | /* This is copied from get_ob_key_link() above - |
|
|
| 2419 | * only 4 lines, and saves the function call overhead. |
|
|
| 2420 | */ |
|
|
| 2421 | for (link = op->key_values; link; link = link->next) |
|
|
| 2422 | if (link->key == canonical_key) |
|
|
| 2423 | return link->value; |
2370 | return kv->value; |
| 2424 | |
2371 | |
| 2425 | return 0; |
2372 | return shstr_null; |
| 2426 | } |
2373 | } |
| 2427 | |
2374 | |
| 2428 | /* |
2375 | void |
| 2429 | * Updates the canonical_key in op to value. |
2376 | object::kv_set (const shstr &key, const shstr &value) |
| 2430 | * |
|
|
| 2431 | * canonical_key is a shared string (value doesn't have to be). |
|
|
| 2432 | * |
|
|
| 2433 | * Unless add_key is TRUE, it won't add fields, only change the value of existing |
|
|
| 2434 | * keys. |
|
|
| 2435 | * |
|
|
| 2436 | * Returns TRUE on success. |
|
|
| 2437 | */ |
|
|
| 2438 | int |
|
|
| 2439 | set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key) |
|
|
| 2440 | { |
2377 | { |
| 2441 | key_value *field = NULL, *last = NULL; |
2378 | for (key_value *kv = key_values; kv; kv = kv->next) |
| 2442 | |
2379 | if (kv->key == key) |
| 2443 | for (field = op->key_values; field != NULL; field = field->next) |
|
|
| 2444 | { |
|
|
| 2445 | if (field->key != canonical_key) |
|
|
| 2446 | { |
2380 | { |
| 2447 | last = field; |
2381 | kv->value = value; |
| 2448 | continue; |
2382 | return; |
| 2449 | } |
2383 | } |
| 2450 | |
2384 | |
| 2451 | if (value) |
2385 | key_value *kv = new key_value; |
| 2452 | field->value = value; |
2386 | |
| 2453 | else |
2387 | kv->next = key_values; |
|
|
2388 | kv->key = key; |
|
|
2389 | kv->value = value; |
|
|
2390 | |
|
|
2391 | key_values = kv; |
|
|
2392 | } |
|
|
2393 | |
|
|
2394 | void |
|
|
2395 | object::kv_del (const shstr &key) |
|
|
2396 | { |
|
|
2397 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
|
|
2398 | if ((*kvp)->key == key) |
| 2454 | { |
2399 | { |
| 2455 | /* Basically, if the archetype has this key set, |
2400 | key_value *kv = *kvp; |
| 2456 | * we need to store the null value so when we save |
2401 | *kvp = (*kvp)->next; |
| 2457 | * it, we save the empty value so that when we load, |
2402 | delete kv; |
| 2458 | * we get this value back again. |
2403 | return; |
| 2459 | */ |
|
|
| 2460 | if (get_ob_key_link (op->arch, canonical_key)) |
|
|
| 2461 | field->value = 0; |
|
|
| 2462 | else |
|
|
| 2463 | { |
|
|
| 2464 | if (last) |
|
|
| 2465 | last->next = field->next; |
|
|
| 2466 | else |
|
|
| 2467 | op->key_values = field->next; |
|
|
| 2468 | |
|
|
| 2469 | delete field; |
|
|
| 2470 | } |
|
|
| 2471 | } |
2404 | } |
| 2472 | return TRUE; |
|
|
| 2473 | } |
|
|
| 2474 | /* IF we get here, key doesn't exist */ |
|
|
| 2475 | |
|
|
| 2476 | /* No field, we'll have to add it. */ |
|
|
| 2477 | |
|
|
| 2478 | if (!add_key) |
|
|
| 2479 | return FALSE; |
|
|
| 2480 | |
|
|
| 2481 | /* There isn't any good reason to store a null |
|
|
| 2482 | * value in the key/value list. If the archetype has |
|
|
| 2483 | * this key, then we should also have it, so shouldn't |
|
|
| 2484 | * be here. If user wants to store empty strings, |
|
|
| 2485 | * should pass in "" |
|
|
| 2486 | */ |
|
|
| 2487 | if (value == NULL) |
|
|
| 2488 | return TRUE; |
|
|
| 2489 | |
|
|
| 2490 | field = new key_value; |
|
|
| 2491 | |
|
|
| 2492 | field->key = canonical_key; |
|
|
| 2493 | field->value = value; |
|
|
| 2494 | /* Usual prepend-addition. */ |
|
|
| 2495 | field->next = op->key_values; |
|
|
| 2496 | op->key_values = field; |
|
|
| 2497 | |
|
|
| 2498 | return TRUE; |
|
|
| 2499 | } |
|
|
| 2500 | |
|
|
| 2501 | /* |
|
|
| 2502 | * Updates the key in op to value. |
|
|
| 2503 | * |
|
|
| 2504 | * If add_key is FALSE, this will only update existing keys, |
|
|
| 2505 | * and not add new ones. |
|
|
| 2506 | * In general, should be little reason FALSE is ever passed in for add_key |
|
|
| 2507 | * |
|
|
| 2508 | * Returns TRUE on success. |
|
|
| 2509 | */ |
|
|
| 2510 | int |
|
|
| 2511 | set_ob_key_value (object *op, const char *key, const char *value, int add_key) |
|
|
| 2512 | { |
|
|
| 2513 | shstr key_ (key); |
|
|
| 2514 | |
|
|
| 2515 | return set_ob_key_value_s (op, key_, value, add_key); |
|
|
| 2516 | } |
2405 | } |
| 2517 | |
2406 | |
| 2518 | object::depth_iterator::depth_iterator (object *container) |
2407 | object::depth_iterator::depth_iterator (object *container) |
| 2519 | : iterator_base (container) |
2408 | : iterator_base (container) |
| 2520 | { |
2409 | { |
