Add a flag to return also internal statements

[libs/datafile.git] / source / parser.cpp

diff --git a/source/parser.cpp b/source/parser.cpp
index 50948404921bd9903031946a8cc7f537ab37d1bc..3957cf343642b54f2f5b6123be3e907bc200436e 100644 (file)
--- a/source/parser.cpp
+++ b/source/parser.cpp
@@ -23,7 +23,7 @@ Parser::~Parser()
        delete mode;
 }
 
-Statement Parser::parse()
+Statement Parser::parse(bool raw)
 {
        if(!good)
                throw logic_error("Parser::parse() !good");
@@ -32,7 +32,7 @@ Statement Parser::parse()
        {
                while(1)
                {
-                       Statement st = mode->parse();
+                       Statement st = mode->parse(raw);
                        if(st.keyword=="__bin")
                        {
                                delete mode;
@@ -53,8 +53,16 @@ Statement Parser::parse()
                                else
                                        src = format("%s[%s]", main_src, s);
                        }
+                       else if(st.keyword=="__end")
+                       {
+                               good = false;
+                               return raw ? st : Statement();
+                       }
                        else
                                return st;
+
+                       if(raw)
+                               return st;
                }
        }
        catch(const exception &e)