Style update: add spaces around assignments

[libs/datafile.git] / tool / compiler.cpp

diff --git a/tool/compiler.cpp b/tool/compiler.cpp
index ed5710b97d3bd8d3ffac53d88f4c41855b2866fd..8c280c4a2ec2a3d0ec3ed07fd72235d15a8bc92c 100644 (file)
--- a/tool/compiler.cpp
+++ b/tool/compiler.cpp
@@ -40,10 +40,10 @@ void Compiler::write(const DataFile::Statement &st)
        if(reset_src)
        {
                writer.write((DataFile::Statement("__src"), string()));
-               reset_src=false;
+               reset_src = false;
        }
 
-       for(list<DataFile::Statement>::const_iterator i=st.sub.begin(); i!=st.sub.end(); ++i)
+       for(list<DataFile::Statement>::const_iterator i = st.sub.begin(); i!=st.sub.end(); ++i)
                writer.write(*i);
 }
 
@@ -52,11 +52,11 @@ bool Compiler::process_statement(const FS::Path &fn, DataFile::Statement &st)
        if(st.keyword=="_content")
                return true;
 
-       for(vector<DataFile::Value>::iterator i=st.args.begin(); i!=st.args.end(); ++i)
+       for(vector<DataFile::Value>::iterator i = st.args.begin(); i!=st.args.end(); ++i)
                if(i->get_type()==DataFile::STRING)
                {
                        if(i->get_raw()=="$filename")
-                               *i=DataFile::Value(FS::basename(fn.str()));
+                               *i = DataFile::Value(FS::basename(fn.str()));
                        else if(i->get_raw()=="$content")
                        {
                                IO::File in(fn.str());
@@ -64,14 +64,14 @@ bool Compiler::process_statement(const FS::Path &fn, DataFile::Statement &st)
                                while(!in.eof())
                                {
                                        char buf[4096];
-                                       unsigned len=in.read(buf, sizeof(buf));
+                                       unsigned len = in.read(buf, sizeof(buf));
                                        data.append(buf, len);
                                }
-                               *i=DataFile::Value(data);
+                               *i = DataFile::Value(data);
                        }
                }
 
-       for(list<DataFile::Statement>::iterator i=st.sub.begin(); i!=st.sub.end();)
+       for(list<DataFile::Statement>::iterator i = st.sub.begin(); i!=st.sub.end();)
        {
                if(process_statement(fn, *i))
                {
@@ -81,11 +81,11 @@ bool Compiler::process_statement(const FS::Path &fn, DataFile::Statement &st)
                        DataFile::Parser parser(in, fn.str());
                        while(parser)
                        {
-                               DataFile::Statement ss=parser.parse();
+                               DataFile::Statement ss = parser.parse();
                                if(ss.valid)
                                        st.sub.insert(i, ss);
                        }
-                       i=st.sub.erase(i);
+                       i = st.sub.erase(i);
                }
                else
                        ++i;
@@ -97,19 +97,19 @@ bool Compiler::process_statement(const FS::Path &fn, DataFile::Statement &st)
 void Compiler::process_file(const FS::Path &fn, const list<DataFile::Statement> &st)
 {
        writer.write((DataFile::Statement("__src"), FS::basename(fn.str())));
-       reset_src=true;
+       reset_src = true;
 
        if(st.empty())
                process_file(fn);
        else
        {
-               for(list<DataFile::Statement>::const_iterator i=st.begin(); i!=st.end(); ++i)
+               for(list<DataFile::Statement>::const_iterator i = st.begin(); i!=st.end(); ++i)
                {
                        if(i->keyword=="_content")
                                process_file(fn);
                        else
                        {
-                               DataFile::Statement s=*i;
+                               DataFile::Statement s = *i;
                                process_statement(fn, s);
                                writer.write(s);
                        }
@@ -125,7 +125,7 @@ void Compiler::process_file(const FS::Path &fn)
        DataFile::Parser parser(in, fn.str());
        while(parser)
        {
-               DataFile::Statement st=parser.parse();
+               DataFile::Statement st = parser.parse();
                if(st.valid)
                        writer.write(st);
        }
@@ -162,14 +162,14 @@ ForEach::ForEach(Compiler &c, const FS::Path &b, const list<string> &p):
 
 void ForEach::finish()
 {
-       list<string> files=FS::list_files(base);
-       for(list<string>::iterator i=files.begin(); i!=files.end(); ++i)
+       list<string> files = FS::list_files(base);
+       for(list<string>::iterator i = files.begin(); i!=files.end(); ++i)
        {
-               bool match=false;
-               for(list<string>::const_iterator j=patterns.begin(); (j!=patterns.end() && !match); ++j)
-                       match=Regex(*j).match(*i);
-               for(list<string>::const_iterator j=excludes.begin(); (j!=excludes.end() && match); ++j)
-                       match=!Regex(*j).match(*i);
+               bool match = false;
+               for(list<string>::const_iterator j = patterns.begin(); (j!=patterns.end() && !match); ++j)
+                       match = Regex(*j).match(*i);
+               for(list<string>::const_iterator j = excludes.begin(); (j!=excludes.end() && match); ++j)
+                       match = !Regex(*j).match(*i);
                if(match)
                        compiler.process_file(base / *i, write_st);
        }