X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fmisc%2Fprops.cxx;h=8fbbbd585f7952ec14bcca81b45057203516b854;hb=101fdb359871a14726a83cdb5a8bb2c0f6ee5af1;hp=1fbfb31100f3c93dcd08171d54808cfc983185fc;hpb=c16b9ed25b9c8d7229153787aa1492e4ea37b61e;p=simgear.git

diff --git a/simgear/misc/props.cxx b/simgear/misc/props.cxx
index 1fbfb311..8fbbbd58 100644
--- a/simgear/misc/props.cxx
+++ b/simgear/misc/props.cxx
@@ -6,20 +6,28 @@
 //
 // $Id$
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "props.hxx"
 
-#include <simgear/compiler.h>
+#if PROPS_STANDALONE
+
+#include <iostream>
+using std::cerr;
+using std::endl;
+using std::sort;
+
+#else
 
-#include <stdio.h>
-#include <stdlib.h>
-#include STL_IOSTREAM
 #include <algorithm>
-#include "props.hxx"
+#include <simgear/compiler.h>
+#include <simgear/debug/logstream.hxx>
 
 SG_USING_STD(sort);
 
+#endif
+
+#include <stdio.h>
+#include <string.h>
+
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -43,19 +51,8 @@ public:
 // Convenience macros for value access.
 ////////////////////////////////////////////////////////////////////////
 
-#define GET_BOOL (_value.bool_val->getValue())
-#define GET_INT (_value.int_val->getValue())
-#define GET_LONG (_value.long_val->getValue())
-#define GET_FLOAT (_value.float_val->getValue())
-#define GET_DOUBLE (_value.double_val->getValue())
-#define GET_STRING (_value.string_val->getValue())
-
-#define SET_BOOL(val) (_value.bool_val->setValue(val))
-#define SET_INT(val) (_value.int_val->setValue(val))
-#define SET_LONG(val) (_value.long_val->setValue(val))
-#define SET_FLOAT(val) (_value.float_val->setValue(val))
-#define SET_DOUBLE(val) (_value.double_val->setValue(val))
-#define SET_STRING(val) (_value.string_val->setValue(val))
+#define TEST_READ(dflt) if (!getAttribute(READ)) return dflt
+#define TEST_WRITE if (!getAttribute(WRITE)) return false
 
 
 
@@ -68,7 +65,7 @@ const int SGRawValue<int>::DefaultValue = 0;
 const long SGRawValue<long>::DefaultValue = 0L;
 const float SGRawValue<float>::DefaultValue = 0.0;
 const double SGRawValue<double>::DefaultValue = 0.0L;
-const string SGRawValue<string>::DefaultValue = "";
+const char * const SGRawValue<const char *>::DefaultValue = "";
 
 
 
@@ -90,7 +87,7 @@ struct PathComponent
  *
  * Name: [_a-zA-Z][-._a-zA-Z0-9]*
  */
-static inline string
+static inline const string
 parse_name (const string &path, int &i)
 {
   string name = "";
@@ -218,16 +215,34 @@ parse_path (const string &path, vector<PathComponent> &components)
 ////////////////////////////////////////////////////////////////////////
 
 
+static const char *
+copy_string (const char * s)
+{
+				// FIXME: potential buffer overflow.
+				// For some reason, strnlen and
+				// strncpy cause all kinds of crashes.
+  string str = s;
+  char * copy = new char[str.size() + 1];
+  strcpy(copy, str.c_str());
+  return copy;
+}
+
+static bool
+compare_strings (const char * s1, const char * s2)
+{
+  return !strncmp(s1, s2, SGPropertyNode::MAX_STRING_LEN);
+}
+
 /**
  * Locate a child node by name and index.
  */
 static int
-find_child (const string &name, int index, vector<SGPropertyNode *> nodes)
+find_child (const char * name, int index, vector<SGPropertyNode *> nodes)
 {
   int nNodes = nodes.size();
   for (int i = 0; i < nNodes; i++) {
     SGPropertyNode * node = nodes[i];
-    if (node->getName() == name && node->getIndex() == index)
+    if (compare_strings(node->getName(), name) && node->getIndex() == index)
       return i;
   }
   return -1;
@@ -275,7 +290,7 @@ find_node (SGPropertyNode * current,
 				// Otherwise, a child name
   else {
     SGPropertyNode * child =
-      current->getChild(components[position].name,
+      current->getChild(components[position].name.c_str(),
 			components[position].index,
 			create);
     return find_node(child, components, position + 1, create);
@@ -285,1235 +300,1284 @@ find_node (SGPropertyNode * current,
 
 
 ////////////////////////////////////////////////////////////////////////
-// Implementation of SGValue.
+// Private methods from SGPropertyNode (may be inlined for speed).
 ////////////////////////////////////////////////////////////////////////
 
+inline bool
+SGPropertyNode::get_bool () const
+{
+  if (_tied)
+    return _value.bool_val->getValue();
+  else
+    return _local_val.bool_val;
+}
 
-/**
- * Default constructor.
- *
- * The type will be UNKNOWN and the raw value will be "".
- */
-SGValue::SGValue ()
-  : _type(UNKNOWN), _tied(false)
+inline int
+SGPropertyNode::get_int () const
 {
-  _value.string_val = new SGRawValueInternal<string>;
+  if (_tied)
+    return _value.int_val->getValue();
+  else
+    return _local_val.int_val;
 }
 
+inline long
+SGPropertyNode::get_long () const
+{
+  if (_tied)
+    return _value.long_val->getValue();
+  else
+    return _local_val.long_val;
+}
 
-/**
- * Copy constructor.
- */
-SGValue::SGValue (const SGValue &source)
+inline float
+SGPropertyNode::get_float () const
+{
+  if (_tied)
+    return _value.float_val->getValue();
+  else
+    return _local_val.float_val;
+}
+
+inline double
+SGPropertyNode::get_double () const
+{
+  if (_tied)
+    return _value.double_val->getValue();
+  else
+    return _local_val.double_val;
+}
+
+inline const char *
+SGPropertyNode::get_string () const
+{
+  if (_tied)
+    return _value.string_val->getValue();
+  else
+    return _local_val.string_val;
+}
+
+inline bool
+SGPropertyNode::set_bool (bool val)
+{
+  if (_tied) {
+    return _value.bool_val->setValue(val);
+  } else {
+    _local_val.bool_val = val;
+    return true;
+  }
+}
+
+inline bool
+SGPropertyNode::set_int (int val)
+{
+  if (_tied) {
+    return _value.int_val->setValue(val);
+  } else {
+    _local_val.int_val = val;
+    return true;
+  }
+}
+
+inline bool
+SGPropertyNode::set_long (long val)
+{
+  if (_tied) {
+    return _value.long_val->setValue(val);
+  } else {
+    _local_val.long_val = val;
+    return true;
+  }
+}
+
+inline bool
+SGPropertyNode::set_float (float val)
+{
+  if (_tied) {
+    return _value.float_val->setValue(val);
+  } else {
+    _local_val.float_val = val;
+    return true;
+  }
+}
+
+inline bool
+SGPropertyNode::set_double (double val)
 {
-  _type = source._type;
-  _tied = source._tied;
-  switch (source._type) {
+  if (_tied) {
+    return _value.double_val->setValue(val);
+  } else {
+    _local_val.double_val = val;
+    return true;
+  }
+}
+
+inline bool
+SGPropertyNode::set_string (const char * val)
+{
+  if (_tied) {
+    return _value.string_val->setValue(val);
+  } else {
+    delete (char *)_local_val.string_val;
+    _local_val.string_val = copy_string(val);
+    return true;
+  }
+}
+
+void
+SGPropertyNode::clear_value ()
+{
+  switch (_type) {
+  case NONE:
+    break;
   case ALIAS:
-				// FIXME!!!
-    _value.alias = (SGValue *)(source.getAlias());
+    _value.alias = 0;
     break;
   case BOOL:
-    _value.bool_val = source._value.bool_val->clone();
+    if (_tied) {
+      delete _value.bool_val;
+      _value.bool_val = 0;
+    }
+    _local_val.bool_val = SGRawValue<bool>::DefaultValue;
     break;
   case INT:
-    _value.int_val = source._value.int_val->clone();
+    if (_tied) {
+      delete _value.int_val;
+      _value.int_val = 0;
+    }
+    _local_val.int_val = SGRawValue<int>::DefaultValue;
     break;
   case LONG:
-    _value.long_val = source._value.long_val->clone();
+    if (_tied) {
+      delete _value.long_val;
+      _value.long_val = 0L;
+    }
+    _local_val.long_val = SGRawValue<long>::DefaultValue;
     break;
   case FLOAT:
-    _value.float_val = source._value.float_val->clone();
+    if (_tied) {
+      delete _value.float_val;
+      _value.float_val = 0;
+    }
+    _local_val.float_val = SGRawValue<float>::DefaultValue;
     break;
   case DOUBLE:
-    _value.double_val = source._value.double_val->clone();
+    if (_tied) {
+      delete _value.double_val;
+      _value.double_val = 0;
+    }
+    _local_val.double_val = SGRawValue<double>::DefaultValue;
     break;
   case STRING:
-  case UNKNOWN:
-    _value.string_val = source._value.string_val->clone();
+  case UNSPECIFIED:
+    if (_tied) {
+      delete _value.string_val;
+      _value.string_val = 0;
+    } else {
+      delete (char *)_local_val.string_val;
+    }
+    _local_val.string_val = 0;
     break;
   }
+  _tied = false;
+  _type = NONE;
 }
 
 
 /**
- * Destructor.
+ * Get the value as a string.
  */
-SGValue::~SGValue ()
+const char *
+SGPropertyNode::make_string () const
 {
-  if (_type != ALIAS)
-    clear_value();
+  if (!getAttribute(READ))
+    return "";
+
+  switch (_type) {
+  case ALIAS:
+    return _value.alias->getStringValue();
+  case BOOL:
+    if (get_bool())
+      return "true";
+    else
+      return "false";
+  case INT:
+    sprintf(_buffer, "%d", get_int());
+    return _buffer;
+  case LONG:
+    sprintf(_buffer, "%ld", get_long());
+    return _buffer;
+  case FLOAT:
+    sprintf(_buffer, "%f", get_float());
+    return _buffer;
+  case DOUBLE:
+    sprintf(_buffer, "%f", get_double());
+    return _buffer;
+  case STRING:
+  case UNSPECIFIED:
+    return get_string();
+  case NONE:
+  default:
+    return "";
+  }
 }
 
+/**
+ * Trace a write access for a property.
+ */
+void
+SGPropertyNode::trace_write () const
+{
+#if PROPS_STANDALONE
+  cerr << "TRACE: Write node " << getPath () << ", value\""
+       << make_string() << '"' << endl;
+#else
+  SG_LOG(SG_GENERAL, SG_INFO, "TRACE: Write node " << getPath()
+	 << ", value\"" << make_string() << '"');
+#endif
+}
 
 /**
- * Delete and clear the current value.
+ * Trace a read access for a property.
  */
 void
-SGValue::clear_value ()
+SGPropertyNode::trace_read () const
+{
+#if PROPS_STANDALONE
+  cerr << "TRACE: Write node " << getPath () << ", value \""
+       << make_string() << '"' << endl;
+#else
+  SG_LOG(SG_GENERAL, SG_INFO, "TRACE: Read node " << getPath()
+	 << ", value \"" << make_string() << '"');
+#endif
+}
+
+
+
+////////////////////////////////////////////////////////////////////////
+// Public methods from SGPropertyNode.
+////////////////////////////////////////////////////////////////////////
+
+/**
+ * Default constructor: always creates a root node.
+ */
+SGPropertyNode::SGPropertyNode ()
+  : _name(copy_string("")),
+    _index(0),
+    _parent(0),
+    _path_cache(0),
+    _type(NONE),
+    _tied(false),
+    _attr(READ|WRITE)
+{
+  _local_val.string_val = 0;
+}
+
+
+/**
+ * Copy constructor.
+ */
+SGPropertyNode::SGPropertyNode (const SGPropertyNode &node)
+  : _index(node._index),
+    _parent(0),			// don't copy the parent
+    _path_cache(0),
+    _type(node._type),
+    _tied(node._tied),
+    _attr(node._attr)
 {
+  _name = copy_string(node._name);
+  _local_val.string_val = 0;
   switch (_type) {
+  case NONE:
+    break;
   case ALIAS:
-    _value.alias->clear_value();
+    _value.alias = node._value.alias;
+    _tied = false;
+    break;
   case BOOL:
-    delete _value.bool_val;
-    _value.bool_val = 0;
+    if (_tied) {
+      _tied = true;
+      _value.bool_val = node._value.bool_val->clone();
+    } else {
+      _tied = false;
+      set_bool(node.get_bool());
+    }
     break;
   case INT:
-    delete _value.int_val;
-    _value.int_val = 0;
+    if (_tied) {
+      _tied = true;
+      _value.int_val = node._value.int_val->clone();
+    } else {
+      _tied = false;
+      set_int(node.get_int());
+    }
     break;
   case LONG:
-    delete _value.long_val;
-    _value.long_val = 0L;
+    if (_tied) {
+      _tied = true;
+      _value.long_val = node._value.long_val->clone();
+    } else {
+      _tied = false;
+      set_long(node.get_long());
+    }
     break;
   case FLOAT:
-    delete _value.float_val;
-    _value.float_val = 0;
+    if (_tied) {
+      _tied = true;
+      _value.float_val = node._value.float_val->clone();
+    } else {
+      _tied = false;
+      set_float(node.get_float());
+    }
     break;
   case DOUBLE:
-    delete _value.double_val;
-    _value.double_val = 0;
+    if (_tied) {
+      _tied = true;
+      _value.double_val = node._value.double_val->clone();
+    } else {
+      _tied = false;
+      set_double(node.get_double());
+    }
     break;
   case STRING:
-  case UNKNOWN:
-    delete _value.string_val;
-    _value.string_val = 0;
+  case UNSPECIFIED:
+    if (_tied) {
+      _tied = true;
+      _value.string_val = node._value.string_val->clone();
+    } else {
+      _tied = false;
+      set_string(node.get_string());
+    }
     break;
   }
 }
 
 
 /**
- * Get the current type.
- *
- * Does not return a type of ALIAS.
+ * Convenience constructor.
  */
-SGValue::Type
-SGValue::getType () const
+SGPropertyNode::SGPropertyNode (const char * name,
+				int index,
+				SGPropertyNode * parent)
+  : _index(index),
+    _parent(parent),
+    _path_cache(0),
+    _type(NONE),
+    _tied(false),
+    _attr(READ|WRITE)
 {
-  if (_type == ALIAS)
-    return _value.alias->getType();
-  else
-    return (Type)_type;
+  _name = copy_string(name);
+  _local_val.string_val = 0;
 }
 
 
 /**
- * Get the current aliased value.
+ * Destructor.
  */
-SGValue *
-SGValue::getAlias ()
+SGPropertyNode::~SGPropertyNode ()
 {
-  return (_type == ALIAS ? _value.alias : 0);
+  delete (char *)_name;
+  for (int i = 0; i < (int)_children.size(); i++) {
+    delete _children[i];
+  }
+//   delete _path_cache;
+  clear_value();
 }
 
 
 /**
- * Get the current aliased value.
+ * Alias to another node.
  */
-const SGValue *
-SGValue::getAlias () const
+bool
+SGPropertyNode::alias (SGPropertyNode * target)
 {
-  return (_type == ALIAS ? _value.alias : 0);
+  if (target == 0 || _type == ALIAS || _tied)
+    return false;
+  clear_value();
+  _value.alias = target;
+  _type = ALIAS;
+  return true;
 }
 
 
 /**
- * Alias to another value.
+ * Alias to another node by path.
  */
 bool
-SGValue::alias (SGValue * alias)
+SGPropertyNode::alias (const char * path)
 {
-  if (alias == 0 || _type == ALIAS || _tied)
-    return false;
-  clear_value();
-  _value.alias = alias;
-  _type = ALIAS;
-  return true;
+  return alias(getNode(path, true));
 }
 
 
 /**
- * Unalias from another value.
+ * Remove an alias.
  */
 bool
-SGValue::unalias ()
+SGPropertyNode::unalias ()
 {
-				// FIXME: keep copy of previous value,
-				// as with untie()
   if (_type != ALIAS)
     return false;
-  _value.string_val = new SGRawValueInternal<string>;
-  _type = UNKNOWN;
+  _type = NONE;
+  _value.alias = 0;
   return true;
 }
 
 
 /**
- * Get a boolean value.
+ * Get the target of an alias.
  */
-bool
-SGValue::getBoolValue () const
+SGPropertyNode *
+SGPropertyNode::getAliasTarget ()
 {
-  switch (_type) {
-  case ALIAS:
-    return _value.alias->getBoolValue();
-  case BOOL:
-    return GET_BOOL;
-  case INT:
-    return GET_INT == 0 ? false : true;
-  case LONG:
-    return GET_LONG == 0L ? false : true;
-  case FLOAT:
-    return GET_FLOAT == 0.0 ? false : true;
-  case DOUBLE:
-    return GET_DOUBLE == 0.0L ? false : true;
-  case STRING:
-  case UNKNOWN:
-    return (GET_STRING == "true" || getDoubleValue() != 0.0L);
-  }
+  return (_type == ALIAS ? _value.alias : 0);
+}
+
 
-  return false;
+const SGPropertyNode *
+SGPropertyNode::getAliasTarget () const
+{
+  return (_type == ALIAS ? _value.alias : 0);
 }
 
 
 /**
- * Get an integer value.
+ * Get a non-const child by index.
  */
-int
-SGValue::getIntValue () const
+SGPropertyNode *
+SGPropertyNode::getChild (int position)
 {
-  switch (_type) {
-  case ALIAS:
-    return _value.alias->getIntValue();
-  case BOOL:
-    return int(GET_BOOL);
-  case INT:
-    return GET_INT;
-  case LONG:
-    return int(GET_LONG);
-  case FLOAT:
-    return int(GET_FLOAT);
-  case DOUBLE:
-    return int(GET_DOUBLE);
-  case STRING:
-  case UNKNOWN:
-    return atoi(GET_STRING.c_str());
-  }
-
-  return 0;
+  if (position >= 0 && position < nChildren())
+    return _children[position];
+  else
+    return 0;
 }
 
 
 /**
- * Get a long integer value.
+ * Get a const child by index.
  */
-long
-SGValue::getLongValue () const
+const SGPropertyNode *
+SGPropertyNode::getChild (int position) const
 {
-  switch (_type) {
-  case ALIAS:
-    return _value.alias->getLongValue();
-  case BOOL:
-    return long(GET_BOOL);
-  case INT:
-    return long(GET_INT);
-  case LONG:
-    return GET_LONG;
-  case FLOAT:
-    return long(GET_FLOAT);
-  case DOUBLE:
-    return long(GET_DOUBLE);
-  case STRING:
-  case UNKNOWN:
-    return strtol(GET_STRING.c_str(), 0, 0);
-  }
+  if (position >= 0 && position < nChildren())
+    return _children[position];
+  else
+    return 0;
 }
 
 
 /**
- * Get a float value.
+ * Get a non-const child by name and index, creating if necessary.
  */
-float
-SGValue::getFloatValue () const
+SGPropertyNode *
+SGPropertyNode::getChild (const char * name, int index, bool create)
 {
-  switch (_type) {
-  case ALIAS:
-    return _value.alias->getFloatValue();
-  case BOOL:
-    return float(GET_BOOL);
-  case INT:
-    return float(GET_INT);
-  case LONG:
-    return float(GET_LONG);
-  case FLOAT:
-    return GET_FLOAT;
-  case DOUBLE:
-    return float(GET_DOUBLE);
-  case STRING:
-  case UNKNOWN:
-    return atof(GET_STRING.c_str());
+  int pos = find_child(name, index, _children);
+  if (pos >= 0) {
+    return _children[pos];
+  } else if (create) {
+    _children.push_back(new SGPropertyNode(name, index, this));
+    return _children[_children.size()-1];
+  } else {
+    return 0;
   }
-
-  return 0.0;
 }
 
 
 /**
- * Get a double value.
+ * Get a const child by name and index.
  */
-double
-SGValue::getDoubleValue () const
+const SGPropertyNode *
+SGPropertyNode::getChild (const char * name, int index) const
 {
-  switch (_type) {
-  case ALIAS:
-    return _value.alias->getDoubleValue();
-  case BOOL:
-    return double(GET_BOOL);
-  case INT:
-    return double(GET_INT);
+  int pos = find_child(name, index, _children);
+  if (pos >= 0)
+    return _children[pos];
+  else
+    return 0;
+}
+
+
+/**
+ * Get all children with the same name (but different indices).
+ */
+vector<SGPropertyNode *>
+SGPropertyNode::getChildren (const char * name)
+{
+  vector<SGPropertyNode *> children;
+  int max = _children.size();
+
+  for (int i = 0; i < max; i++)
+    if (compare_strings(_children[i]->getName(), name))
+      children.push_back(_children[i]);
+
+  sort(children.begin(), children.end(), CompareIndices());
+  return children;
+}
+
+
+/**
+ * Get all children const with the same name (but different indices).
+ */
+vector<const SGPropertyNode *>
+SGPropertyNode::getChildren (const char * name) const
+{
+  vector<const SGPropertyNode *> children;
+  int max = _children.size();
+
+  for (int i = 0; i < max; i++)
+    if (compare_strings(_children[i]->getName(), name))
+      children.push_back(_children[i]);
+
+  sort(children.begin(), children.end(), CompareIndices());
+  return children;
+}
+
+
+const char *
+SGPropertyNode::getPath (bool simplify) const
+{
+  if (_parent == 0)
+    return "";
+
+  string path = _parent->getPath(simplify);
+  path += '/';
+  path += _name;
+  if (_index != 0 || !simplify) {
+    char buffer[128];
+    sprintf(buffer, "[%d]", _index);
+    path += buffer;
+  }
+  return path.c_str();
+}
+
+SGPropertyNode::Type
+SGPropertyNode::getType () const
+{
+  if (_type == ALIAS)
+    return _value.alias->getType();
+  else
+    return _type;
+}
+
+
+bool 
+SGPropertyNode::getBoolValue () const
+{
+				// Shortcut for common case
+  if (_attr == (READ|WRITE) && _type == BOOL)
+    return get_bool();
+
+  if (getAttribute(TRACE_READ))
+    trace_read();
+  if (!getAttribute(READ))
+    return SGRawValue<bool>::DefaultValue;
+  switch (_type) {
+  case ALIAS:
+    return _value.alias->getBoolValue();
+  case BOOL:
+    return get_bool();
+  case INT:
+    return get_int() == 0 ? false : true;
   case LONG:
-    return double(GET_LONG);
+    return get_long() == 0L ? false : true;
   case FLOAT:
-    return double(GET_FLOAT);
+    return get_float() == 0.0 ? false : true;
   case DOUBLE:
-    return GET_DOUBLE;
+    return get_double() == 0.0L ? false : true;
   case STRING:
-  case UNKNOWN:
-    return strtod(GET_STRING.c_str(), 0);
+  case UNSPECIFIED:
+    return (compare_strings(get_string(), "true") || getDoubleValue() != 0.0L);
+  case NONE:
+  default:
+    return SGRawValue<bool>::DefaultValue;
   }
+}
+
+int 
+SGPropertyNode::getIntValue () const
+{
+				// Shortcut for common case
+  if (_attr == (READ|WRITE) && _type == INT)
+    return get_int();
 
-  return 0.0;
+  if (getAttribute(TRACE_READ))
+    trace_read();
+  if (!getAttribute(READ))
+    return SGRawValue<int>::DefaultValue;
+  switch (_type) {
+  case ALIAS:
+    return _value.alias->getIntValue();
+  case BOOL:
+    return int(get_bool());
+  case INT:
+    return get_int();
+  case LONG:
+    return int(get_long());
+  case FLOAT:
+    return int(get_float());
+  case DOUBLE:
+    return int(get_double());
+  case STRING:
+  case UNSPECIFIED:
+    return atoi(get_string());
+  case NONE:
+  default:
+    return SGRawValue<int>::DefaultValue;
+  }
 }
 
+long 
+SGPropertyNode::getLongValue () const
+{
+				// Shortcut for common case
+  if (_attr == (READ|WRITE) && _type == LONG)
+    return get_long();
 
-/**
- * Get a string value.
- */
-string
-SGValue::getStringValue () const
+  if (getAttribute(TRACE_READ))
+    trace_read();
+  if (!getAttribute(READ))
+    return SGRawValue<long>::DefaultValue;
+  switch (_type) {
+  case ALIAS:
+    return _value.alias->getLongValue();
+  case BOOL:
+    return long(get_bool());
+  case INT:
+    return long(get_int());
+  case LONG:
+    return get_long();
+  case FLOAT:
+    return long(get_float());
+  case DOUBLE:
+    return long(get_double());
+  case STRING:
+  case UNSPECIFIED:
+    return strtol(get_string(), 0, 0);
+  case NONE:
+  default:
+    return SGRawValue<long>::DefaultValue;
+  }
+}
+
+float 
+SGPropertyNode::getFloatValue () const
 {
-  char buf[128];
+				// Shortcut for common case
+  if (_attr == (READ|WRITE) && _type == FLOAT)
+    return get_float();
 
+  if (getAttribute(TRACE_READ))
+    trace_read();
+  if (!getAttribute(READ))
+    return SGRawValue<float>::DefaultValue;
   switch (_type) {
   case ALIAS:
-    return _value.alias->getStringValue();
+    return _value.alias->getFloatValue();
   case BOOL:
-    if (GET_BOOL)
-      return "true";
-    else
-      return "false";
+    return float(get_bool());
   case INT:
-    sprintf(buf, "%d", GET_INT);
-    return buf;
+    return float(get_int());
   case LONG:
-    sprintf(buf, "%ld", GET_LONG);
-    return buf;
+    return float(get_long());
   case FLOAT:
-    sprintf(buf, "%f", GET_FLOAT);
-    return buf;
+    return get_float();
   case DOUBLE:
-    sprintf(buf, "%f", GET_DOUBLE);
-    return buf;
+    return float(get_double());
   case STRING:
-  case UNKNOWN:
-    return GET_STRING;
+  case UNSPECIFIED:
+    return atof(get_string());
+  case NONE:
+  default:
+    return SGRawValue<float>::DefaultValue;
   }
+}
 
-  return "";
+double 
+SGPropertyNode::getDoubleValue () const
+{
+				// Shortcut for common case
+  if (_attr == (READ|WRITE) && _type == DOUBLE)
+    return get_double();
+
+  if (getAttribute(TRACE_READ))
+    trace_read();
+  if (!getAttribute(READ))
+    return SGRawValue<double>::DefaultValue;
+
+  switch (_type) {
+  case ALIAS:
+    return _value.alias->getDoubleValue();
+  case BOOL:
+    return double(get_bool());
+  case INT:
+    return double(get_int());
+  case LONG:
+    return double(get_long());
+  case FLOAT:
+    return double(get_float());
+  case DOUBLE:
+    return get_double();
+  case STRING:
+  case UNSPECIFIED:
+    return strtod(get_string(), 0);
+  case NONE:
+  default:
+    return SGRawValue<double>::DefaultValue;
+  }
 }
 
+const char *
+SGPropertyNode::getStringValue () const
+{
+				// Shortcut for common case
+  if (_attr == (READ|WRITE) && _type == STRING)
+    return get_string();
+
+  if (getAttribute(TRACE_READ))
+    trace_read();
+  if (!getAttribute(READ))
+    return SGRawValue<const char *>::DefaultValue;
+  return make_string();
+}
 
-/**
- * Set a bool value.
- */
 bool
-SGValue::setBoolValue (bool value)
+SGPropertyNode::setBoolValue (bool value)
 {
-  if (_type == UNKNOWN) {
+				// Shortcut for common case
+  if (_attr == (READ|WRITE) && _type == BOOL)
+    return set_bool(value);
+
+  bool result = false;
+  TEST_WRITE;
+  if (_type == NONE || _type == UNSPECIFIED) {
     clear_value();
-    _value.bool_val = new SGRawValueInternal<bool>;
+    _tied = false;
     _type = BOOL;
   }
 
   switch (_type) {
   case ALIAS:
-    return _value.alias->setBoolValue(value);
+    result = _value.alias->setBoolValue(value);
+    break;
   case BOOL:
-    return SET_BOOL(value);
+    result = set_bool(value);
+    break;
   case INT:
-    return SET_INT(int(value));
+    result = set_int(int(value));
+    break;
   case LONG:
-    return SET_LONG(long(value));
+    result = set_long(long(value));
+    break;
   case FLOAT:
-    return SET_FLOAT(float(value));
+    result = set_float(float(value));
+    break;
   case DOUBLE:
-    return SET_DOUBLE(double(value));
+    result = set_double(double(value));
+    break;
   case STRING:
-    return SET_STRING(value ? "true" : "false");
+  case UNSPECIFIED:
+    result = set_string(value ? "true" : "false");
+    break;
+  case NONE:
+  default:
+    break;
   }
 
-  return false;
+  if (getAttribute(TRACE_WRITE))
+    trace_write();
+  return result;
 }
 
-
-/**
- * Set an int value.
- */
 bool
-SGValue::setIntValue (int value)
+SGPropertyNode::setIntValue (int value)
 {
-  if (_type == UNKNOWN) {
+				// Shortcut for common case
+  if (_attr == (READ|WRITE) && _type == INT)
+    return set_int(value);
+
+  bool result = false;
+  TEST_WRITE;
+  if (_type == NONE || _type == UNSPECIFIED) {
     clear_value();
-    _value.int_val = new SGRawValueInternal<int>;
     _type = INT;
+    _local_val.int_val = 0;
   }
 
   switch (_type) {
   case ALIAS:
-    return _value.alias->setIntValue(value);
+    result = _value.alias->setIntValue(value);
+    break;
   case BOOL:
-    return SET_BOOL(value == 0 ? false : true);
+    result = set_bool(value == 0 ? false : true);
+    break;
   case INT:
-    return SET_INT(value);
+    result = set_int(value);
+    break;
   case LONG:
-    return SET_LONG(long(value));
+    result = set_long(long(value));
+    break;
   case FLOAT:
-    return SET_FLOAT(float(value));
+    result = set_float(float(value));
+    break;
   case DOUBLE:
-    return SET_DOUBLE(double(value));
-  case STRING: {
+    result = set_double(double(value));
+    break;
+  case STRING:
+  case UNSPECIFIED: {
     char buf[128];
     sprintf(buf, "%d", value);
-    return SET_STRING(buf);
+    result = set_string(buf);
+    break;
   }
+  case NONE:
+  default:
+    break;
   }
 
-  return false;
+  if (getAttribute(TRACE_WRITE))
+    trace_write();
+  return result;
 }
 
-
-/**
- * Set a long value.
- */
 bool
-SGValue::setLongValue (long value)
+SGPropertyNode::setLongValue (long value)
 {
-  if (_type == UNKNOWN) {
+				// Shortcut for common case
+  if (_attr == (READ|WRITE) && _type == LONG)
+    return set_long(value);
+
+  bool result = false;
+  TEST_WRITE;
+  if (_type == NONE || _type == UNSPECIFIED) {
     clear_value();
-    _value.long_val = new SGRawValueInternal<long>;
     _type = LONG;
+    _local_val.long_val = 0L;
   }
 
   switch (_type) {
   case ALIAS:
-    return _value.alias->setLongValue(value);
+    result = _value.alias->setLongValue(value);
+    break;
   case BOOL:
-    return SET_BOOL(value == 0L ? false : true);
+    result = set_bool(value == 0L ? false : true);
+    break;
   case INT:
-    return SET_INT(int(value));
+    result = set_int(int(value));
+    break;
   case LONG:
-    return SET_LONG(value);
+    result = set_long(value);
+    break;
   case FLOAT:
-    return SET_FLOAT(float(value));
+    result = set_float(float(value));
+    break;
   case DOUBLE:
-    return SET_DOUBLE(double(value));
-  case STRING: {
+    result = set_double(double(value));
+    break;
+  case STRING:
+  case UNSPECIFIED: {
     char buf[128];
-    sprintf(buf, "%d", value);
-    return SET_STRING(buf);
+    sprintf(buf, "%ld", value);
+    result = set_string(buf);
+    break;
   }
+  case NONE:
+  default:
+    break;
   }
 
-  return false;
+  if (getAttribute(TRACE_WRITE))
+    trace_write();
+  return result;
 }
 
-
-/**
- * Set a float value.
- */
 bool
-SGValue::setFloatValue (float value)
+SGPropertyNode::setFloatValue (float value)
 {
-  if (_type == UNKNOWN) {
+				// Shortcut for common case
+  if (_attr == (READ|WRITE) && _type == FLOAT)
+    return set_float(value);
+
+  bool result = false;
+  TEST_WRITE;
+  if (_type == NONE || _type == UNSPECIFIED) {
     clear_value();
-    _value.float_val = new SGRawValueInternal<float>;
     _type = FLOAT;
+    _local_val.float_val = 0;
   }
 
   switch (_type) {
   case ALIAS:
-    return _value.alias->setFloatValue(value);
+    result = _value.alias->setFloatValue(value);
+    break;
   case BOOL:
-    return SET_BOOL(value == 0.0 ? false : true);
+    result = set_bool(value == 0.0 ? false : true);
+    break;
   case INT:
-    return SET_INT(int(value));
+    result = set_int(int(value));
+    break;
   case LONG:
-    return SET_LONG(long(value));
+    result = set_long(long(value));
+    break;
   case FLOAT:
-    return SET_FLOAT(value);
+    result = set_float(value);
+    break;
   case DOUBLE:
-    return SET_DOUBLE(double(value));
-  case STRING: {
+    result = set_double(double(value));
+    break;
+  case STRING:
+  case UNSPECIFIED: {
     char buf[128];
     sprintf(buf, "%f", value);
-    return SET_STRING(buf);
+    result = set_string(buf);
+    break;
   }
+  case NONE:
+  default:
+    break;
   }
 
-  return false;
+  if (getAttribute(TRACE_WRITE))
+    trace_write();
+  return result;
 }
 
-
-/**
- * Set a double value.
- */
 bool
-SGValue::setDoubleValue (double value)
+SGPropertyNode::setDoubleValue (double value)
 {
-  if (_type == UNKNOWN) {
+				// Shortcut for common case
+  if (_attr == (READ|WRITE) && _type == DOUBLE)
+    return set_double(value);
+
+  bool result = false;
+  TEST_WRITE;
+  if (_type == NONE || _type == UNSPECIFIED) {
     clear_value();
-    _value.double_val = new SGRawValueInternal<double>;
+    _local_val.double_val = value;
     _type = DOUBLE;
   }
 
   switch (_type) {
   case ALIAS:
-    return _value.alias->setDoubleValue(value);
+    result = _value.alias->setDoubleValue(value);
+    break;
   case BOOL:
-    return SET_BOOL(value == 0.0L ? false : true);
+    result = set_bool(value == 0.0L ? false : true);
+    break;
   case INT:
-    return SET_INT(int(value));
+    result = set_int(int(value));
+    break;
   case LONG:
-    return SET_LONG(long(value));
+    result = set_long(long(value));
+    break;
   case FLOAT:
-    return SET_FLOAT(float(value));
+    result = set_float(float(value));
+    break;
   case DOUBLE:
-    return SET_DOUBLE(value);
-  case STRING: {
+    result = set_double(value);
+    break;
+  case STRING:
+  case UNSPECIFIED: {
     char buf[128];
-    sprintf(buf, "%lf", value);
-    return SET_STRING(buf);
+    sprintf(buf, "%f", value);
+    result = set_string(buf);
+    break;
   }
+  case NONE:
+  default:
+    break;
   }
 
-  return false;
+  if (getAttribute(TRACE_WRITE))
+    trace_write();
+  return result;
 }
 
-
-/**
- * Set a string value.
- */
 bool
-SGValue::setStringValue (string value)
+SGPropertyNode::setStringValue (const char * value)
 {
-  if (_type == UNKNOWN) {
+				// Shortcut for common case
+  if (_attr == (READ|WRITE) && _type == STRING)
+    return set_string(value);
+
+  bool result = false;
+  TEST_WRITE;
+  if (_type == NONE || _type == UNSPECIFIED) {
     clear_value();
-    _value.string_val = new SGRawValueInternal<string>;
     _type = STRING;
   }
 
   switch (_type) {
   case ALIAS:
-    return _value.alias->setStringValue(value);
+    result = _value.alias->setStringValue(value);
+    break;
   case BOOL:
-    return SET_BOOL((value == "true" || atoi(value.c_str())) ? true : false);
+    result = set_bool((compare_strings(value, "true")
+		       || atoi(value)) ? true : false);
+    break;
   case INT:
-    return SET_INT(atoi(value.c_str()));
+    result = set_int(atoi(value));
+    break;
   case LONG:
-    return SET_LONG(strtol(value.c_str(), 0, 0));
+    result = set_long(strtol(value, 0, 0));
+    break;
   case FLOAT:
-    return SET_FLOAT(atof(value.c_str()));
+    result = set_float(atof(value));
+    break;
   case DOUBLE:
-    return SET_DOUBLE(strtod(value.c_str(), 0));
+    result = set_double(strtod(value, 0));
+    break;
   case STRING:
-    return SET_STRING(value);
+  case UNSPECIFIED:
+    result = set_string(value);
+    break;
+  case NONE:
+  default:
+    break;
   }
 
-  return false;
+  if (getAttribute(TRACE_WRITE))
+    trace_write();
+  return result;
 }
 
-
-/**
- * Set a value of unknown type (stored as a string).
- */
 bool
-SGValue::setUnknownValue (string value)
+SGPropertyNode::setUnspecifiedValue (const char * value)
 {
+  bool result = false;
+  TEST_WRITE;
+  if (_type == NONE) {
+    clear_value();
+    _type = UNSPECIFIED;
+  }
+
   switch (_type) {
   case ALIAS:
-    return _value.alias->setUnknownValue(value);
+    result = _value.alias->setUnspecifiedValue(value);
+    break;
   case BOOL:
-    return SET_BOOL((value == "true" || atoi(value.c_str())) ? true : false);
+    result = set_bool((compare_strings(value, "true")
+		       || atoi(value)) ? true : false);
+    break;
   case INT:
-    return SET_INT(atoi(value.c_str()));
+    result = set_int(atoi(value));
+    break;
   case LONG:
-    return SET_LONG(strtol(value.c_str(), 0, 0));
+    result = set_long(strtol(value, 0, 0));
+    break;
   case FLOAT:
-    return SET_FLOAT(atof(value.c_str()));
+    result = set_float(atof(value));
+    break;
   case DOUBLE:
-    return SET_DOUBLE(strtod(value.c_str(), 0));
+    result = set_double(strtod(value, 0));
+    break;
   case STRING:
-  case UNKNOWN:
-    return SET_STRING(value);
+  case UNSPECIFIED:
+    result = set_string(value);
+    break;
+  case NONE:
+  default:
+    break;
   }
 
-  return false;
+  if (getAttribute(TRACE_WRITE))
+    trace_write();
+  return result;
 }
 
-
-/**
- * Tie a bool value.
- */
 bool
-SGValue::tie (const SGRawValue<bool> &value, bool use_default)
+SGPropertyNode::tie (const SGRawValue<bool> &rawValue, bool useDefault)
 {
-  if (_type == ALIAS)
-    return _value.alias->tie(value, use_default);
-  else if (_tied)
+  if (_type == ALIAS || _tied)
     return false;
 
+  useDefault = useDefault && hasValue();
   bool old_val = false;
-  if (use_default)
+  if (useDefault)
     old_val = getBoolValue();
 
   clear_value();
   _type = BOOL;
   _tied = true;
-  _value.bool_val = value.clone();
+  _value.bool_val = rawValue.clone();
 
-  if (use_default)
+  if (useDefault)
     setBoolValue(old_val);
 
   return true;
 }
 
-
-/**
- * Tie an int value.
- */
 bool
-SGValue::tie (const SGRawValue<int> &value, bool use_default)
+SGPropertyNode::tie (const SGRawValue<int> &rawValue, bool useDefault)
 {
-  if (_type == ALIAS)
-    return _value.alias->tie(value, use_default);
-  else if (_tied)
+  if (_type == ALIAS || _tied)
     return false;
 
+  useDefault = useDefault && hasValue();
   int old_val = 0;
-  if (use_default)
+  if (useDefault)
     old_val = getIntValue();
 
   clear_value();
   _type = INT;
   _tied = true;
-  _value.int_val = value.clone();
+  _value.int_val = rawValue.clone();
 
-  if (use_default)
+  if (useDefault)
     setIntValue(old_val);
 
   return true;
 }
 
-
-/**
- * Tie a long value.
- */
 bool
-SGValue::tie (const SGRawValue<long> &value, bool use_default)
+SGPropertyNode::tie (const SGRawValue<long> &rawValue, bool useDefault)
 {
-  if (_type == ALIAS)
-    return _value.alias->tie(value, use_default);
-  else if (_tied)
+  if (_type == ALIAS || _tied)
     return false;
 
-  long old_val;
-  if (use_default)
+  useDefault = useDefault && hasValue();
+  long old_val = 0;
+  if (useDefault)
     old_val = getLongValue();
 
   clear_value();
   _type = LONG;
   _tied = true;
-  _value.long_val = value.clone();
+  _value.long_val = rawValue.clone();
 
-  if (use_default)
+  if (useDefault)
     setLongValue(old_val);
 
   return true;
 }
 
-
-/**
- * Tie a float value.
- */
 bool
-SGValue::tie (const SGRawValue<float> &value, bool use_default)
+SGPropertyNode::tie (const SGRawValue<float> &rawValue, bool useDefault)
 {
-  if (_type == ALIAS)
-    return _value.alias->tie(value, use_default);
-  else if (_tied)
+  if (_type == ALIAS || _tied)
     return false;
 
+  useDefault = useDefault && hasValue();
   float old_val = 0.0;
-  if (use_default)
+  if (useDefault)
     old_val = getFloatValue();
 
   clear_value();
   _type = FLOAT;
   _tied = true;
-  _value.float_val = value.clone();
+  _value.float_val = rawValue.clone();
 
-  if (use_default)
+  if (useDefault)
     setFloatValue(old_val);
 
   return true;
 }
 
-
-/**
- * Tie a double value.
- */
 bool
-SGValue::tie (const SGRawValue<double> &value, bool use_default)
+SGPropertyNode::tie (const SGRawValue<double> &rawValue, bool useDefault)
 {
-  if (_type == ALIAS)
-    return _value.alias->tie(value, use_default);
-  else if (_tied)
+  if (_type == ALIAS || _tied)
     return false;
 
+  useDefault = useDefault && hasValue();
   double old_val = 0.0;
-  if (use_default)
+  if (useDefault)
     old_val = getDoubleValue();
 
   clear_value();
   _type = DOUBLE;
   _tied = true;
-  _value.double_val = value.clone();
+  _value.double_val = rawValue.clone();
 
-  if (use_default)
+  if (useDefault)
     setDoubleValue(old_val);
 
   return true;
-}
 
+}
 
-/**
- * Tie a string value.
- */
 bool
-SGValue::tie (const SGRawValue<string> &value, bool use_default)
+SGPropertyNode::tie (const SGRawValue<const char *> &rawValue, bool useDefault)
 {
-  if (_type == ALIAS)
-    return _value.alias->tie(value, use_default);
-  else if (_tied)
+  if (_type == ALIAS || _tied)
     return false;
 
+  useDefault = useDefault && hasValue();
   string old_val;
-  if (use_default)
+  if (useDefault)
     old_val = getStringValue();
 
   clear_value();
   _type = STRING;
   _tied = true;
-  _value.string_val = value.clone();
+  _value.string_val = rawValue.clone();
 
-  if (use_default)
-    setStringValue(old_val);
+  if (useDefault)
+    setStringValue(old_val.c_str());
 
   return true;
 }
 
-
-/**
- * Untie a value.
- */
 bool
-SGValue::untie ()
+SGPropertyNode::untie ()
 {
   if (!_tied)
     return false;
 
   switch (_type) {
-  case ALIAS: {
-    return _value.alias->untie();
-  }
   case BOOL: {
     bool val = getBoolValue();
     clear_value();
-    _value.bool_val = new SGRawValueInternal<bool>;
-    SET_BOOL(val);
+    _type = BOOL;
+    _local_val.bool_val = val;
     break;
   }
   case INT: {
     int val = getIntValue();
     clear_value();
-    _value.int_val = new SGRawValueInternal<int>;
-    SET_INT(val);
+    _type = INT;
+    _local_val.int_val = val;
     break;
   }
   case LONG: {
     long val = getLongValue();
     clear_value();
-    _value.long_val = new SGRawValueInternal<long>;
-    SET_LONG(val);
+    _type = LONG;
+    _local_val.long_val = val;
     break;
   }
   case FLOAT: {
     float val = getFloatValue();
     clear_value();
-    _value.float_val = new SGRawValueInternal<float>;
-    SET_FLOAT(val);
+    _type = FLOAT;
+    _local_val.float_val = val;
     break;
   }
   case DOUBLE: {
     double val = getDoubleValue();
     clear_value();
-    _value.double_val = new SGRawValueInternal<double>;
-    SET_DOUBLE(val);
+    _type = DOUBLE;
+    _local_val.double_val = val;
     break;
   }
-  case STRING: {
+  case STRING:
+  case UNSPECIFIED: {
     string val = getStringValue();
     clear_value();
-    _value.string_val = new SGRawValueInternal<string>;
-    SET_STRING(val);
+    _type = STRING;
+    _local_val.string_val = copy_string(val.c_str());
     break;
   }
+  case NONE:
+  default:
+    break;
   }
 
   _tied = false;
   return true;
 }
 
-
-
-////////////////////////////////////////////////////////////////////////
-// Implementation of SGPropertyNode.
-////////////////////////////////////////////////////////////////////////
-
-
-/**
- * Utility function: given a value, find the property node.
- */
-static SGPropertyNode *
-find_node_by_value (SGPropertyNode * start_node, const SGValue * value)
-{
-  if (start_node->getValue() == value) {
-    return start_node;
-  } else for (int i = 0; i < start_node->nChildren(); i++) {
-    SGPropertyNode * child =
-      find_node_by_value(start_node->getChild(i), value);
-    if (child != 0)
-      return child;
-  }
-  return 0;
-}
-
-
-/**
- * Default constructor: always creates a root node.
- */
-SGPropertyNode::SGPropertyNode ()
-  : _value(0), _name(""), _index(0), _parent(0), _target(0)
-{
-}
-
-
-/**
- * Convenience constructor.
- */
-SGPropertyNode::SGPropertyNode (const string &name,
-				int index, SGPropertyNode * parent)
-  : _value(0), _name(name), _index(index), _parent(parent), _target(0)
-{
-}
-
-
-/**
- * Destructor.
- */
-SGPropertyNode::~SGPropertyNode ()
-{
-  delete _value;
-  for (int i = 0; i < (int)_children.size(); i++)
-    delete _children[i];
-}
-
-
-/**
- * Get a value, optionally creating it if not present.
- */
-SGValue *
-SGPropertyNode::getValue (bool create)
-{
-  if (_value == 0 && create)
-    _value = new SGValue();
-  return _value;
-}
-
-
-/**
- * Alias to another node.
- */
-bool
-SGPropertyNode::alias (SGPropertyNode * target)
-{
-  if (_value == 0)
-    _value = new SGValue();
-  _target = target;
-  return _value->alias(target->getValue(true));
-}
-
-
-/**
- * Alias to another node by path.
- */
-bool
-SGPropertyNode::alias (const string &path)
-{
-  return alias(getNode(path, true));
-}
-
-
-/**
- * Remove an alias.
- */
-bool
-SGPropertyNode::unalias ()
-{
-  _target = 0;
-  return (_value != 0 ? _value->unalias() : false);
-}
-
-
-/**
- * Test whether this node is aliased.
- */
-bool
-SGPropertyNode::isAlias () const
-{
-  return (_value != 0 ? _value->isAlias() : false);
-}
-
-
-/**
- * Get the target of an alias.
- *
- * This is tricky, because it is actually the value that is aliased,
- * and someone could realias or unalias the value directly without
- * going through the property node.  The node caches its best guess,
- * but it may have to search the whole property tree.
- *
- * @return The target node for the alias, or 0 if the node is not aliased.
- */
-SGPropertyNode *
-SGPropertyNode::getAliasTarget ()
-{
-  if (_value == 0 || !_value->isAlias()) {
-    return 0;
-  } else if (_target != 0 && _target->getValue() == _value->getAlias()) {
-    return _target;
-  } else {
-    _target = find_node_by_value(getRootNode(), _value->getAlias());
-  }
-}
-
-
-const SGPropertyNode *
-SGPropertyNode::getAliasTarget () const
-{
-  if (_value == 0 || !_value->isAlias()) {
-    return 0;
-  } else if (_target != 0 && _target->getValue() == _value->getAlias()) {
-    return _target;
-  } else {
-				// FIXME: const cast
-    _target =
-      find_node_by_value((SGPropertyNode *)getRootNode(), _value->getAlias());
-  }
-}
-
-
-/**
- * Get a non-const child by index.
- */
-SGPropertyNode *
-SGPropertyNode::getChild (int position)
-{
-  if (position >= 0 && position < nChildren())
-    return _children[position];
-  else
-    return 0;
-}
-
-
-/**
- * Get a const child by index.
- */
-const SGPropertyNode *
-SGPropertyNode::getChild (int position) const
-{
-  if (position >= 0 && position < nChildren())
-    return _children[position];
-  else
-    return 0;
-}
-
-
-/**
- * Get a non-const child by name and index, creating if necessary.
- */
-SGPropertyNode *
-SGPropertyNode::getChild (const string &name, int index, bool create)
-{
-  int pos = find_child(name, index, _children);
-  if (pos >= 0) {
-    return _children[pos];
-  } else if (create) {
-    _children.push_back(new SGPropertyNode(name, index, this));
-    return _children[_children.size()-1];
-  } else {
-    return 0;
-  }
-}
-
-
-/**
- * Get a const child by name and index.
- */
-const SGPropertyNode *
-SGPropertyNode::getChild (const string &name, int index) const
-{
-  int pos = find_child(name, index, _children);
-  if (pos >= 0)
-    return _children[pos];
-  else
-    return 0;
-}
-
-
-/**
- * Get all children with the same name (but different indices).
- */
-vector<SGPropertyNode *>
-SGPropertyNode::getChildren (const string &name)
-{
-  vector<SGPropertyNode *> children;
-  int max = _children.size();
-
-  for (int i = 0; i < max; i++)
-    if (_children[i]->getName() == name)
-      children.push_back(_children[i]);
-
-  sort(children.begin(), children.end(), CompareIndices());
-  return children;
-}
-
-
-/**
- * Get all children const with the same name (but different indices).
- */
-vector<const SGPropertyNode *>
-SGPropertyNode::getChildren (const string &name) const
-{
-  vector<const SGPropertyNode *> children;
-  int max = _children.size();
-
-  for (int i = 0; i < max; i++)
-    if (_children[i]->getName() == name)
-      children.push_back(_children[i]);
-
-  sort(children.begin(), children.end(), CompareIndices());
-  return children;
-}
-
-
-string
-SGPropertyNode::getPath (bool simplify) const
-{
-  if (_parent == 0)
-    return "";
-
-  string path = _parent->getPath(simplify);
-  path += '/';
-  path += _name;
-  if (_index != 0 || !simplify) {
-    char buffer[128];
-    sprintf(buffer, "[%d]", _index);
-    path += buffer;
-  }
-  return path;
-}
-
-SGValue::Type
-SGPropertyNode::getType () const
-{
-  if (_value != 0)
-    return _value->getType();
-  else
-    return SGValue::UNKNOWN;
-}
-
-
-bool 
-SGPropertyNode::getBoolValue () const
-{
-  return (_value == 0 ? SGRawValue<bool>::DefaultValue
-	  : _value->getBoolValue());
-}
-
-int 
-SGPropertyNode::getIntValue () const
-{
-  return (_value == 0 ? SGRawValue<int>::DefaultValue
-	  : _value->getIntValue());
-}
-
-long 
-SGPropertyNode::getLongValue () const
-{
-  return (_value == 0 ? SGRawValue<long>::DefaultValue
-	  : _value->getLongValue());
-}
-
-float 
-SGPropertyNode::getFloatValue () const
-{
-  return (_value == 0 ? SGRawValue<float>::DefaultValue
-	  : _value->getFloatValue());
-}
-
-double 
-SGPropertyNode::getDoubleValue () const
-{
-  return (_value == 0 ? SGRawValue<double>::DefaultValue
-	  : _value->getDoubleValue());
-}
-
-string
-SGPropertyNode::getStringValue () const
-{
-  return (_value == 0 ? SGRawValue<string>::DefaultValue
-	  : _value->getStringValue());
-}
-
-bool
-SGPropertyNode::setBoolValue (bool val)
-{
-  if (_value == 0)
-    _value = new SGValue();
-  return _value->setBoolValue(val);
-}
-
-bool
-SGPropertyNode::setIntValue (int val)
-{
-  if (_value == 0)
-    _value = new SGValue();
-  return _value->setIntValue(val);
-}
-
-bool
-SGPropertyNode::setLongValue (long val)
-{
-  if (_value == 0)
-    _value = new SGValue();
-  return _value->setLongValue(val);
-}
-
-bool
-SGPropertyNode::setFloatValue (float val)
-{
-  if (_value == 0)
-    _value = new SGValue();
-  return _value->setFloatValue(val);
-}
-
-bool
-SGPropertyNode::setDoubleValue (double val)
-{
-  if (_value == 0)
-    _value = new SGValue();
-  return _value->setDoubleValue(val);
-}
-
-bool
-SGPropertyNode::setStringValue (string val)
-{
-  if (_value == 0)
-    _value = new SGValue();
-  return _value->setStringValue(val);
-}
-
-bool
-SGPropertyNode::setUnknownValue (string val)
-{
-  if (_value == 0)
-    _value = new SGValue();
-  return _value->setUnknownValue(val);
-}
-
-bool
-SGPropertyNode::isTied () const
-{
-  return (_value == 0 ? false : _value->isTied());
-}
-
-bool
-SGPropertyNode::tie (const SGRawValue<bool> &rawValue, bool useDefault)
-{
-  if (_value == 0)
-    _value = new SGValue();
-  return _value->tie(rawValue, useDefault);
-}
-
-bool
-SGPropertyNode::tie (const SGRawValue<int> &rawValue, bool useDefault)
-{
-  if (_value == 0)
-    _value = new SGValue();
-  return _value->tie(rawValue, useDefault);
-}
-
-bool
-SGPropertyNode::tie (const SGRawValue<long> &rawValue, bool useDefault)
-{
-  if (_value == 0)
-    _value = new SGValue();
-  return _value->tie(rawValue, useDefault);
-}
-
-bool
-SGPropertyNode::tie (const SGRawValue<float> &rawValue, bool useDefault)
-{
-  if (_value == 0)
-    _value = new SGValue();
-  return _value->tie(rawValue, useDefault);
-}
-
-bool
-SGPropertyNode::tie (const SGRawValue<double> &rawValue, bool useDefault)
-{
-  if (_value == 0)
-    _value = new SGValue();
-  return _value->tie(rawValue, useDefault);
-}
-
-bool
-SGPropertyNode::tie (const SGRawValue<string> &rawValue, bool useDefault)
-{
-  if (_value == 0)
-    _value = new SGValue();
-  return _value->tie(rawValue, useDefault);
-}
-
-bool
-SGPropertyNode::untie ()
-{
-  return (_value == 0 ? false : _value->untie());
-}
-
 SGPropertyNode *
 SGPropertyNode::getRootNode ()
 {
@@ -1533,22 +1597,47 @@ SGPropertyNode::getRootNode () const
 }
 
 SGPropertyNode *
-SGPropertyNode::getNode (const string &relative_path, bool create)
-{
+SGPropertyNode::getNode (const char * relative_path, bool create)
+{
+//   if (_path_cache == 0)
+//     _path_cache = new cache_map;
+
+//   SGPropertyNode * result = (*_path_cache)[relative_path];
+//   if (result == 0) {
+//     vector<PathComponent> components;
+//     parse_path(relative_path, components);
+//     result = find_node(this, components, 0, create);
+//     if (result != 0)
+//       (*_path_cache)[relative_path] = result;
+//   }
+  
+//   return result;
   vector<PathComponent> components;
   parse_path(relative_path, components);
   return find_node(this, components, 0, create);
 }
 
-const SGPropertyNode *
-SGPropertyNode::getNode (const string &relative_path) const
+SGPropertyNode *
+SGPropertyNode::getNode (const char * relative_path, int index, bool create)
 {
   vector<PathComponent> components;
   parse_path(relative_path, components);
-				// FIXME: cast away const
-  return find_node((SGPropertyNode *)this, components, 0, false);
+  if (components.size() > 0)
+    components[components.size()-1].index = index;
+  return find_node(this, components, 0, create);
 }
 
+const SGPropertyNode *
+SGPropertyNode::getNode (const char * relative_path) const
+{
+  return ((SGPropertyNode *)this)->getNode(relative_path, false);
+}
+
+const SGPropertyNode *
+SGPropertyNode::getNode (const char * relative_path, int index) const
+{
+  return ((SGPropertyNode *)this)->getNode(relative_path, index, false);
+}
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -1560,45 +1649,21 @@ SGPropertyNode::getNode (const string &relative_path) const
  * Test whether another node has a value attached.
  */
 bool
-SGPropertyNode::hasValue (const string &relative_path) const
+SGPropertyNode::hasValue (const char * relative_path) const
 {
   const SGPropertyNode * node = getNode(relative_path);
   return (node == 0 ? false : node->hasValue());
 }
 
 
-/**
- * Get the value for another node.
- */
-SGValue *
-SGPropertyNode::getValue (const string &relative_path, bool create)
-{
-  SGPropertyNode * node = getNode(relative_path, create);
-  if (node != 0 && !node->hasValue())
-    node->setUnknownValue("");
-  return (node == 0 ? 0 : node->getValue(create));
-}
-
-
-/**
- * Get the value for another node.
- */
-const SGValue *
-SGPropertyNode::getValue (const string &relative_path) const
-{
-  const SGPropertyNode * node = getNode(relative_path);
-  return (node == 0 ? 0 : node->getValue());
-}
-
-
 /**
  * Get the value type for another node.
  */
-SGValue::Type
-SGPropertyNode::getType (const string &relative_path) const
+SGPropertyNode::Type
+SGPropertyNode::getType (const char * relative_path) const
 {
   const SGPropertyNode * node = getNode(relative_path);
-  return (node == 0 ? SGValue::UNKNOWN : node->getType());
+  return (node == 0 ? UNSPECIFIED : (Type)(node->getType()));
 }
 
 
@@ -1606,7 +1671,7 @@ SGPropertyNode::getType (const string &relative_path) const
  * Get a bool value for another node.
  */
 bool
-SGPropertyNode::getBoolValue (const string &relative_path,
+SGPropertyNode::getBoolValue (const char * relative_path,
 			      bool defaultValue) const
 {
   const SGPropertyNode * node = getNode(relative_path);
@@ -1618,7 +1683,7 @@ SGPropertyNode::getBoolValue (const string &relative_path,
  * Get an int value for another node.
  */
 int
-SGPropertyNode::getIntValue (const string &relative_path,
+SGPropertyNode::getIntValue (const char * relative_path,
 			     int defaultValue) const
 {
   const SGPropertyNode * node = getNode(relative_path);
@@ -1630,7 +1695,7 @@ SGPropertyNode::getIntValue (const string &relative_path,
  * Get a long value for another node.
  */
 long
-SGPropertyNode::getLongValue (const string &relative_path,
+SGPropertyNode::getLongValue (const char * relative_path,
 			      long defaultValue) const
 {
   const SGPropertyNode * node = getNode(relative_path);
@@ -1642,7 +1707,7 @@ SGPropertyNode::getLongValue (const string &relative_path,
  * Get a float value for another node.
  */
 float
-SGPropertyNode::getFloatValue (const string &relative_path,
+SGPropertyNode::getFloatValue (const char * relative_path,
 			       float defaultValue) const
 {
   const SGPropertyNode * node = getNode(relative_path);
@@ -1654,7 +1719,7 @@ SGPropertyNode::getFloatValue (const string &relative_path,
  * Get a double value for another node.
  */
 double
-SGPropertyNode::getDoubleValue (const string &relative_path,
+SGPropertyNode::getDoubleValue (const char * relative_path,
 				double defaultValue) const
 {
   const SGPropertyNode * node = getNode(relative_path);
@@ -1665,9 +1730,9 @@ SGPropertyNode::getDoubleValue (const string &relative_path,
 /**
  * Get a string value for another node.
  */
-string
-SGPropertyNode::getStringValue (const string &relative_path,
-				string defaultValue) const
+const char *
+SGPropertyNode::getStringValue (const char * relative_path,
+				const char * defaultValue) const
 {
   const SGPropertyNode * node = getNode(relative_path);
   return (node == 0 ? defaultValue : node->getStringValue());
@@ -1678,7 +1743,7 @@ SGPropertyNode::getStringValue (const string &relative_path,
  * Set a bool value for another node.
  */
 bool
-SGPropertyNode::setBoolValue (const string &relative_path, bool value)
+SGPropertyNode::setBoolValue (const char * relative_path, bool value)
 {
   return getNode(relative_path, true)->setBoolValue(value);
 }
@@ -1688,7 +1753,7 @@ SGPropertyNode::setBoolValue (const string &relative_path, bool value)
  * Set an int value for another node.
  */
 bool
-SGPropertyNode::setIntValue (const string &relative_path, int value)
+SGPropertyNode::setIntValue (const char * relative_path, int value)
 {
   return getNode(relative_path, true)->setIntValue(value);
 }
@@ -1698,7 +1763,7 @@ SGPropertyNode::setIntValue (const string &relative_path, int value)
  * Set a long value for another node.
  */
 bool
-SGPropertyNode::setLongValue (const string &relative_path, long value)
+SGPropertyNode::setLongValue (const char * relative_path, long value)
 {
   return getNode(relative_path, true)->setLongValue(value);
 }
@@ -1708,7 +1773,7 @@ SGPropertyNode::setLongValue (const string &relative_path, long value)
  * Set a float value for another node.
  */
 bool
-SGPropertyNode::setFloatValue (const string &relative_path, float value)
+SGPropertyNode::setFloatValue (const char * relative_path, float value)
 {
   return getNode(relative_path, true)->setFloatValue(value);
 }
@@ -1718,7 +1783,7 @@ SGPropertyNode::setFloatValue (const string &relative_path, float value)
  * Set a double value for another node.
  */
 bool
-SGPropertyNode::setDoubleValue (const string &relative_path, double value)
+SGPropertyNode::setDoubleValue (const char * relative_path, double value)
 {
   return getNode(relative_path, true)->setDoubleValue(value);
 }
@@ -1728,7 +1793,7 @@ SGPropertyNode::setDoubleValue (const string &relative_path, double value)
  * Set a string value for another node.
  */
 bool
-SGPropertyNode::setStringValue (const string &relative_path, string value)
+SGPropertyNode::setStringValue (const char * relative_path, const char * value)
 {
   return getNode(relative_path, true)->setStringValue(value);
 }
@@ -1738,9 +1803,10 @@ SGPropertyNode::setStringValue (const string &relative_path, string value)
  * Set an unknown value for another node.
  */
 bool
-SGPropertyNode::setUnknownValue (const string &relative_path, string value)
+SGPropertyNode::setUnspecifiedValue (const char * relative_path,
+				     const char * value)
 {
-  return getNode(relative_path, true)->setUnknownValue(value);
+  return getNode(relative_path, true)->setUnspecifiedValue(value);
 }
 
 
@@ -1748,7 +1814,7 @@ SGPropertyNode::setUnknownValue (const string &relative_path, string value)
  * Test whether another node is tied.
  */
 bool
-SGPropertyNode::isTied (const string &relative_path) const
+SGPropertyNode::isTied (const char * relative_path) const
 {
   const SGPropertyNode * node = getNode(relative_path);
   return (node == 0 ? false : node->isTied());
@@ -1759,7 +1825,7 @@ SGPropertyNode::isTied (const string &relative_path) const
  * Tie a node reached by a relative path, creating it if necessary.
  */
 bool
-SGPropertyNode::tie (const string &relative_path,
+SGPropertyNode::tie (const char * relative_path,
 		     const SGRawValue<bool> &rawValue,
 		     bool useDefault)
 {
@@ -1771,7 +1837,7 @@ SGPropertyNode::tie (const string &relative_path,
  * Tie a node reached by a relative path, creating it if necessary.
  */
 bool
-SGPropertyNode::tie (const string &relative_path,
+SGPropertyNode::tie (const char * relative_path,
 		     const SGRawValue<int> &rawValue,
 		     bool useDefault)
 {
@@ -1783,7 +1849,7 @@ SGPropertyNode::tie (const string &relative_path,
  * Tie a node reached by a relative path, creating it if necessary.
  */
 bool
-SGPropertyNode::tie (const string &relative_path,
+SGPropertyNode::tie (const char * relative_path,
 		     const SGRawValue<long> &rawValue,
 		     bool useDefault)
 {
@@ -1795,7 +1861,7 @@ SGPropertyNode::tie (const string &relative_path,
  * Tie a node reached by a relative path, creating it if necessary.
  */
 bool
-SGPropertyNode::tie (const string &relative_path,
+SGPropertyNode::tie (const char * relative_path,
 		     const SGRawValue<float> &rawValue,
 		     bool useDefault)
 {
@@ -1807,7 +1873,7 @@ SGPropertyNode::tie (const string &relative_path,
  * Tie a node reached by a relative path, creating it if necessary.
  */
 bool
-SGPropertyNode::tie (const string &relative_path,
+SGPropertyNode::tie (const char * relative_path,
 		     const SGRawValue<double> &rawValue,
 		     bool useDefault)
 {
@@ -1819,8 +1885,8 @@ SGPropertyNode::tie (const string &relative_path,
  * Tie a node reached by a relative path, creating it if necessary.
  */
 bool
-SGPropertyNode::tie (const string &relative_path,
-		     const SGRawValue<string> &rawValue,
+SGPropertyNode::tie (const char * relative_path,
+		     const SGRawValue<const char *> &rawValue,
 		     bool useDefault)
 {
   return getNode(relative_path, true)->tie(rawValue, useDefault);
@@ -1831,7 +1897,7 @@ SGPropertyNode::tie (const string &relative_path,
  * Attempt to untie another node reached by a relative path.
  */
 bool
-SGPropertyNode::untie (const string &relative_path)
+SGPropertyNode::untie (const char * relative_path)
 {
   SGPropertyNode * node = getNode(relative_path);
   return (node == 0 ? false : node->untie());