Changeset 2426:6e1027a05d73 in lemon-0.x for lemon

Timestamp:

04/19/07 17:14:34 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3262

Message:

Allowing 'string' type quoting

Location:

lemon/bits

Files:

• item_reader.h (modified) (2 diffs)
• item_writer.h (modified) (5 diffs)

lemon/bits/item_reader.h

@@ -31 +31 @@
 #include <list>
 #include <set>
+#include <map>
+
+#include <lemon/error.h>
 
 namespace lemon {
@@ -173 +176 @@
       value.clear();
       is >> std::ws;
-      if (!is.get(c) || c != '\"') 
+      if (!is.get(c) || (c != '\"' && c != '\'')) 
         throw DataFormatError("Quoted format error");
-      while (is.get(c) && c != '\"') {
+      char quote = c;
+      while (is.get(c) && c != quote) {
         if (escaped && c == '\\') {
           value += readEscape(is);

lemon/bits/item_writer.h

@@ -32 +32 @@
 #include <list>
 #include <set>
+#include <map>
+
+#include <lemon/error.h>
 
 namespace lemon {
@@ -147 +150 @@
     /// Constructor for the writer. If the given parameter is true
     /// the writer creates escape sequences from special characters.
-    QuotedStringWriter(bool _escaped = true) : escaped(_escaped) {}
+    QuotedStringWriter(bool _escaped = true, char _quote = '\"') 
+      : escaped(_escaped), quote(_quote) {}
 
     /// \brief Writes a quoted string to the given stream.
@@ -153 +157 @@
     /// Writes a quoted string to the given stream.
     void write(std::ostream& os, const std::string& value) const {
-      os << "\"";
+      os << quote;
       if (escaped) {
         std::ostringstream ls;
@@ -163 +167 @@
         os << value;
       }
-      os << "\"";
+      os << quote;
     }
 
@@ -214 +218 @@
   private:
     bool escaped;
+    char quote;
   };