Changeset 9869 in orxonox.OLD for trunk/src/lib/parser

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

Location:

trunk/src/lib/parser

Files:

• Makefile.am (modified) (1 diff)
• cmdline_parser/Makefile.am (modified) (1 diff)
• cmdline_parser/cmdline_parser.cc (modified) (1 diff)
• cmdline_parser/cmdline_parser.h (modified) (1 diff)
• ini_parser/Makefile.am (modified) (1 diff)
• ini_parser/ini_parser.cc (modified) (5 diffs)
• ini_parser/ini_parser.h (modified) (2 diffs)
• preferences/Makefile.am (modified) (1 diff)
• preferences/cmd_line_prefs_reader.h (modified) (3 diffs)
• preferences/ini_file_prefs_reader.h (modified) (1 diff)
• preferences/preferences.cc (copied) (copied from branches/new_class_id/src/lib/parser/preferences/preferences.cc)
• preferences/preferences.h (copied) (copied from branches/new_class_id/src/lib/parser/preferences/preferences.h)

trunk/src/lib/parser/Makefile.am

@@ -2 +2 @@
           tinyxml \
           ini_parser \
-          preferences \
-          cmdline_parser
+          cmdline_parser \
+          preferences
 
 

trunk/src/lib/parser/cmdline_parser/Makefile.am

@@ +1 @@
+
+INCLUDES = -I../../..
 
 noinst_LIBRARIES = libCmdLineParser.a

trunk/src/lib/parser/cmdline_parser/cmdline_parser.cc

@@ -16 +16 @@
 #include "cmdline_parser.h"
 
+#include <cassert>
 #include "src/lib/util/substring.h"
 

trunk/src/lib/parser/cmdline_parser/cmdline_parser.h

@@ -11 +11 @@
 #include <vector>
 
-#include "src/defs/debug.h"
-#include "src/lib/util/multi_type.h"
+#include "lib/util/debug.h"
+#include "lib/util/multi_type.h"
 
 

trunk/src/lib/parser/ini_parser/Makefile.am

@@ -1 @@
-INCLUDES=-I../../util
+INCLUDES = -I../../..
 
 

trunk/src/lib/parser/ini_parser/ini_parser.cc

@@ -29 +29 @@
 
 #ifdef DEBUG_LEVEL
- #include "../../../defs/debug.h"
+ #include "../../../lib/util/debug.h"
 #else
  #define PRINTF(x) printf
@@ -165 +165 @@
       else if( (ptr = strchr( lineBegin, '=')) != NULL)
       {
-        if (currentSection == NULL)
+        if (currentSection == this->sections.end())
         {
           PRINTF(2)("Not in a Section yet for %s\n", lineBegin);
@@ -470 +470 @@
   {
     std::list<IniEntry>::const_iterator entry = this->getEntryIT(entryName, sectionName);
-    if (entry != NULL &&  (*entry).name == entryName)
+    if (/** FIXME entry != NULL && */  (*entry).name == entryName)
       return (*entry).value;
     PRINTF(2)("Entry '%s' in section '%s' not found.\n", entryName.c_str(), sectionName.c_str());
@@ -627 +627 @@
       if ((*entry).name == entryName)
         break;
-  if (entry == (*section).entries.end())
-    return NULL;
-  else
-    return entry;
+  return entry;
 }
 
@@ -650 +647 @@
       if ((*entry).name == entryName)
         break;
-  if (entry == (*section).entries.end())
-    return NULL;
-  else
-    return entry;
+  return entry;
 }
 

trunk/src/lib/parser/ini_parser/ini_parser.h

@@ -11 +11 @@
 #define PARSELINELENGHT     512       //!< how many chars to read at once
 
-#include "filesys/file.h"
+#include "lib/util/filesys/file.h"
 #include <list>
 
@@ -66 +66 @@
     bool addVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "" );
     const std::string& getVar(const std::string& entryName, const std::string& sectionName, const std::string& defaultValue = "") const;
-    bool IniParser::editVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "", bool createMissing = true);
+    bool editVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "", bool createMissing = true);
     void setEntryComment(const std::string& comment, const std::string& entryName, const std::string& sectionName);
     const std::string& getEntryComment(const std::string& entryName, const std::string& sectionName) const;

trunk/src/lib/parser/preferences/Makefile.am

@@ -6 +6 @@
 libPrefsParser_a_SOURCES = \
                 cmd_line_prefs_reader.cc \
-                ini_file_prefs_reader.cc
+                ini_file_prefs_reader.cc \
+                preferences.cc
 
 
 noinst_HEADERS = \
                 cmd_line_prefs_reader.h \
-                ini_file_prefs_reader.h
+                ini_file_prefs_reader.h \
+                preferences.h

trunk/src/lib/parser/preferences/cmd_line_prefs_reader.h

@@ -7 +7 @@
 #define _CMD_LINE_PREFS_READER_H
 
-#include "stdincl.h"
 #include "debug.h"
 
@@ -45 +44 @@
 };
 
-#define REGISTER_ARG_FLAG(shortOption,longOption,section,key,description,value) bool _ARGVAR_##shortOption##_##longOption = CmdLinePrefsReader::registerArgument(#shortOption[0],#longOption,section,key,description,"",value) 
+#define REGISTER_ARG_FLAG(shortOption,longOption,section,key,description,value) bool _ARGVAR_##shortOption##_##longOption = CmdLinePrefsReader::registerArgument(#shortOption[0],#longOption,section,key,description,"",value)
 
-#define REGISTER_ARG_ARG(shortOption,longOption,section,key,description,argname) bool _ARGVAR_##shortOption##_##longOption = CmdLinePrefsReader::registerArgument(#shortOption[0],#longOption,section,key,description,argname) 
+#define REGISTER_ARG_ARG(shortOption,longOption,section,key,description,argname) bool _ARGVAR_##shortOption##_##longOption = CmdLinePrefsReader::registerArgument(#shortOption[0],#longOption,section,key,description,argname)
 
 //! A class for reading commandline arguments into Preferences
-class CmdLinePrefsReader 
+class CmdLinePrefsReader
 {
 
@@ -58 +57 @@
 
     bool parse(int argc, char** argv);
-    
+
     static bool registerArgument( const char shortOption, const std::string & longOption, const std::string & section, const std::string & key, const std::string & help,  const std::string & argName = "", const std::string & value = "%arg%" );
-    
+
     static bool asdf;
-    
+
   private:
     static bool callBack( ArgTableEntry entry, void* data, const std::string & arg, const std::vector<MultiType> & argArgs );
-    
+
     static RegistredArgs regArgs;
 

trunk/src/lib/parser/preferences/ini_file_prefs_reader.h

@@ -7 +7 @@
 #define _INI_FILE_PREFS_READER_H
 
-#include "src/lib/parser/ini_parser/ini_parser.h"
-#include "src/lib/util/preferences.h"
+#include "lib/parser/ini_parser/ini_parser.h"
+#include "lib/parser/preferences/preferences.h"