Changeset 692 for mylib/trunk/rconfig

Timestamp:

01/07/08 18:28:27 (2 years ago)

Author:

tapted

Message:

Add hello world and support strings as unititialised

Location:

mylib/trunk/rconfig

Files:

• rconfig.cpp (modified) (2 diffs)
• rconfig.h (modified) (2 diffs)

mylib/trunk/rconfig/rconfig.cpp

@@ -201 +201 @@
 }
 
+template <class T>
+static void addvar_uninitialised(const char* cname, T& var, const char* initval, const char* context) {
+    std::string name(cname);
+    if (IDEBUG) {
+        std::cerr.setf(std::ios_base::left, std::ios_base::adjustfield);
+        std::cerr
+            << "(cfg) " << std::setw(15) << DEMANGLE(T)
+            << ' ' << std::setw(30) << name
+            << " = " << std::setw(20) << initval;
+        if (context)
+            std::cerr << " (" << context << ")";
+        std::cerr << std::endl;
+
+    }
+    varmap->insert(VARMAP::value_type(name, make_varreader(var, name)));
+}
+
 /** Add a VarReaderV to the map of variables we want to look for */
 template <class T>
@@ -285 +302 @@
     addvar(name, ref, context);
 }
+
+void rcfile_tellstr(const char* name, std::string &ref, const char* defval, const char* context) {
+    addvar_uninitialised(name, ref, defval, context);
+}
+
 /*
 void rcfile_tell(const char* name, std::vector<bool> &ref) {

mylib/trunk/rconfig/rconfig.h

@@ -67 +67 @@
 void rcfile_tell(const char* name, unsigned &ref, const char* context = 0);
 void rcfile_tell(const char* name, std::string &ref, const char* context = 0);
+void rcfile_tellstr(const char* name, std::string &ref, const char* defval = 0, const char* context = 0);
 //void rcfile_tell(const char* name, std::vector<bool> &ref);
 void rcfile_tell(const char* name, std::vector<int> &ref, const char* context = 0);
@@ -75 +76 @@
 //@}
 
-template<class T>
-    T rcfile_initwrap(const char* name, T& ref, const T& initval, const char* context = 0) {
-        ref = initval;
+template<class T, class V>
+    T rcfile_initwrap(const char* name, T& ref, const V& initval, const char* context = 0) {
+        ref = initval; //this only works for primitive types
         rcfile_tell(name, ref, context);
+        return initval;
+    }
+
+template<class V>
+    std::string rcfile_initwrap(const char* name, std::string& ref, const V& initval, const char* context = 0) {
+        rcfile_tellstr(name, ref, initval, context);
         return initval;
     }