Changeset 5951 in orxonox.OLD for trunk/src

Timestamp:

Dec 7, 2005, 1:18:38 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: cool functions

Location:

trunk/src/lib/parser/ini_parser

Files:

• ini_parser.cc (modified) (2 diffs)
• ini_parser.h (modified) (1 diff)

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

@@ -544 +544 @@
 
 /**
- *
+ * Finds the Section Iterator of the Section Called sectionName
+ * @param sectionName the Name of the Section to get the Iterator from
  */
 std::list<IniParser::IniSection>::const_iterator IniParser::getSectionIT(const char* sectionName) const
 {
-  std::list<IniSection>::const_iterator section;
+  std::list<IniSection>::const_iterator section = this->currentSection;
   if (sectionName != NULL)
-  {
     for (section = this->sections.begin(); section != this->sections.end(); section++)
-    {
       if (!strcmp((*section).name, sectionName))
-      {
         break;
-      }
-    }
-  }
-  else
-    section = this->currentSection;
-
   return section;
 }
 
-/**
- *
+
+/**
+ * Finds the Section Iterator of the Section Called sectionName
+ * @param sectionName the Name of the Section to get the Iterator from
+ */
+std::list<IniParser::IniSection>::iterator IniParser::getSectionIT(const char* sectionName)
+{
+  std::list<IniSection>::iterator section = this->currentSection;
+  if (sectionName != NULL)
+    for (section = this->sections.begin(); section != this->sections.end(); section++)
+      if (!strcmp((*section).name, sectionName))
+        break;
+  return section;
+}
+
+
+/**
+ * Finds the Entry Iterator of the Section Called sectionName and entry called EntryName
+ * @param entryName the Name of the Entry to get the Iterator from
+ * @param sectionName the Name of the Section to get the Iterator from
  */
 std::list<IniParser::IniEntry>::const_iterator IniParser::getEntryIT(const char* entryName, const char* sectionName) const
@@ -572 +582 @@
   if (entryName == NULL)
     return this->currentEntry;
-
-}
-
+  std::list<IniSection>::const_iterator section = this->getSectionIT(sectionName);
+  std::list<IniEntry>::const_iterator entry = this->currentEntry;
+
+  if (section != this->sections.end())
+    for (entry = (*section).entries.begin(); entry != (*section).entries.end(); entry++)
+      if (!strcmp((*entry).name, entryName))
+        break;
+  return entry;
+}
+
+
+/**
+ * Finds the Entry Iterator of the Section Called sectionName and entry called EntryName
+ * @param entryName the Name of the Entry to get the Iterator from
+ * @param sectionName the Name of the Section to get the Iterator from
+ */
+std::list<IniParser::IniEntry>::iterator IniParser::getEntryIT(const char* entryName, const char* sectionName)
+{
+  if (entryName == NULL)
+    return this->currentEntry;
+  std::list<IniSection>::iterator section = this->getSectionIT(sectionName);
+  std::list<IniEntry>::iterator entry = this->currentEntry;
+
+  if (section != this->sections.end())
+    for (entry = (*section).entries.begin(); entry != (*section).entries.end(); entry++)
+      if (!strcmp((*entry).name, entryName))
+        break;
+  return entry;
+}
 
 

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

@@ -95 +95 @@
 
     std::list<IniSection>::const_iterator getSectionIT(const char* sectionName) const;
+    std::list<IniSection>::iterator getSectionIT(const char* sectionName);
+
     std::list<IniEntry>::const_iterator getEntryIT(const char* entryName, const char* sectionName = NULL) const;
+    std::list<IniEntry>::iterator getEntryIT(const char* entryName, const char* sectionName = NULL);
 
   private: