Changeset 2460:3c347c306703 in lemon-0.x for lemon/lemon_reader.h

Timestamp:

07/26/07 14:18:02 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Correction in the line numbering method

File:

• lemon/lemon_reader.h (modified) (2 diffs)

lemon/lemon_reader.h

@@ -617 +617 @@
         return EOF;
       }
+
+    public:
+
+      int line_num() const {
+        int r = _num;
+        for (char_type* p = gptr(); p != egptr(); ++p) {
+          if (*p == '\n') --r;
+        }
+        return r;
+      }
+
     };
 
@@ -701 +712 @@
       int line_num = 0;
       std::string line;
-      try {
-        SectionReaders::iterator it;
-        while ((++line_num, getline(*is, line)) && line.find("@end") != 0) {
-          for (it = readers.begin(); it != readers.end(); ++it) {
-            if (it->first->header(line)) {
-              it->second = true;
-              char buf[2048];
-              FilterStreamBuf buffer(*is, line_num);
+      
+      SectionReaders::iterator it;
+      while ((++line_num, getline(*is, line)) && line.find("@end") != 0) {
+        for (it = readers.begin(); it != readers.end(); ++it) {
+          if (it->first->header(line)) {
+            it->second = true;
+            char buf[2048];
+            FilterStreamBuf buffer(*is, line_num);
+
+            try {
               buffer.pubsetbuf(buf, sizeof(buf));
               std::istream ss(&buffer);
               it->first->read(ss);
               break;
-            }
+            } catch (DataFormatError& error) {
+              error.line(buffer.line_num());
+              throw;
+            }   
           }
         }
-        for (it = readers.begin(); it != readers.end(); ++it) {
-          if (!it->second) {
-            it->first->missing();
-          }
-        }
-      } catch (DataFormatError& error) {
-        error.line(line_num);
-        throw;
-      } 
+      }
+      for (it = readers.begin(); it != readers.end(); ++it) {
+        if (!it->second) {
+          try {
+            it->first->missing();
+          } catch (DataFormatError& error) {
+            error.line(line_num);
+            throw;
+          }     
+        }
+      }
     }