diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-02-13 13:05:25 +0100 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-02-13 13:09:52 +0100 |
commit | 4b7fd9b1cdf66084ab042a72532033256cfdda21 (patch) | |
tree | fc680bbd1ebb23d9ee3fadc6e01e449f25c0d946 /vespalib | |
parent | dddef22872d8cae1674e21e0a1b88f33535ce551 (diff) |
rename insert -> resolve
* calling insert(symbol_name) on a cursor would not necessarily lead
to the symbol_name being present in the symbol table, so rename
method to resolve(symbol_name) instead.
Diffstat (limited to 'vespalib')
7 files changed, 7 insertions, 7 deletions
diff --git a/vespalib/src/vespa/vespalib/data/slime/array_value.cpp b/vespalib/src/vespa/vespalib/data/slime/array_value.cpp index 03126e9b725..2d0f9ce0f54 100644 --- a/vespalib/src/vespa/vespalib/data/slime/array_value.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/array_value.cpp @@ -27,7 +27,7 @@ ArrayValue::addObject() { } Symbol -ArrayValue::insert(Memory symbol_name) { return _symbolTable.insert(symbol_name); } +ArrayValue::resolve(Memory symbol_name) { return _symbolTable.insert(symbol_name); } } // namespace vespalib::slime } // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/array_value.h b/vespalib/src/vespa/vespalib/data/slime/array_value.h index c6489f2a122..6d5178c39c3 100644 --- a/vespalib/src/vespa/vespalib/data/slime/array_value.h +++ b/vespalib/src/vespa/vespalib/data/slime/array_value.h @@ -49,7 +49,7 @@ public: virtual Cursor &addArray(); virtual Cursor &addObject(); - virtual Symbol insert(Memory symbol_name); + virtual Symbol resolve(Memory symbol_name); virtual ~ArrayValue() { } }; diff --git a/vespalib/src/vespa/vespalib/data/slime/cursor.h b/vespalib/src/vespa/vespalib/data/slime/cursor.h index 1e91105a359..cebb05a44ee 100644 --- a/vespalib/src/vespa/vespalib/data/slime/cursor.h +++ b/vespalib/src/vespa/vespalib/data/slime/cursor.h @@ -39,7 +39,7 @@ struct Cursor : public Inspector { virtual Cursor &setArray(Memory name) = 0; virtual Cursor &setObject(Memory name) = 0; - virtual Symbol insert(Memory symbol_name) = 0; + virtual Symbol resolve(Memory symbol_name) = 0; }; } // namespace vespalib::slime diff --git a/vespalib/src/vespa/vespalib/data/slime/object_value.cpp b/vespalib/src/vespa/vespalib/data/slime/object_value.cpp index 9548cb1f546..344448473d3 100644 --- a/vespalib/src/vespa/vespalib/data/slime/object_value.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/object_value.cpp @@ -74,7 +74,7 @@ ObjectValue::setObject(Memory name) { } Symbol -ObjectValue::insert(Memory symbol_name) { return _symbolTable.insert(symbol_name); } +ObjectValue::resolve(Memory symbol_name) { return _symbolTable.insert(symbol_name); } } // namespace vespalib::slime } // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/object_value.h b/vespalib/src/vespa/vespalib/data/slime/object_value.h index 8ab81bfcf60..fc647caca1b 100644 --- a/vespalib/src/vespa/vespalib/data/slime/object_value.h +++ b/vespalib/src/vespa/vespalib/data/slime/object_value.h @@ -79,7 +79,7 @@ public: virtual Cursor &setArray(Memory name); virtual Cursor &setObject(Memory name); - virtual Symbol insert(Memory symbol_name); + virtual Symbol resolve(Memory symbol_name); virtual ~ObjectValue() { } }; diff --git a/vespalib/src/vespa/vespalib/data/slime/value.cpp b/vespalib/src/vespa/vespalib/data/slime/value.cpp index 804a0fc4b63..595cb0d4276 100644 --- a/vespalib/src/vespa/vespalib/data/slime/value.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/value.cpp @@ -138,7 +138,7 @@ Cursor & Value::setObject(Memory) { return *NixValue::invalid(); } Symbol -Value::insert(Memory) { return Symbol(); } +Value::resolve(Memory) { return Symbol(); } } // namespace vespalib::slime } // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/value.h b/vespalib/src/vespa/vespalib/data/slime/value.h index 51564d99472..0324ae8d49a 100644 --- a/vespalib/src/vespa/vespalib/data/slime/value.h +++ b/vespalib/src/vespa/vespalib/data/slime/value.h @@ -78,7 +78,7 @@ public: virtual Cursor &setArray(Memory name); virtual Cursor &setObject(Memory name); - virtual Symbol insert(Memory symbol_name); + virtual Symbol resolve(Memory symbol_name); }; } // namespace vespalib::slime |