Changeset 1291

Timestamp:

10/24/07 16:36:57 (12 months ago)

Author:

calvin

Message:

zoners patch: index.txt supports includes

Location:

trunk/src/buzelib/Utils

Files:

• MachineIndex.cpp (modified) (5 diffs)
• MachineIndex.h (modified) (2 diffs)

trunk/src/buzelib/Utils/MachineIndex.cpp

@@ -19 +19 @@
 // found the trims in one of the comments at http://www.codeproject.com/vcpp/stl/stdstringtrim.asp
 
-IndexItem* MachineIndex::parseLine(const std::string& line) {
+IndexItem* MachineIndex::parseLine(const std::string& line, FileReader &reader) {
         if (line.length()==0) return 0;
         // try to split on comma, if second part is blank, it is hidden
@@ -51 +51 @@
 }
 
-MachineMenu* MachineIndex::parseMenu(const std::string& firstLine) {
+MachineMenu* MachineIndex::parseMenu(const std::string& firstLine, FileReader &reader) {
         MachineMenu* menu=new MachineMenu();
         assert(firstLine.length()>0);
@@ -64 +64 @@
                 } else
                 if (line.at(0)=='/') {
-                        MachineMenu* childMenu=parseMenu(line);
+                        MachineMenu* childMenu=parseMenu(line, reader);
                         if (childMenu)
                                 menu->append(childMenu);
                 } else {
-                        IndexItem* item=parseLine(line);
+                        IndexItem* item=parseLine(line, reader);
                         if (item) {
                                 menu->append(item);
@@ -78 +78 @@
 
 void MachineIndex::open(const char* fn) {
+        FileReader reader;
+        string line;
+
         if (!reader.open(fn)) return ;
-        string line;
         while (!reader.eof()) {
                 //cout << reader.readLine() << endl;
@@ -89 +91 @@
                 } else
                 if (line.at(0)=='/') {
-                        item=parseMenu(line);
-                } else
-                        item=parseLine(line);
+                        item=parseMenu(line, reader);
+                } else
+                if (line.at(0) == '#') {
+                        const char *str;
+
+                        str = line.c_str();
+                        if(str && strlen(str) > 15 && !strncmp(str, "# buze-include ", 15))
+                        {
+                                open(str + 15);
+                        }
+                        item=0;
+                } else
+                        item=parseLine(line, reader);
 
                 if (item)

trunk/src/buzelib/Utils/MachineIndex.h

@@ -50 +50 @@
 
 class MachineIndex {
-        FileReader reader;
+//      FileReader reader;
         FileWriter writer;
 //      std::stack<IndexItem*> currentMenu;
@@ -57 +57 @@
         MachineMenu root;
 
-        IndexItem* parseLine(const std::string& line);
-        MachineMenu* parseMenu(const std::string& firstLine);
+        IndexItem* parseLine(const std::string& line, FileReader &reader);
+        MachineMenu* parseMenu(const std::string& firstLine, FileReader &reader);
         void open(const char* fn);