DEFINTERNALPROP(float, FLOAT);
DEFINTERNALPROP(double, DOUBLE);
DEFINTERNALPROP(const char *, STRING);
+DEFINTERNALPROP(const char[], STRING);
#undef DEFINTERNALPROP
template<>
* may need different kinds of default values (such as epoch for a
* date type). The default value is used when creating new values.
*/
- static const T DefaultValue; // Default for this kind of raw value.
+ static T DefaultValue()
+ {
+ return T();
+ }
/**
// Default values for every type.
////////////////////////////////////////////////////////////////////////
-template<> const bool SGRawValue<bool>::DefaultValue;
-template<> const int SGRawValue<int>::DefaultValue;
-template<> const long SGRawValue<long>::DefaultValue;
-template<> const float SGRawValue<float>::DefaultValue;
-template<> const double SGRawValue<double>::DefaultValue;
-template<> const char * const SGRawValue<const char *>::DefaultValue;
-template<> const SGVec3d SGRawValue<SGVec3d>::DefaultValue;
-template<> const SGVec4d SGRawValue<SGVec4d>::DefaultValue;
+template<> inline bool SGRawValue<bool>::DefaultValue()
+{
+ return false;
+}
+
+template<> inline const char * SGRawValue<const char *>::DefaultValue()
+{
+ return "";
+}
/**
* A raw value bound to a pointer.
*/
virtual T getValue () const {
if (_getter) return (*_getter)();
- else return SGRawValue<T>::DefaultValue;
+ else return SGRawValue<T>::DefaultValue();
}
/**
virtual ~SGRawValueFunctionsIndexed () {}
virtual T getValue () const {
if (_getter) return (*_getter)(_index);
- else return SGRawValue<T>::DefaultValue;
+ else return SGRawValue<T>::DefaultValue();
}
virtual bool setValue (T value) {
if (_setter) { (*_setter)(_index, value); return true; }
virtual ~SGRawValueMethods () {}
virtual T getValue () const {
if (_getter) { return (_obj.*_getter)(); }
- else { return SGRawValue<T>::DefaultValue; }
+ else { return SGRawValue<T>::DefaultValue(); }
}
virtual bool setValue (T value) {
if (_setter) { (_obj.*_setter)(value); return true; }
virtual ~SGRawValueMethodsIndexed () {}
virtual T getValue () const {
if (_getter) { return (_obj.*_getter)(_index); }
- else { return SGRawValue<T>::DefaultValue; }
+ else { return SGRawValue<T>::DefaultValue(); }
}
virtual bool setValue (T value) {
if (_setter) { (_obj.*_setter)(_index, value); return true; }
REMOVED = 8,
TRACE_READ = 16,
TRACE_WRITE = 32,
- USERARCHIVE = 64
+ USERARCHIVE = 64,
+ PRESERVE = 128
+ // beware: if you add another attribute here,
+ // also update value of "LAST_USED_ATTRIBUTE".
};
*/
const char * getName () const { return _name.c_str(); }
+ /**
+ * Get the node's simple name as a string.
+ */
+ const std::string& getNameString () const { return _name; }
+
/**
* Get the node's pretty display name, with subscript when needed.
*/
/**
* Get the number of child nodes.
*/
- int nChildren () const { return _children.size(); }
+ int nChildren () const { return (int)_children.size(); }
/**
/**
* Get a child node by name and index.
*/
- SGPropertyNode * getChild (const char * name, int index = 0,
- bool create = false);
-
- /**
- * Get a child node by name and index.
- */
+ SGPropertyNode * getChild (const char* name, int index = 0,
+ bool create = false);
SGPropertyNode * getChild (const std::string& name, int index = 0,
- bool create = false)
- { return getChild(name.c_str(), index, create); }
-
-
+ bool create = false);
/**
* Get a const child node by name and index.
*/
/**
* Get the path to this node from the root.
*/
- const char * getPath (bool simplify = false) const;
+ std::string getPath (bool simplify = false) const;
/**
bool setValue(const T& val,
typename boost::disable_if_c<simgear::props::PropertyTraits<T>::Internal>
::type* dummy = 0);
+
+ template<int N>
+ bool setValue(const char (&val)[N])
+ {
+ return setValue(&val[0]);
+ }
/**
* Print the value of the property to a stream.
/**
* Get the number of listeners.
*/
- int nListeners () const { return _listeners ? _listeners->size() : 0; }
+ int nListeners () const { return _listeners ? (int)_listeners->size() : 0; }
/**
*/
void clearValue ();
+ /**
+ * Compare two property trees. The property trees are equal if: 1)
+ * They have no children, and have the same type and the values are
+ * equal, or 2) have the same number of children, and the
+ * corresponding children in each tree are equal. "corresponding"
+ * means have the same name and index.
+ *
+ * Attributes, removed children, and aliases aren't considered.
+ */
+ static bool compare (const SGPropertyNode& lhs, const SGPropertyNode& rhs);
protected:
/**
* Protected constructor for making new nodes on demand.
*/
- SGPropertyNode (const char * name, int index, SGPropertyNode * parent);
-
+ SGPropertyNode (const std::string& name, int index, SGPropertyNode * parent);
+ template<typename Itr>
+ SGPropertyNode (Itr begin, Itr end, int index, SGPropertyNode * parent);
private:
- // Get the raw value
+ // Get the raw value
bool get_bool () const;
int get_int () const;
long get_long () const;
double get_double () const;
const char * get_string () const;
- // Set the raw value
+ // Set the raw value
bool set_bool (bool value);
bool set_int (int value);
bool set_long (long value);
*/
void trace_write () const;
-
- /**
- * Remove this node from all nodes that link to it in their path cache.
- */
- void remove_from_path_caches();
-
-
- class hash_table;
-
int _index;
std::string _name;
/// To avoid cyclic reference counting loops this shall not be a reference
SGPropertyNode * _parent;
simgear::PropertyList _children;
simgear::PropertyList _removedChildren;
- std::vector<hash_table *> _linkedNodes;
- mutable std::string _path;
mutable std::string _buffer;
- hash_table * _path_cache;
simgear::props::Type _type;
bool _tied;
int _attr;
- // The right kind of pointer...
+ // The right kind of pointer...
union {
SGPropertyNode * alias;
SGRaw* val;
std::vector<SGPropertyChangeListener *> * _listeners;
-
- /**
- * Register/unregister node that links to this node in its path cache.
- */
- void add_linked_node (hash_table * node) { _linkedNodes.push_back(node); }
- bool remove_linked_node (hash_table * node);
-
-
\f
- /**
- * A very simple hash table.
- */
- class hash_table {
- public:
-
- /**
- * An entry in a bucket in a hash table.
- */
- class entry {
- public:
- entry ();
- ~entry ();
- const char * get_key () { return _key.c_str(); }
- void set_key (const char * key);
- SGPropertyNode * get_value () { return _value; }
- void set_value (SGPropertyNode * value);
- private:
- std::string _key;
- SGSharedPtr<SGPropertyNode> _value;
- };
-
-
- /**
- * A bucket in a hash table.
- */
- class bucket {
- public:
- bucket ();
- ~bucket ();
- entry * get_entry (const char * key, bool create = false);
- bool erase (SGPropertyNode * node);
- void clear (hash_table * owner);
- private:
- int _length;
- entry ** _entries;
- };
-
- friend class bucket;
-
- hash_table ();
- ~hash_table ();
- SGPropertyNode * get (const char * key);
- void put (const char * key, SGPropertyNode * value);
- bool erase (SGPropertyNode * node);
-
- private:
- unsigned int hashcode (const char * key);
- unsigned int _data_length;
- bucket ** _data;
- };
-
+ // Pass name as a pair of iterators
+ template<typename Itr>
+ SGPropertyNode * getChildImpl (Itr begin, Itr end, int index = 0, bool create = false);
+ // very internal method
+ template<typename Itr>
+ SGPropertyNode* getExistingChild (Itr begin, Itr end, int index, bool create);
+ // very internal path parsing function
+ template<typename SplitItr>
+ friend SGPropertyNode* find_node_aux(SGPropertyNode * current, SplitItr& itr,
+ bool create, int last_index);
+ // For boost
+ friend size_t hash_value(const SGPropertyNode& node);
};
// Convenience functions for use in templates
return false;
useDefault = useDefault && hasValue();
- T old_val = SGRawValue<T>::DefaultValue;
+ T old_val = SGRawValue<T>::DefaultValue();
if (useDefault)
old_val = getValue<T>(this);
clearValue();
_type = EXTENDED;
_tied = true;
_value.val = rawValue.clone();
- if (useDefault)
+ if (useDefault) {
+ int save_attributes = getAttributes();
+ setAttribute( WRITE, true );
setValue(old_val);
+ setAttributes( save_attributes );
+ }
return true;
}
if (getAttribute(TRACE_READ))
trace_read();
if (!getAttribute(READ))
- return SGRawValue<T>::DefaultValue;
+ return SGRawValue<T>::DefaultValue();
switch (_type) {
case EXTENDED:
if (_value.val->getType() == PropertyTraits<T>::type_tag)
case UNSPECIFIED:
return simgear::parseString<T>(make_string());
break;
+ default: // avoid compiler warning
+ break;
}
- return SGRawValue<T>::DefaultValue;
+ return SGRawValue<T>::DefaultValue();
}
template<typename T>
}
/**
- * Utility function for creation of a child property node
+ * Utility function for creation of a child property node.
*/
inline SGPropertyNode* makeChild(SGPropertyNode* parent, const char* name,
int index = 0)
{
return parent->getChild(name, index, true);
}
+
+/**
+ * Utility function for creation of a child property node using a
+ * relative path.
+ */
+namespace simgear
+{
+template<typename StringType>
+inline SGPropertyNode* makeNode(SGPropertyNode* parent, const StringType& name)
+{
+ return parent->getNode(name, true);
+}
+}
+
+// For boost::hash
+size_t hash_value(const SGPropertyNode& node);
+
+// Helper comparison and hash functions for common cases
+
+namespace simgear
+{
+namespace props
+{
+struct Compare
+{
+ bool operator()(const SGPropertyNode* lhs, const SGPropertyNode* rhs) const
+ {
+ return SGPropertyNode::compare(*lhs, *rhs);
+ }
+ bool operator()(SGPropertyNode_ptr lhs, const SGPropertyNode* rhs) const
+ {
+ return SGPropertyNode::compare(*lhs, *rhs);
+ }
+ bool operator()(const SGPropertyNode* lhs, SGPropertyNode_ptr rhs) const
+ {
+ return SGPropertyNode::compare(*lhs, *rhs);
+ }
+ bool operator()(SGPropertyNode_ptr lhs, SGPropertyNode_ptr rhs) const
+ {
+ return SGPropertyNode::compare(*lhs, *rhs);
+ }
+};
+
+struct Hash
+{
+ size_t operator()(const SGPropertyNode* node) const
+ {
+ return hash_value(*node);
+ }
+ size_t operator()(SGPropertyNode_ptr node) const
+ {
+ return hash_value(*node);
+ }
+};
+}
+}
#endif // __PROPS_HXX
// end of props.hxx
projects / simgear.git / blobdiff