Changeset 3417

Timestamp:

2002-09-10T17:09:10+12:00 (22 years ago)

Author:

jrm21

Message:

Allow multi-line entries in config files - either ends with a "\", or
there is a newline character within the quote marks. Eg

format DocumentText \
"

<p>[foo]
_If_([bar], [bar], No bar)
</p>
<p>
[Text]

"

is now parsed as a single line, with embedded newline characters.

File:

• trunk/gsdl/lib/cfgread.cpp (modified) (4 diffs)

trunk/gsdl/lib/cfgread.cpp

@@ -25 +25 @@
 
 #include "cfgread.h"
+#include <ctype.h> // for isspace()
 
 int write_ini_line (ofstream &fileout, const text_t &key, const text_t value) {
@@ -90 +91 @@
     // ignore status - assume it is "finished" as buffer is big enough
     write(fileout, buffer, num_chars);
-    delete buffer;
+    delete[] buffer;
     first = false;
     here ++;
@@ -101 +102 @@
 // returns 0 on success, -1 on failure
 int read_cfg_line (ifstream &filein, text_tarray &values) {
-  //  outconvertclass text_t2ascii;
+  // we split up the line into tokens, pushing each token into the
+  // values array. Quoted phrases are a single token. A "\" at the end
+  // of a line continues onto the next line.
 
   values.erase(values.begin(), values.end());
@@ -108 +111 @@
 
   text_t curvalue;
-  char c, quote;
+  char c;
+  filein.get(c);
 
-  bool linecontinues = true;
-  filein.get(c);
-  while (!filein.eof() && linecontinues) {
-    // eat up all return characters
-    while (!filein.eof() && (c=='\n' || c=='\r')) { filein.get(c); }
+  // skip white space
+  while (!filein.eof() && isspace(c)) { filein.get(c); }
 
     // ignore comments
-    if (c == '#') {
-      while (!filein.eof() && c!='\n' && c!='\r') { filein.get(c); }
+  while (c == '#') {
+    while (!filein.eof() && c!='\n' && c!='\r') { filein.get(c); }
+    // skip white space...
+    while (!filein.eof() && isspace(c)) { filein.get(c); }
+  }
+
+  // deal with all the records on this line (possibly multi-line)
+  while (!filein.eof()) {
+    if (c=='\n' || c=='\r') { // shouldn't happen?
+      break;
     }
 
-    // deal with all the records on this line
-    while (!filein.eof() && c!='\n' && c!='\r') {
-      // ignore white space
-      while (!filein.eof() && (c==' ' || c=='\t')) { filein.get(c); }
-
-      // get the next record
-      if (c!='\n' && c!='\r') {
-    curvalue.clear();
-    quote = 0;
-
-    // see if this is a quoted record
-    if (c=='\'' || c=='\"') {
-      quote = c;
-      filein.get(c);
-    }
-
-    // get the value
-    while (!filein.eof() && c!='\n' && c!='\r') {
-      if (quote != 0 && c == quote) { // end of quote
-        filein.get(c);
-        break;
-      } else if (quote == 0 && (c == ' ' || c == '\t')) {
-        break; // space seperator
-      }
-      curvalue.push_back(c);
-      filein.get(c);
-    }
-
-    // see if the record continues on the next line
-    if ((c=='\n' || c=='\r') && curvalue=="\\") {
-      linecontinues = true;
-    } else {
-      //      cerr << text_t2ascii << "\"" << curvalue << "\" ";
-      
-      values.push_back(curvalue);
-      curvalue.clear();
-      linecontinues = false;
-    }
+    // get the next token
+    curvalue.clear();
+      
+      // see if this is a quoted phrase
+    if (c=='\'' || c=='\"') { // starts with a quote
+      char quote, old_c;
+      quote = c;
+      old_c = c;
+      filein.get(c);
+      while (!filein.eof() && (c != quote || old_c == '\\') ) {
+    curvalue.push_back(c);
+    old_c = c;
+    filein.get(c);
+      }
+      // get the character after the closing quote...
+      filein.get(c);
+    } else { // it's not a quoted phrase
+      // get the token
+      while (!filein.eof() && !isspace(c)) {
+    curvalue.push_back(c);
+    filein.get(c);
       }
     }
-  }
+    // we now have a token or a phrase
+    
+    // see if we've reached the end of the line
+    if (c == '\n' || c == '\r') {
+      if (curvalue != "\\") { // the line DOESN'T continue. End of line.
+    values.push_back(curvalue);
+    break;
+      }
+    } else { // no new line seen
+      values.push_back(curvalue);
+    }
 
-  //  cerr << "\n";
+    curvalue.clear();
+
+    //  the record continues on the next line
+    // remove whitespace before next token
+    while (!filein.eof() && isspace(c)) filein.get(c);
+
+  } // while(1)
+  
 
   return 0;