X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=tool%2Fpacker.cpp;h=ff69912fe40124fe4d64e37f5d13330b521782c0;hp=44be7243e86e45df093e8fdf38270f8bcdfbbd45;hb=29fafaa2c570b0cf92f41eeb534cfb65a841a892;hpb=0d8df25704366f3576c417436c90fbac2e479632 diff --git a/tool/packer.cpp b/tool/packer.cpp index 44be724..ff69912 100644 --- a/tool/packer.cpp +++ b/tool/packer.cpp @@ -106,8 +106,7 @@ void Packer::transfer_datafile(IO::Base &in, const string &fn, IO::Base &out, Ob DataFile::Statement st = parser.parse(true); if(st.valid) { - bool sys = !st.keyword.compare(0, 2, "__"); - if(collection && !sys) + if(collection && !st.control) { if(st.get_signature()=="s") { @@ -119,7 +118,7 @@ void Packer::transfer_datafile(IO::Base &in, const string &fn, IO::Base &out, Ob else collection = false; } - if(!sys || st.keyword=="__src") + if(!st.control || st.keyword=="__src") writer->write(st); } }