Move newline eating out of BinaryParser

It's really a feature of the mode change logic, not the binary mode
itself.

diff --git a/source/binaryparser.cpp b/source/binaryparser.cpp
index 25edd63a15060d96bb5bcc95775cc3241dc9ce36..098a5fd4f96c936cad7aae6bfba31b0627c357ef 100644 (file)
--- a/source/binaryparser.cpp
+++ b/source/binaryparser.cpp
@@ -24,7 +24,6 @@ public:
 
 BinaryParser::BinaryParser(Input &i, const string &s):
        ParserMode(i, s),
-       first(true),
        float_precision(32)
 {
        dict[-1] = StatementKey("__kwd", "iss");
@@ -34,10 +33,6 @@ BinaryParser::BinaryParser(Input &i, const string &s):
 
 Statement BinaryParser::parse()
 {
-       while(first && in.peek()=='\n')
-               in.get();
-       first = false;
-
        int id = parse_int();
        if(!in)
                return Statement();

diff --git a/source/binaryparser.h b/source/binaryparser.h
index 6a46639cbbca7667873f5c5a68d30f8151e62dfa..255209a971bed7fdd5e7149e7a9dd20a8fb30cd4 100644 (file)
--- a/source/binaryparser.h
+++ b/source/binaryparser.h
@@ -19,7 +19,6 @@ private:
 
        Dictionary dict;
        StringMap strings;
-       bool first;
        unsigned float_precision;
 
 public:

diff --git a/source/parser.cpp b/source/parser.cpp
index 6166e561a984a0d99878f313199003fac095039b..d298eca44765ca134ae8b65f191c31296830ca92 100644 (file)
--- a/source/parser.cpp
+++ b/source/parser.cpp
@@ -61,6 +61,9 @@ void Parser::process_control_statement(const Statement &st)
        {
                delete mode;
                mode = new BinaryParser(in, src);
+
+               while(in.peek()=='\n')
+                       in.get();
        }
        else if(st.keyword=="__text")
        {