Merge
authorAlpar Juttner <alpar@cs.elte.hu>
Tue, 17 Jun 2008 12:28:49 +0100
changeset 1742ec3c1bbc687
parent 173 b026e9779b28
parent 172 c94a80f38d7f
child 176 47b69d4b0759
child 179 289266783a0b
Merge
lemon/lgf_reader.h
     1.1 --- a/lemon/lgf_reader.h	Mon Jun 16 18:23:11 2008 +0200
     1.2 +++ b/lemon/lgf_reader.h	Tue Jun 17 12:28:49 2008 +0100
     1.3 @@ -1139,9 +1139,9 @@
     1.4  
     1.5        line_num = 0;      
     1.6        readLine();
     1.7 +      skipSection();
     1.8  
     1.9        while (readSuccess()) {
    1.10 -	skipSection();
    1.11  	try {
    1.12  	  char c;
    1.13  	  std::string section, caption;
    1.14 @@ -1178,11 +1178,9 @@
    1.15  	    if (it != _sections.end()) {
    1.16  	      extra_sections.insert(section);
    1.17  	      it->second->process(*_is, line_num);
    1.18 -	      readLine();
    1.19 -	    } else {
    1.20 -	      readLine();
    1.21 -	      skipSection();
    1.22  	    }
    1.23 +	    readLine();
    1.24 +	    skipSection();
    1.25  	  }
    1.26  	} catch (DataFormatError& error) {
    1.27  	  error.line(line_num);
    1.28 @@ -1981,9 +1979,9 @@
    1.29  
    1.30        line_num = 0;      
    1.31        readLine();
    1.32 +      skipSection();
    1.33  
    1.34        while (readSuccess()) {
    1.35 -	skipSection();
    1.36  	try {
    1.37  	  char c;
    1.38  	  std::string section, caption;
    1.39 @@ -2020,11 +2018,9 @@
    1.40  	    if (it != _sections.end()) {
    1.41  	      extra_sections.insert(section);
    1.42  	      it->second->process(*_is, line_num);
    1.43 -	      readLine();
    1.44 -	    } else {
    1.45 -	      readLine();
    1.46 -	      skipSection();
    1.47  	    }
    1.48 +	    readLine();
    1.49 +	    skipSection();
    1.50  	  }
    1.51  	} catch (DataFormatError& error) {
    1.52  	  error.line(line_num);