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

Timestamp:

Dec 6, 2005, 10:06:10 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ini-parser in own subdir now (also moved tiXml-lib to lib/parser

Location:

trunk/src/lib/parser

Files:

• . (added)
• Makefile.am (added)
• ini_parser (added)
• ini_parser/Makefile.am (added)
• ini_parser/ini_parser.cc (moved) (moved from trunk/src/lib/util/ini_parser.cc) (12 diffs)
• ini_parser/ini_parser.h (moved) (moved from trunk/src/lib/util/ini_parser.h)
• tinyxml (moved) (moved from trunk/src/lib/tinyxml)

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

@@ -24 +24 @@
 #include <string.h>
 
-#if HAVE_CONFIG_H 
-#include <config.h> 
+#if HAVE_CONFIG_H
+#include <config.h>
 #endif
 
 #ifdef DEBUG
- #include "debug.h"
+ #include "../../../defs/debug.h"
 #else
  #define PRINTF(x) printf
@@ -68 +68 @@
   {
      IniSection section = this->sections.front();
-    
+
     // in all entries of the sections
     while(!section.entries.empty())
@@ -107 +107 @@
 
 /**
- * @brief opens a file to parse 
+ * @brief opens a file to parse
  * @param fileName: path and name of the new file to parse
  * @return true on success false otherwise;
@@ -217 +217 @@
       {
         fprintf(stream, "\n [%s]\n", (*section).name);
-        
+
         std::list<IniEntry>::const_iterator entry;
         for (entry = (*section).entries.begin(); entry != (*section).entries.end(); entry++)
@@ -316 +316 @@
 bool IniParser::nextVar()
 {
-  if ( this->sections.empty() 
+  if ( this->sections.empty()
        || this->currentSection == this->sections.end()
        || this->currentEntry == (*this->currentSection).entries.end())
@@ -342 +342 @@
 {
   std::list<IniSection>::iterator section;
-  
+
   if (sectionName != NULL)
   {
@@ -402 +402 @@
     else
       section = this->currentSection;
-    
+
    if (section == this->sections.end())
      {
@@ -414 +414 @@
         return (*entry).value;
     PRINTF(2)("Entry '%s' in section '%s' not found.\n", entryName, sectionName);
-   
+
   }
   else
@@ -425 +425 @@
 
 /**
- * @returns the name of the Current selected Section 
- */
-const char* IniParser::getCurrentSection() const 
+ * @returns the name of the Current selected Section
+ */
+const char* IniParser::getCurrentSection() const
 {
   if (!this->sections.empty() &&
-      this->currentSection != this->sections.end()) 
+      this->currentSection != this->sections.end())
     return this->currentSection->name;
   else
@@ -437 +437 @@
 
 
-/** 
- * @returns the current entries Name, or NULL if we havn't selected a Entry 
+/**
+ * @returns the current entries Name, or NULL if we havn't selected a Entry
  */
 const char* IniParser::getCurrentName() const
@@ -451 +451 @@
 
 /**
- * @returns the current entries Value, or NULL if we havn't selected a Entry 
- */
-const char* IniParser::getCurrentValue() const 
+ * @returns the current entries Value, or NULL if we havn't selected a Entry
+ */
+const char* IniParser::getCurrentValue() const
 {
   if (!this->sections.empty() &&
@@ -460 +460 @@
     return (*this->currentEntry).value;
   else
-    return NULL; 
+    return NULL;
 }