[Lemon-commits] Alpar Juttner: Merge

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/2ec3c1bbc687
changeset: 174:2ec3c1bbc687
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Tue Jun 17 12:28:49 2008 +0100
description:
	Merge

diffstat:

1 file changed, 6 insertions(+), 10 deletions(-)
lemon/lgf_reader.h |   16 ++++++----------

diffs (53 lines):

diff -r b026e9779b28 -r 2ec3c1bbc687 lemon/lgf_reader.h
--- a/lemon/lgf_reader.h	Mon Jun 16 18:23:11 2008 +0200
+++ b/lemon/lgf_reader.h	Tue Jun 17 12:28:49 2008 +0100
@@ -1139,9 +1139,9 @@
 
       line_num = 0;      
       readLine();
+      skipSection();
 
       while (readSuccess()) {
-	skipSection();
 	try {
 	  char c;
 	  std::string section, caption;
@@ -1178,11 +1178,9 @@
 	    if (it != _sections.end()) {
 	      extra_sections.insert(section);
 	      it->second->process(*_is, line_num);
-	      readLine();
-	    } else {
-	      readLine();
-	      skipSection();
 	    }
+	    readLine();
+	    skipSection();
 	  }
 	} catch (DataFormatError& error) {
 	  error.line(line_num);
@@ -1981,9 +1979,9 @@
 
       line_num = 0;      
       readLine();
+      skipSection();
 
       while (readSuccess()) {
-	skipSection();
 	try {
 	  char c;
 	  std::string section, caption;
@@ -2020,11 +2018,9 @@
 	    if (it != _sections.end()) {
 	      extra_sections.insert(section);
 	      it->second->process(*_is, line_num);
-	      readLine();
-	    } else {
-	      readLine();
-	      skipSection();
 	    }
+	    readLine();
+	    skipSection();
 	  }
 	} catch (DataFormatError& error) {
 	  error.line(line_num);