1 files changed, 233 insertions, 233 deletions

diff --git a/src/target.cpp b/src/target.cpp
index 3a90c01..175030c 100644
--- a/src/target.cpp
+++ b/src/target.cpp
@@ -17,16 +17,16 @@
 using namespace Bu;
 
 Target::Target( bool bExplicit ) :
-        bExplicit( bExplicit ),
-        bRun( false ),
-        iDepCount( 0 )
+    bExplicit( bExplicit ),
+    bRun( false ),
+    iDepCount( 0 )
 {
 }
 
 Target::Target( const Bu::String &sOutput, bool bExplicit ) :
-        bExplicit( bExplicit ),
-        lsOutput( sOutput ),
-        iDepCount( 0 )
+    bExplicit( bExplicit ),
+    lsOutput( sOutput ),
+    iDepCount( 0 )
 {
 }
 
@@ -36,385 +36,385 @@ Target::~Target()
 
 void Target::addInput( const Bu::String &sInput )
 {
-        lsInput.append( sInput );
+    lsInput.append( sInput );
 }
 
 const StrList &Target::getInputList() const
 {
-        return lsInput;
+    return lsInput;
 }
 
 void Target::resetInputList( const StrList &lInputs )
 {
-        lsInput = lInputs;
-        if( lsInput.getSize() == 1 )
-        {
-                hVars.insert("INPUT", lsInput.first() );
-        }
-        else
-        {
-                Variable vInput( Variable::typeList );
-                for( StrList::iterator i = lsInput.begin(); i; i++ )
-                {
-                        vInput.append( Variable( *i ) );
-                }
-                hVars.insert("INPUT", vInput );
-        }
+    lsInput = lInputs;
+    if( lsInput.getSize() == 1 )
+    {
+        hVars.insert("INPUT", lsInput.first() );
+    }
+    else
+    {
+        Variable vInput( Variable::typeList );
+        for( StrList::iterator i = lsInput.begin(); i; i++ )
+        {
+            vInput.append( Variable( *i ) );
+        }
+        hVars.insert("INPUT", vInput );
+    }
 }
 
 void Target::addRequires( const Bu::String &sReq )
 {
-        lsRequires.append( sReq );
+    lsRequires.append( sReq );
 }
 
 void Target::addRequires( const AstBranch *pBr )
 {
-        lbRequires.append( pBr );
+    lbRequires.append( pBr );
 }
 
 const StrList &Target::getRequiresList() const
 {
-        return lsRequires;
+    return lsRequires;
 }
 
 void Target::gatherRequires( Runner &r )
 {
-        Cache &c = Cache::getInstance();
-        try
-        {
-                lsRequires = c.getRequires( lsOutput.first() );
-        }
-        catch( Bu::HashException &e )
-        {
-                buildRequires( r );
-        }
+    Cache &c = Cache::getInstance();
+    try
+    {
+        lsRequires = c.getRequires( lsOutput.first() );
+    }
+    catch( Bu::HashException &e )
+    {
+        buildRequires( r );
+    }
 }
 
 void Target::buildRequires( Runner &r )
 {
-        r.getContext().getView()->buildRequires( *this );
-        r.getContext().pushScope( hVars );
-        for( AstBranchList::iterator i = lbRequires.begin(); i; i++ )
-        {
-                Variable v = r.execExpr( (*(*i)->getBranchBegin()).begin() );
-                if( v.getType() == Variable::typeList )
-                {
-                        for( VarList::iterator j = v.begin(); j; j++ )
-                        {
-                                Bu::String sReq = (*j).toString();
-                                addRequires( sReq );
-                        /*      try
-                                {
-                                        addDep( r.getContext().getTarget( sReq ) );
-                                }
-                                catch(...) { }*/
-                        }
-                }
-                else
-                {
-                        Bu::String sReq = v.toString();
-                        addRequires( sReq );
-                /*      try
-                        {
-                                addDep( r.getContext().getTarget( sReq ) );
-                        }
-                        catch(...) { }*/
-                }
-        }
-        r.getContext().popScope();
-
-        Cache &c = Cache::getInstance();
-        c.setRequires( lsOutput.first(), lsRequires );
+    r.getContext().getView()->buildRequires( *this );
+    r.getContext().pushScope( hVars );
+    for( AstBranchList::iterator i = lbRequires.begin(); i; i++ )
+    {
+        Variable v = r.execExpr( (*(*i)->getBranchBegin()).begin() );
+        if( v.getType() == Variable::typeList )
+        {
+            for( VarList::iterator j = v.begin(); j; j++ )
+            {
+                Bu::String sReq = (*j).toString();
+                addRequires( sReq );
+            /*  try
+                {
+                    addDep( r.getContext().getTarget( sReq ) );
+                }
+                catch(...) { }*/
+            }
+        }
+        else
+        {
+            Bu::String sReq = v.toString();
+            addRequires( sReq );
+        /*  try
+            {
+                addDep( r.getContext().getTarget( sReq ) );
+            }
+            catch(...) { }*/
+        }
+    }
+    r.getContext().popScope();
+
+    Cache &c = Cache::getInstance();
+    c.setRequires( lsOutput.first(), lsRequires );
 }
 
 void Target::addOutput( const Bu::String &sOutput )
 {
-        lsOutput.append( sOutput );
+    lsOutput.append( sOutput );
 }
 
 const StrList &Target::getOutputList() const
 {
-        return lsOutput;
+    return lsOutput;
 }
 
 void Target::setPrefix( const Bu::String &sPrefix )
 {
-        this->sPrefix = sPrefix;
+    this->sPrefix = sPrefix;
 }
 
 const Bu::String &Target::getPrefix() const
 {
-        return sPrefix;
+    return sPrefix;
 }
 
 void Target::setRule( const Bu::String &sRule )
 {
-        this->sRule = sRule;
+    this->sRule = sRule;
 }
 
 const Bu::String &Target::getRule() const
 {
-        return sRule;
+    return sRule;
 }
 
 bool Target::hasRule() const
 {
-        return !sRule.isEmpty();
+    return !sRule.isEmpty();
 }
 
 bool Target::isExplicit() const
 {
-        return bExplicit;
+    return bExplicit;
 }
 
 void Target::addDep( Target *pDep )
 {
-        lDeps.append( pDep );
+    lDeps.append( pDep );
 }
 
 const TargetList &Target::getDepList() const
 {
-        return lDeps;
+    return lDeps;
 }
 
 void Target::addProfile( const class AstBranch *pProfRoot )
 {
-        Profile *pProf = new Profile( pProfRoot );
-        hProfiles.insert( pProf->getName(), pProf );
-        /*
-        hProfiles.insert(
-                dynamic_cast<const AstLeaf *>(
-                        (*pProfRoot->getBranchBegin()).first()
-                        )->getStrValue(),
-                pProfRoot
-                );
-                */
+    Profile *pProf = new Profile( pProfRoot );
+    hProfiles.insert( pProf->getName(), pProf );
+    /*
+    hProfiles.insert(
+        dynamic_cast<const AstLeaf *>(
+            (*pProfRoot->getBranchBegin()).first()
+            )->getStrValue(),
+        pProfRoot
+        );
+        */
 }
 
 void Target::addProfile( const class Profile *pSrc )
 {
-        hProfiles.insert( pSrc->getName(), new Profile( *pSrc ) );
+    hProfiles.insert( pSrc->getName(), new Profile( *pSrc ) );
 }
 
 bool Target::hasProfile( const Bu::String &sName ) const
 {
-        return hProfiles.has( sName );
+    return hProfiles.has( sName );
 }
 
 const Profile *Target::getProfile( const Bu::String &sName ) const
 {
-        return hProfiles.get( sName );
+    return hProfiles.get( sName );
 }
 
 void Target::setVars( const VarHash &hNewVars )
 {
 
-        hVars = hNewVars;
+    hVars = hNewVars;
 }
 
 const VarHash &Target::getVars() const
 {
-        return hVars;
+    return hVars;
 }
 
 void Target::setDisplay( const Bu::String &sNewDisplay )
 {
-        if( !sDisplay.isSet() )
-                sDisplay = sNewDisplay;
+    if( !sDisplay.isSet() )
+        sDisplay = sNewDisplay;
 }
 
 const Bu::String &Target::getDisplay() const
 {
-        return sDisplay;
+    return sDisplay;
 }
 
 void Target::process( class Runner &r, const Bu::String &sProfile )
 {
-        r.getContext().getView()->beginTarget( sProfile, *this );
-        bRun = true;
-        bool bShouldExec = false;
-
-        for( TargetList::iterator i = lDeps.begin(); i; i++ )
-        {
-                if( (*i)->bRun )
-                        continue;
-
-                // TODO:  This is important, in the future, it may be possible for a
-                // target to be triggered by multiple dependant targets, to cover for
-                // this the below mergeUnder should be *TEMPORARY* and the target
-                // that was marged to be reset post processing.
-                (*i)->mergeUnder( hVars );
-                (*i)->process( r, sProfile );
-        }
-        try
-        {
-                bShouldExec = hProfiles.get( sProfile )->shouldExec( r, *this );
-        }
-        catch( Bu::HashException &e )
-        {
-        }
-        
-        if( !bShouldExec )
-        {
-                r.getContext().getView()->skipTarget( sProfile, *this );
-        }
-        else
-        {
-                r.getContext().getView()->processTarget( sProfile, *this );
-                r.execProfile( this, sProfile );
-        }
-        
-        r.getContext().getView()->endTarget();
+    r.getContext().getView()->beginTarget( sProfile, *this );
+    bRun = true;
+    bool bShouldExec = false;
+
+    for( TargetList::iterator i = lDeps.begin(); i; i++ )
+    {
+        if( (*i)->bRun )
+            continue;
+
+        // TODO:  This is important, in the future, it may be possible for a
+        // target to be triggered by multiple dependant targets, to cover for
+        // this the below mergeUnder should be *TEMPORARY* and the target
+        // that was marged to be reset post processing.
+        (*i)->mergeUnder( hVars );
+        (*i)->process( r, sProfile );
+    }
+    try
+    {
+        bShouldExec = hProfiles.get( sProfile )->shouldExec( r, *this );
+    }
+    catch( Bu::HashException &e )
+    {
+    }
+    
+    if( !bShouldExec )
+    {
+        r.getContext().getView()->skipTarget( sProfile, *this );
+    }
+    else
+    {
+        r.getContext().getView()->processTarget( sProfile, *this );
+        r.execProfile( this, sProfile );
+    }
+    
+    r.getContext().getView()->endTarget();
 }
 
 void Target::mergeUnder( const VarHash &hNewVars )
 {
-        for( VarHash::const_iterator i = hNewVars.begin(); i; i++ )
-        {
-                if( !hVars.has( i.getKey() ) )
-                {
-                        hVars.insert( i.getKey(), i.getValue() );
-                }
-        }
+    for( VarHash::const_iterator i = hNewVars.begin(); i; i++ )
+    {
+        if( !hVars.has( i.getKey() ) )
+        {
+            hVars.insert( i.getKey(), i.getValue() );
+        }
+    }
 }
 
 bool Target::hasRun()
 {
-        return bRun;
+    return bRun;
 }
 
 void Target::mergeUnder( const Target *pSrc )
 {
-        // If either are explicit, then it's explicit
-        bExplicit = bExplicit || pSrc->bExplicit;
+    // If either are explicit, then it's explicit
+    bExplicit = bExplicit || pSrc->bExplicit;
 
-        merge( lsInput, pSrc->lsInput );
-        merge( lsRequires, pSrc->lsRequires );
-        merge( lsOutput, pSrc->lsOutput );
+    merge( lsInput, pSrc->lsInput );
+    merge( lsRequires, pSrc->lsRequires );
+    merge( lsOutput, pSrc->lsOutput );
 
-        if( !sPrefix.isSet() )
-                sPrefix = pSrc->sPrefix;
+    if( !sPrefix.isSet() )
+        sPrefix = pSrc->sPrefix;
 
-        sRule = pSrc->sRule;
+    sRule = pSrc->sRule;
 
-        mergeUnder( pSrc->hVars );
+    mergeUnder( pSrc->hVars );
 
-        // Deps?  They should be computed much after merging anyway, peh!
-        
-        for( ProfileHash::const_iterator i = pSrc->hProfiles.begin(); i; i++ )
-        {
-                if( !hProfiles.has( i.getKey() ) )
-                {
-                        hProfiles.insert( i.getKey(), i.getValue() );
-                }
-        }
+    // Deps?  They should be computed much after merging anyway, peh!
+    
+    for( ProfileHash::const_iterator i = pSrc->hProfiles.begin(); i; i++ )
+    {
+        if( !hProfiles.has( i.getKey() ) )
+        {
+            hProfiles.insert( i.getKey(), i.getValue() );
+        }
+    }
 
-        if( !sDisplay.isSet() )
-                sDisplay = pSrc->sDisplay;
+    if( !sDisplay.isSet() )
+        sDisplay = pSrc->sDisplay;
 
-        // Now we need to reset our vars.
-        hVars.insert("INPUT", lsInput );
-        hVars.insert("REQUIRES", lsRequires );
-        hVars.insert("OUTPUT", lsOutput );
+    // Now we need to reset our vars.
+    hVars.insert("INPUT", lsInput );
+    hVars.insert("REQUIRES", lsRequires );
+    hVars.insert("OUTPUT", lsOutput );
 }
 
 void Target::merge( StrList &lOut, const StrList &lIn )
 {
-        Bu::Heap<Bu::String> hStr;
-        for( StrList::const_iterator i = lOut.begin(); i; i++ )
-        {
-                hStr.enqueue( *i );
-        }
-        for( StrList::const_iterator i = lIn.begin(); i; i++ )
-        {
-                hStr.enqueue( *i );
-        }
-
-        lOut.clear();
-
-        if( hStr.isEmpty() )
-                return;
-
-        lOut.append( hStr.dequeue() );
-        while( !hStr.isEmpty() )
-        {
-                if( hStr.peek() == lOut.last() )
-                {
-                        hStr.dequeue();
-                }
-                else
-                {
-                        lOut.append( hStr.dequeue() );
-                }
-        }
+    Bu::Heap<Bu::String> hStr;
+    for( StrList::const_iterator i = lOut.begin(); i; i++ )
+    {
+        hStr.enqueue( *i );
+    }
+    for( StrList::const_iterator i = lIn.begin(); i; i++ )
+    {
+        hStr.enqueue( *i );
+    }
+
+    lOut.clear();
+
+    if( hStr.isEmpty() )
+        return;
+
+    lOut.append( hStr.dequeue() );
+    while( !hStr.isEmpty() )
+    {
+        if( hStr.peek() == lOut.last() )
+        {
+            hStr.dequeue();
+        }
+        else
+        {
+            lOut.append( hStr.dequeue() );
+        }
+    }
 }
 
 void Target::resetRun( bool bHasRun )
 {
-        bRun = bHasRun;
+    bRun = bHasRun;
 
-        for( TargetList::iterator i = lDeps.begin(); i; i++ )
-        {
-                (*i)->resetRun( bHasRun );
-        }
+    for( TargetList::iterator i = lDeps.begin(); i; i++ )
+    {
+        (*i)->resetRun( bHasRun );
+    }
 }
 
 void Target::setDepCount()
 {
-        bRun = true;
-        iDepCount = 1;
-        for( TargetList::iterator i = lDeps.begin(); i; i++ )
-        {
-                if( (*i)->bRun )
-                {
-                        continue;
-                }
-                (*i)->setDepCount();
-                iDepCount += (*i)->getDepCount();
-        }
+    bRun = true;
+    iDepCount = 1;
+    for( TargetList::iterator i = lDeps.begin(); i; i++ )
+    {
+        if( (*i)->bRun )
+        {
+            continue;
+        }
+        (*i)->setDepCount();
+        iDepCount += (*i)->getDepCount();
+    }
 }
 
 int Target::getDepCount() const
 {
-        return iDepCount;
+    return iDepCount;
 }
 
 void Target::collapseDeps()
 {
-        if( lDeps.getSize() <= 1 )
-                return;
-        Bu::Hash<ptrdiff_t, bool> hDep;
-        for( TargetList::iterator i = lDeps.begin(); i; i++ )
-        {
-                if( hDep.has( (ptrdiff_t)*i ) )
-                {
-                        lDeps.erase( i );
-                        i--;
-                }
-                else
-                {
-                        hDep.insert( (ptrdiff_t)*i, true );
-                }
-        }
+    if( lDeps.getSize() <= 1 )
+        return;
+    Bu::Hash<ptrdiff_t, bool> hDep;
+    for( TargetList::iterator i = lDeps.begin(); i; i++ )
+    {
+        if( hDep.has( (ptrdiff_t)*i ) )
+        {
+            lDeps.erase( i );
+            i--;
+        }
+        else
+        {
+            hDep.insert( (ptrdiff_t)*i, true );
+        }
+    }
 }
 
 Bu::Formatter &operator<<( Bu::Formatter &f, const Target &t )
 {
-        f.incIndent();
-        f << f.nl << "Input = " << t.lsInput << "," << f.nl
-                << "Requires = " << t.lsRequires << "," << f.nl
-                << "Output = \"" << t.lsOutput << "\"," << f.nl
-                << "Prefix = \"" << t.sPrefix << "\"," << f.nl
-                << "Rule = \"" << t.sRule << "\"," << f.nl
-                << "Explicit = " << t.bExplicit << "," << f.nl
-                << "Vars = " << t.hVars
-                << f.nl;
-        f.decIndent();
-        return f;
+    f.incIndent();
+    f << f.nl << "Input = " << t.lsInput << "," << f.nl
+        << "Requires = " << t.lsRequires << "," << f.nl
+        << "Output = \"" << t.lsOutput << "\"," << f.nl
+        << "Prefix = \"" << t.sPrefix << "\"," << f.nl
+        << "Rule = \"" << t.sRule << "\"," << f.nl
+        << "Explicit = " << t.bExplicit << "," << f.nl
+        << "Vars = " << t.hVars
+        << f.nl;
+    f.decIndent();
+    return f;
 }
 
 template<> Bu::Formatter &Bu::operator<< <Target>( Bu::Formatter &f, const Target *t )
 {
-        return f << (*t);
+    return f << (*t);
 }