aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xbuild.sh4
-rw-r--r--src/action.cpp2
-rw-r--r--src/action.h6
-rw-r--r--src/ast.cpp4
-rw-r--r--src/ast.h6
-rw-r--r--src/astleaf.cpp8
-rw-r--r--src/astleaf.h10
-rw-r--r--src/build.l6
-rw-r--r--src/buildparser.cpp18
-rw-r--r--src/buildparser.h16
-rw-r--r--src/cache.cpp6
-rw-r--r--src/cache.h14
-rw-r--r--src/conditionplugger.cpp4
-rw-r--r--src/context.cpp34
-rw-r--r--src/context.h32
-rw-r--r--src/function.h4
-rw-r--r--src/functionast.cpp2
-rw-r--r--src/functionast.h4
-rw-r--r--src/functiondirname.cpp14
-rw-r--r--src/functiondirname.h2
-rw-r--r--src/functiondirs.cpp2
-rw-r--r--src/functiondirs.h2
-rw-r--r--src/functionexecute.cpp4
-rw-r--r--src/functionexecute.h2
-rw-r--r--src/functionexists.cpp4
-rw-r--r--src/functionexists.h2
-rw-r--r--src/functionfilename.cpp12
-rw-r--r--src/functionfilename.h2
-rw-r--r--src/functionfiles.cpp2
-rw-r--r--src/functionfiles.h2
-rw-r--r--src/functiongetmakedeps.cpp8
-rw-r--r--src/functiongetmakedeps.h2
-rw-r--r--src/functionmatches.cpp14
-rw-r--r--src/functionmatches.h6
-rw-r--r--src/functionplugger.cpp4
-rw-r--r--src/functionregex.cpp12
-rw-r--r--src/functionregex.h6
-rw-r--r--src/functionreplace.cpp4
-rw-r--r--src/functionreplace.h2
-rw-r--r--src/functiontargets.cpp2
-rw-r--r--src/functiontargets.h2
-rw-r--r--src/functiontostring.cpp6
-rw-r--r--src/functiontostring.h2
-rw-r--r--src/functionunlink.cpp2
-rw-r--r--src/functionunlink.h2
-rw-r--r--src/location.cpp2
-rw-r--r--src/location.h6
-rw-r--r--src/main.cpp18
-rw-r--r--src/profile.cpp4
-rw-r--r--src/profile.h6
-rw-r--r--src/rule.cpp14
-rw-r--r--src/rule.h18
-rw-r--r--src/runner.cpp28
-rw-r--r--src/runner.h8
-rw-r--r--src/target.cpp32
-rw-r--r--src/target.h32
-rw-r--r--src/types.h8
-rw-r--r--src/variable.cpp32
-rw-r--r--src/variable.h12
-rw-r--r--src/view.h26
-rw-r--r--src/viewdefault.cpp38
-rw-r--r--src/viewdefault.h30
-rw-r--r--src/viewmake.cpp24
-rw-r--r--src/viewmake.h24
-rw-r--r--src/viewplugger.cpp4
65 files changed, 335 insertions, 335 deletions
diff --git a/build.sh b/build.sh
index 94159e0..7111f4d 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
1#!/bin/bash 1#!/bin/bash
2 2
3BUSRC="stack.cpp fstring.cpp fbasicstring.cpp hash.cpp list.cpp trace.cpp stream.cpp formatter.cpp util.cpp sharedcore.cpp exceptionbase.cpp heap.cpp archivebase.cpp archive.cpp queue.cpp archival.cpp sio.cpp stdstream.cpp process.cpp plugger.cpp optparser.cpp signals.cpp array.cpp membuf.cpp file.cpp regex.cpp variant.cpp" 3BUSRC="stack.cpp string.cpp hash.cpp list.cpp trace.cpp stream.cpp formatter.cpp util.cpp sharedcore.cpp exceptionbase.cpp heap.cpp archivebase.cpp archive.cpp queue.cpp archival.cpp sio.cpp stdstream.cpp process.cpp plugger.cpp optparser.cpp signals.cpp array.cpp membuf.cpp file.cpp regex.cpp variant.cpp"
4BUHDR="stack.h fstring.h fbasicstring.h hash.h list.h trace.h stream.h formatter.h util.h sharedcore.h exceptionbase.h heap.h archivebase.h archive.h queue.h archival.h sio.h stdstream.h process.h config.h compat/linux.h compat/win32.h compat/osx.h plugger.h singleton.h optparser.h signals.h array.h membuf.h file.h regex.h variant.h" 4BUHDR="stack.h string.h hash.h list.h trace.h stream.h formatter.h util.h sharedcore.h exceptionbase.h heap.h archivebase.h archive.h queue.h archival.h sio.h stdstream.h process.h config.h compat/linux.h compat/win32.h compat/osx.h plugger.h singleton.h optparser.h signals.h array.h membuf.h file.h regex.h variant.h"
5 5
6function bld() 6function bld()
7{ 7{
diff --git a/src/action.cpp b/src/action.cpp
index 8b10641..1a2b8b1 100644
--- a/src/action.cpp
+++ b/src/action.cpp
@@ -20,7 +20,7 @@ Action::~Action()
20 pAst = NULL; 20 pAst = NULL;
21} 21}
22 22
23const Bu::FString &Action::getName() const 23const Bu::String &Action::getName() const
24{ 24{
25 return sName; 25 return sName;
26} 26}
diff --git a/src/action.h b/src/action.h
index 7f60095..de08911 100644
--- a/src/action.h
+++ b/src/action.h
@@ -1,7 +1,7 @@
1#ifndef ACTION_H 1#ifndef ACTION_H
2#define ACTION_H 2#define ACTION_H
3 3
4#include <bu/fstring.h> 4#include <bu/string.h>
5 5
6class Action 6class Action
7{ 7{
@@ -9,7 +9,7 @@ public:
9 Action( const class AstBranch *pRoot ); 9 Action( const class AstBranch *pRoot );
10 virtual ~Action(); 10 virtual ~Action();
11 11
12 const Bu::FString &getName() const; 12 const Bu::String &getName() const;
13 13
14 void call( class Runner *pRunner ); 14 void call( class Runner *pRunner );
15 15
@@ -19,7 +19,7 @@ public:
19 static Action *genDefaultDefault(); 19 static Action *genDefaultDefault();
20 20
21private: 21private:
22 Bu::FString sName; 22 Bu::String sName;
23 const class AstBranch *pRoot; 23 const class AstBranch *pRoot;
24 class Ast *pAst; 24 class Ast *pAst;
25}; 25};
diff --git a/src/ast.cpp b/src/ast.cpp
index 6b213ea..005372b 100644
--- a/src/ast.cpp
+++ b/src/ast.cpp
@@ -53,7 +53,7 @@ void Ast::addNode( YYLTYPE &loc, AstNode::Type eType, bool bVal )
53 addNode( new AstLeaf( loc, eType, bVal ) ); 53 addNode( new AstLeaf( loc, eType, bVal ) );
54} 54}
55 55
56void Ast::addNode( YYLTYPE &loc, AstNode::Type eType, const Bu::FString &sVal ) 56void Ast::addNode( YYLTYPE &loc, AstNode::Type eType, const Bu::String &sVal )
57{ 57{
58 addNode( new AstLeaf( loc, eType, sVal ) ); 58 addNode( new AstLeaf( loc, eType, sVal ) );
59} 59}
@@ -87,7 +87,7 @@ void Ast::addNode( AstNode::Type eType, bool bVal )
87 addNode( none, eType, bVal ); 87 addNode( none, eType, bVal );
88} 88}
89 89
90void Ast::addNode( AstNode::Type eType, const Bu::FString &sVal ) 90void Ast::addNode( AstNode::Type eType, const Bu::String &sVal )
91{ 91{
92 YYLTYPE none = {-1, -1, -1, -1}; 92 YYLTYPE none = {-1, -1, -1, -1};
93 addNode( none, eType, sVal ); 93 addNode( none, eType, sVal );
diff --git a/src/ast.h b/src/ast.h
index c62406b..3cc7206 100644
--- a/src/ast.h
+++ b/src/ast.h
@@ -3,7 +3,7 @@
3 3
4#include "bu/list.h" 4#include "bu/list.h"
5#include "bu/stack.h" 5#include "bu/stack.h"
6#include "bu/fstring.h" 6#include "bu/string.h"
7#include "bu/formatter.h" 7#include "bu/formatter.h"
8 8
9#include "astnode.h" 9#include "astnode.h"
@@ -24,14 +24,14 @@ public:
24 void addNode( struct YYLTYPE &loc, AstNode::Type eType, float fVal ); 24 void addNode( struct YYLTYPE &loc, AstNode::Type eType, float fVal );
25 void addNode( struct YYLTYPE &loc, AstNode::Type eType, bool bVal ); 25 void addNode( struct YYLTYPE &loc, AstNode::Type eType, bool bVal );
26 void addNode( struct YYLTYPE &loc, AstNode::Type eType, 26 void addNode( struct YYLTYPE &loc, AstNode::Type eType,
27 const Bu::FString &sVal ); 27 const Bu::String &sVal );
28 void addNode( struct YYLTYPE &loc, AstNode::Type eType, const char *sVal ); 28 void addNode( struct YYLTYPE &loc, AstNode::Type eType, const char *sVal );
29 29
30 void addNode( AstNode::Type eType ); 30 void addNode( AstNode::Type eType );
31 void addNode( AstNode::Type eType, int iVal ); 31 void addNode( AstNode::Type eType, int iVal );
32 void addNode( AstNode::Type eType, float fVal ); 32 void addNode( AstNode::Type eType, float fVal );
33 void addNode( AstNode::Type eType, bool bVal ); 33 void addNode( AstNode::Type eType, bool bVal );
34 void addNode( AstNode::Type eType, const Bu::FString &sVal ); 34 void addNode( AstNode::Type eType, const Bu::String &sVal );
35 void addNode( AstNode::Type eType, const char *sVal ); 35 void addNode( AstNode::Type eType, const char *sVal );
36 void addNode( AstNode *pNode ); 36 void addNode( AstNode *pNode );
37 37
diff --git a/src/astleaf.cpp b/src/astleaf.cpp
index 5182a58..c192dbf 100644
--- a/src/astleaf.cpp
+++ b/src/astleaf.cpp
@@ -27,7 +27,7 @@ AstLeaf::AstLeaf( const Location &loc, Type eType, bool bNew ) :
27 setBoolValue( bNew ); 27 setBoolValue( bNew );
28} 28}
29 29
30AstLeaf::AstLeaf( const Location &loc, Type eType, const Bu::FString &sNew ) : 30AstLeaf::AstLeaf( const Location &loc, Type eType, const Bu::String &sNew ) :
31 AstNode( loc, eType ), 31 AstNode( loc, eType ),
32 sVal( NULL ) 32 sVal( NULL )
33{ 33{
@@ -68,12 +68,12 @@ void AstLeaf::setBoolValue( bool bNew )
68 bVal = bNew; 68 bVal = bNew;
69} 69}
70 70
71void AstLeaf::setStrValue( const Bu::FString &sNew ) 71void AstLeaf::setStrValue( const Bu::String &sNew )
72{ 72{
73 if( getDataType() != typeDataString ) 73 if( getDataType() != typeDataString )
74 throw Bu::ExceptionBase("Type is not string."); 74 throw Bu::ExceptionBase("Type is not string.");
75 if( sVal == NULL ) 75 if( sVal == NULL )
76 sVal = new Bu::FString( sNew ); 76 sVal = new Bu::String( sNew );
77 else 77 else
78 *sVal = sNew; 78 *sVal = sNew;
79} 79}
@@ -99,7 +99,7 @@ bool AstLeaf::getBoolValue() const
99 return bVal; 99 return bVal;
100} 100}
101 101
102Bu::FString &AstLeaf::getStrValue() const 102Bu::String &AstLeaf::getStrValue() const
103{ 103{
104 if( getDataType() != typeDataString ) 104 if( getDataType() != typeDataString )
105 throw Bu::ExceptionBase("Type is not string."); 105 throw Bu::ExceptionBase("Type is not string.");
diff --git a/src/astleaf.h b/src/astleaf.h
index cdcb2ae..85293f1 100644
--- a/src/astleaf.h
+++ b/src/astleaf.h
@@ -2,7 +2,7 @@
2#define AST_LEAF_H 2#define AST_LEAF_H
3 3
4#include "astnode.h" 4#include "astnode.h"
5#include "bu/fstring.h" 5#include "bu/string.h"
6#include "bu/formatter.h" 6#include "bu/formatter.h"
7 7
8class AstLeaf : public AstNode 8class AstLeaf : public AstNode
@@ -12,19 +12,19 @@ public:
12 AstLeaf( const Location &loc, Type eType, int iNew ); 12 AstLeaf( const Location &loc, Type eType, int iNew );
13 AstLeaf( const Location &loc, Type eType, float fNew ); 13 AstLeaf( const Location &loc, Type eType, float fNew );
14 AstLeaf( const Location &loc, Type eType, bool bNew ); 14 AstLeaf( const Location &loc, Type eType, bool bNew );
15 AstLeaf( const Location &loc, Type eType, const Bu::FString &sNew ); 15 AstLeaf( const Location &loc, Type eType, const Bu::String &sNew );
16 AstLeaf( const Location &loc, Type eType, const char *sNew ); 16 AstLeaf( const Location &loc, Type eType, const char *sNew );
17 virtual ~AstLeaf(); 17 virtual ~AstLeaf();
18 18
19 void setIntValue( int iNew ); 19 void setIntValue( int iNew );
20 void setFloatValue( float fNew ); 20 void setFloatValue( float fNew );
21 void setBoolValue( bool bNew ); 21 void setBoolValue( bool bNew );
22 void setStrValue( const Bu::FString &sNew ); 22 void setStrValue( const Bu::String &sNew );
23 23
24 int getIntValue() const; 24 int getIntValue() const;
25 float getFloatValue() const; 25 float getFloatValue() const;
26 bool getBoolValue() const; 26 bool getBoolValue() const;
27 Bu::FString &getStrValue() const; 27 Bu::String &getStrValue() const;
28 28
29private: 29private:
30 union 30 union
@@ -32,7 +32,7 @@ private:
32 int iVal; 32 int iVal;
33 float fVal; 33 float fVal;
34 bool bVal; 34 bool bVal;
35 Bu::FString *sVal; 35 Bu::String *sVal;
36 }; 36 };
37}; 37};
38 38
diff --git a/src/build.l b/src/build.l
index dc4ddda..7b770f7 100644
--- a/src/build.l
+++ b/src/build.l
@@ -1,8 +1,8 @@
1%{ 1%{
2 #include "buildparser.h" 2 #include "buildparser.h"
3 #include "bu/fstring.h" 3 #include "bu/string.h"
4 4
5char *fstrdup( const Bu::FString &s ) 5char *fstrdup( const Bu::String &s )
6{ 6{
7 char *sRet = new char[s.getSize()+1]; 7 char *sRet = new char[s.getSize()+1];
8 memcpy( sRet, s.getStr(), s.getSize()+1 ); 8 memcpy( sRet, s.getStr(), s.getSize()+1 );
@@ -17,7 +17,7 @@ char *rstrdup( const char *sIn )
17} 17}
18void build_error( YYLTYPE *locp, yyscan_t yyscanner, BuildParser &bld, const char *msg ); 18void build_error( YYLTYPE *locp, yyscan_t yyscanner, BuildParser &bld, const char *msg );
19 19
20Bu::FString sBuf; 20Bu::String sBuf;
21int iStrDepth = 0; 21int iStrDepth = 0;
22%} 22%}
23 23
diff --git a/src/buildparser.cpp b/src/buildparser.cpp
index 125a31e..f5c3132 100644
--- a/src/buildparser.cpp
+++ b/src/buildparser.cpp
@@ -17,7 +17,7 @@ BuildParser::~BuildParser()
17 17
18int build_parse( yyscan_t yyscanner, BuildParser &bld ); 18int build_parse( yyscan_t yyscanner, BuildParser &bld );
19 19
20void BuildParser::load( const Bu::FString &sFile ) 20void BuildParser::load( const Bu::String &sFile )
21{ 21{
22 yyscan_t scanner; 22 yyscan_t scanner;
23 23
@@ -39,7 +39,7 @@ void BuildParser::load( const Bu::FString &sFile )
39 // Bu::sio << xAst; 39 // Bu::sio << xAst;
40} 40}
41 41
42bool BuildParser::isKeyword( const Bu::FString &sStr ) 42bool BuildParser::isKeyword( const Bu::String &sStr )
43{ 43{
44 if( sStr == "important" ) 44 if( sStr == "important" )
45 return true; 45 return true;
@@ -52,7 +52,7 @@ bool BuildParser::isKeyword( const Bu::FString &sStr )
52 return false; 52 return false;
53} 53}
54 54
55bool BuildParser::isCond( const Bu::FString &sStr ) 55bool BuildParser::isCond( const Bu::String &sStr )
56{ 56{
57 if( sStr == "filetime" ) 57 if( sStr == "filetime" )
58 return true; 58 return true;
@@ -63,7 +63,7 @@ bool BuildParser::isCond( const Bu::FString &sStr )
63 return false; 63 return false;
64} 64}
65 65
66void BuildParser::include( const Bu::FString &sStr, void *scanner, YYLTYPE *loc ) 66void BuildParser::include( const Bu::String &sStr, void *scanner, YYLTYPE *loc )
67{ 67{
68 for( StrList::iterator pi = lIncludePaths.begin(); pi; pi++ ) 68 for( StrList::iterator pi = lIncludePaths.begin(); pi; pi++ )
69 { 69 {
@@ -80,12 +80,12 @@ void BuildParser::include( const Bu::FString &sStr, void *scanner, YYLTYPE *loc
80 build__create_buffer( fIn, YY_READ_BUF_SIZE, scanner ), 80 build__create_buffer( fIn, YY_READ_BUF_SIZE, scanner ),
81 scanner 81 scanner
82 ); 82 );
83 Bu::FString::const_iterator i = sStr.find('/'); 83 Bu::String::const_iterator i = sStr.find('/');
84 if( i ) 84 if( i )
85 { 85 {
86 for(;;) 86 for(;;)
87 { 87 {
88 Bu::FString::const_iterator j = i.find('/'); 88 Bu::String::const_iterator j = i.find('/');
89 if( !j ) 89 if( !j )
90 break; 90 break;
91 i = j+1; 91 i = j+1;
@@ -99,7 +99,7 @@ void BuildParser::include( const Bu::FString &sStr, void *scanner, YYLTYPE *loc
99 } 99 }
100 return; 100 return;
101 } 101 }
102 Bu::FString msg("Could not open include file: "); 102 Bu::String msg("Could not open include file: ");
103 msg += sStr; 103 msg += sStr;
104 error( 104 error(
105 loc->first_line, loc->last_line, 105 loc->first_line, loc->last_line,
@@ -117,14 +117,14 @@ void BuildParser::endInclude( YYLTYPE *loc )
117} 117}
118 118
119void BuildParser::error( int iLine1, int iLine2, int iCol1, int iCol2, 119void BuildParser::error( int iLine1, int iLine2, int iCol1, int iCol2,
120 const Bu::FString &sMsg ) 120 const Bu::String &sMsg )
121{ 121{
122 throw Bu::ExceptionBase("%s: %d-%d:%d-%d: %s", 122 throw Bu::ExceptionBase("%s: %d-%d:%d-%d: %s",
123 sFilename.peek().getStr(), iLine1, iLine2, iCol1, iCol2, sMsg.getStr() 123 sFilename.peek().getStr(), iLine1, iLine2, iCol1, iCol2, sMsg.getStr()
124 ); 124 );
125} 125}
126 126
127void BuildParser::addIncludePath( const Bu::FString &sPath ) 127void BuildParser::addIncludePath( const Bu::String &sPath )
128{ 128{
129 lIncludePaths.append( sPath + "/" ); 129 lIncludePaths.append( sPath + "/" );
130} 130}
diff --git a/src/buildparser.h b/src/buildparser.h
index 8e2af6c..7e6e348 100644
--- a/src/buildparser.h
+++ b/src/buildparser.h
@@ -4,7 +4,7 @@
4#include "build.tab.h" 4#include "build.tab.h"
5 5
6#include "bu/stack.h" 6#include "bu/stack.h"
7#include "bu/fstring.h" 7#include "bu/string.h"
8#include "types.h" 8#include "types.h"
9 9
10class BuildParser 10class BuildParser
@@ -13,22 +13,22 @@ public:
13 BuildParser( class Ast &rAst ); 13 BuildParser( class Ast &rAst );
14 virtual ~BuildParser(); 14 virtual ~BuildParser();
15 15
16 void load( const Bu::FString &sFile ); 16 void load( const Bu::String &sFile );
17 17
18 bool isKeyword( const Bu::FString &sStr ); 18 bool isKeyword( const Bu::String &sStr );
19 bool isCond( const Bu::FString &sStr ); 19 bool isCond( const Bu::String &sStr );
20 void include( const Bu::FString &sStr, void *scanner, YYLTYPE *loc ); 20 void include( const Bu::String &sStr, void *scanner, YYLTYPE *loc );
21 void endInclude( YYLTYPE *loc ); 21 void endInclude( YYLTYPE *loc );
22 22
23 void error( int iLine1, int iLine2, int iCol1, int iCol2, 23 void error( int iLine1, int iLine2, int iCol1, int iCol2,
24 const Bu::FString &sMsg ); 24 const Bu::String &sMsg );
25 25
26 class Ast &xAst; 26 class Ast &xAst;
27 27
28 void addIncludePath( const Bu::FString &sPath ); 28 void addIncludePath( const Bu::String &sPath );
29 29
30private: 30private:
31 Bu::Stack<Bu::FString> sFilename; 31 Bu::Stack<Bu::String> sFilename;
32 Bu::Stack<YYLTYPE> sLocation; 32 Bu::Stack<YYLTYPE> sLocation;
33 StrList lIncludePaths; 33 StrList lIncludePaths;
34}; 34};
diff --git a/src/cache.cpp b/src/cache.cpp
index de505b8..d6269e3 100644
--- a/src/cache.cpp
+++ b/src/cache.cpp
@@ -15,7 +15,7 @@ Cache::~Cache()
15 save(); 15 save();
16} 16}
17 17
18void Cache::bind( const Bu::FString &sCacheFile ) 18void Cache::bind( const Bu::String &sCacheFile )
19{ 19{
20 this->sCacheFile = sCacheFile; 20 this->sCacheFile = sCacheFile;
21 load(); 21 load();
@@ -51,12 +51,12 @@ void Cache::save()
51 ar << hRequires << hVariables; 51 ar << hRequires << hVariables;
52} 52}
53 53
54StrList Cache::getRequires( const Bu::FString &sOutput ) 54StrList Cache::getRequires( const Bu::String &sOutput )
55{ 55{
56 return hRequires.get( sOutput ); 56 return hRequires.get( sOutput );
57} 57}
58 58
59void Cache::setRequires( const Bu::FString &sOutput, StrList lReqs ) 59void Cache::setRequires( const Bu::String &sOutput, StrList lReqs )
60{ 60{
61 hRequires.insert( sOutput, lReqs ); 61 hRequires.insert( sOutput, lReqs );
62 bCacheChanged = true; 62 bCacheChanged = true;
diff --git a/src/cache.h b/src/cache.h
index 8932091..57df281 100644
--- a/src/cache.h
+++ b/src/cache.h
@@ -2,7 +2,7 @@
2#define CACHE_H 2#define CACHE_H
3 3
4#include <bu/singleton.h> 4#include <bu/singleton.h>
5#include <bu/fstring.h> 5#include <bu/string.h>
6#include <bu/hash.h> 6#include <bu/hash.h>
7#include <bu/list.h> 7#include <bu/list.h>
8 8
@@ -17,21 +17,21 @@ private:
17 virtual ~Cache(); 17 virtual ~Cache();
18 18
19public: 19public:
20 void bind( const Bu::FString &sCacheFile ); 20 void bind( const Bu::String &sCacheFile );
21 21
22 void load(); 22 void load();
23 void save(); 23 void save();
24 24
25 StrList getRequires( const Bu::FString &sOutput ); 25 StrList getRequires( const Bu::String &sOutput );
26 void setRequires( const Bu::FString &sOutput, StrList lReqs ); 26 void setRequires( const Bu::String &sOutput, StrList lReqs );
27 27
28private: 28private:
29 bool bCacheChanged; 29 bool bCacheChanged;
30 Bu::FString sCacheFile; 30 Bu::String sCacheFile;
31 bool bIsLoaded; 31 bool bIsLoaded;
32 typedef Bu::Hash<Bu::FString, StrList> ReqHash; 32 typedef Bu::Hash<Bu::String, StrList> ReqHash;
33 ReqHash hRequires; 33 ReqHash hRequires;
34 typedef Bu::Hash<Bu::FString, Variable> VarHash; 34 typedef Bu::Hash<Bu::String, Variable> VarHash;
35 VarHash hVariables; 35 VarHash hVariables;
36}; 36};
37 37
diff --git a/src/conditionplugger.cpp b/src/conditionplugger.cpp
index 3edfa00..53f613a 100644
--- a/src/conditionplugger.cpp
+++ b/src/conditionplugger.cpp
@@ -24,13 +24,13 @@ ConditionPlugger::ConditionPlugger()
24 if( strncmp("pluginCondition", de->d_name, 15 ) ) 24 if( strncmp("pluginCondition", de->d_name, 15 ) )
25 continue; 25 continue;
26 26
27 Bu::FString sFile("/usr/lib/build/"); 27 Bu::String sFile("/usr/lib/build/");
28 sFile += de->d_name; 28 sFile += de->d_name;
29 char *s = de->d_name; 29 char *s = de->d_name;
30 for(; *s && *s != '.'; s++ ) { } 30 for(; *s && *s != '.'; s++ ) { }
31 registerExternalPlugin( 31 registerExternalPlugin(
32 sFile, 32 sFile,
33 Bu::FString( de->d_name, (ptrdiff_t)s-(ptrdiff_t)de->d_name ) 33 Bu::String( de->d_name, (ptrdiff_t)s-(ptrdiff_t)de->d_name )
34 ); 34 );
35 } 35 }
36 36
diff --git a/src/context.cpp b/src/context.cpp
index 1125248..dc2e6a1 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -42,7 +42,7 @@ void Context::addFunction( Function *pFunction )
42 hFunction.insert( pFunction->getName(), pFunction ); 42 hFunction.insert( pFunction->getName(), pFunction );
43} 43}
44 44
45void Context::addVariable( const Bu::FString &sName, const Variable &vValue ) 45void Context::addVariable( const Bu::String &sName, const Variable &vValue )
46{ 46{
47 for( ScopeStack::iterator i = sVars.begin(); i; i++ ) 47 for( ScopeStack::iterator i = sVars.begin(); i; i++ )
48 { 48 {
@@ -61,12 +61,12 @@ void Context::addAction( Action *pAction )
61 hAction.insert( pAction->getName(), pAction ); 61 hAction.insert( pAction->getName(), pAction );
62} 62}
63 63
64Action *Context::getAction( const Bu::FString &sName ) 64Action *Context::getAction( const Bu::String &sName )
65{ 65{
66 return hAction.get( sName ); 66 return hAction.get( sName );
67} 67}
68 68
69void Context::addTargetToTag( Target *pTarget, const Bu::FString &sTag ) 69void Context::addTargetToTag( Target *pTarget, const Bu::String &sTag )
70{ 70{
71 if( !hTag.has( sTag ) ) 71 if( !hTag.has( sTag ) )
72 { 72 {
@@ -83,12 +83,12 @@ void Context::addTargetToTags( Target *pTarget, const StrList &sTags )
83 } 83 }
84} 84}
85 85
86TargetList &Context::getTag( const Bu::FString &sTag ) 86TargetList &Context::getTag( const Bu::String &sTag )
87{ 87{
88 return hTag.get( sTag ); 88 return hTag.get( sTag );
89} 89}
90 90
91Variable &Context::getVariable( const Bu::FString &sName ) 91Variable &Context::getVariable( const Bu::String &sName )
92{ 92{
93 for( ScopeStack::iterator i = sVars.begin(); i; i++ ) 93 for( ScopeStack::iterator i = sVars.begin(); i; i++ )
94 { 94 {
@@ -100,7 +100,7 @@ Variable &Context::getVariable( const Bu::FString &sName )
100 throw Bu::ExceptionBase("No such variable."); 100 throw Bu::ExceptionBase("No such variable.");
101} 101}
102 102
103void Context::delVariable( const Bu::FString &sName ) 103void Context::delVariable( const Bu::String &sName )
104{ 104{
105 for( ScopeStack::iterator i = sVars.begin(); i; i++ ) 105 for( ScopeStack::iterator i = sVars.begin(); i; i++ )
106 { 106 {
@@ -150,7 +150,7 @@ void Context::popScope()
150 sVars.pop(); 150 sVars.pop();
151} 151}
152 152
153Variable Context::call( const Bu::FString &sName, Variable &input, 153Variable Context::call( const Bu::String &sName, Variable &input,
154 VarList lParams ) 154 VarList lParams )
155{ 155{
156 if( !hFunction.has( sName ) ) 156 if( !hFunction.has( sName ) )
@@ -171,18 +171,18 @@ Variable Context::call( const Bu::FString &sName, Variable &input,
171 171
172#include <bu/sio.h> 172#include <bu/sio.h>
173using namespace Bu; 173using namespace Bu;
174Bu::FString Context::expand( const Bu::FString &sInS ) 174Bu::String Context::expand( const Bu::String &sInS )
175{ 175{
176 Bu::FString sRet; 176 Bu::String sRet;
177 Bu::FString sIn = sInS; 177 Bu::String sIn = sInS;
178 178
179 for( int iPass = 0; iPass < 2; iPass++ ) 179 for( int iPass = 0; iPass < 2; iPass++ )
180 { 180 {
181 Bu::FString::const_iterator b = sIn.begin(); 181 Bu::String::const_iterator b = sIn.begin();
182 sRet.clear(); 182 sRet.clear();
183 for(;;) 183 for(;;)
184 { 184 {
185 Bu::FString::const_iterator e = b.find('$'); 185 Bu::String::const_iterator e = b.find('$');
186 if( !e ) 186 if( !e )
187 { 187 {
188 sRet.append( b ); 188 sRet.append( b );
@@ -198,7 +198,7 @@ Bu::FString Context::expand( const Bu::FString &sInS )
198 { 198 {
199 b++; 199 b++;
200 e = b.find('}'); 200 e = b.find('}');
201 Bu::FString sVar( b, e ); 201 Bu::String sVar( b, e );
202 try 202 try
203 { 203 {
204 sRet.append( getVariable( sVar ).toString() ); 204 sRet.append( getVariable( sVar ).toString() );
@@ -214,8 +214,8 @@ Bu::FString Context::expand( const Bu::FString &sInS )
214 { 214 {
215 b++; 215 b++;
216 e = b.find(')'); 216 e = b.find(')');
217 Bu::FString sCmd( b, e ); 217 Bu::String sCmd( b, e );
218 Bu::FString sBuf; 218 Bu::String sBuf;
219 try 219 try
220 { 220 {
221 //sio << "Executing command: >>>" << sCmd << "<<<" << sio.nl; 221 //sio << "Executing command: >>>" << sCmd << "<<<" << sio.nl;
@@ -250,7 +250,7 @@ Bu::FString Context::expand( const Bu::FString &sInS )
250 return sRet; 250 return sRet;
251} 251}
252 252
253Target *Context::getTarget( const Bu::FString &sOutput ) 253Target *Context::getTarget( const Bu::String &sOutput )
254{ 254{
255 return hTarget.get( sOutput ); 255 return hTarget.get( sOutput );
256} 256}
@@ -347,7 +347,7 @@ void Context::buildTargetTree( Runner &r )
347 } 347 }
348} 348}
349 349
350void Context::buildTargetTree( class Runner &r, class Target *pTarget, const Bu::FString &sInput, Rule *pMaster, StrList &lNewIns ) 350void Context::buildTargetTree( class Runner &r, class Target *pTarget, const Bu::String &sInput, Rule *pMaster, StrList &lNewIns )
351{ 351{
352 Target *pNewTarget = NULL; 352 Target *pNewTarget = NULL;
353 for( RuleHash::iterator i = hRule.begin(); i; i++ ) 353 for( RuleHash::iterator i = hRule.begin(); i; i++ )
diff --git a/src/context.h b/src/context.h
index 0d9aaff..4eaeb25 100644
--- a/src/context.h
+++ b/src/context.h
@@ -2,7 +2,7 @@
2#define CONTEXT_H 2#define CONTEXT_H
3 3
4#include "bu/hash.h" 4#include "bu/hash.h"
5#include "bu/fstring.h" 5#include "bu/string.h"
6 6
7#include "variable.h" 7#include "variable.h"
8 8
@@ -22,27 +22,27 @@ public:
22 void addTarget( Target *pTarget ); 22 void addTarget( Target *pTarget );
23 void addRule( Rule *pRule ); 23 void addRule( Rule *pRule );
24 void addFunction( Function *pFunction ); 24 void addFunction( Function *pFunction );
25 void addVariable( const Bu::FString &sName, const Variable &vValue ); 25 void addVariable( const Bu::String &sName, const Variable &vValue );
26 void addAction( Action *pAction ); 26 void addAction( Action *pAction );
27 Action *getAction( const Bu::FString &sName ); 27 Action *getAction( const Bu::String &sName );
28 28
29 void addTargetToTag( Target *pTarget, const Bu::FString &sTag ); 29 void addTargetToTag( Target *pTarget, const Bu::String &sTag );
30 void addTargetToTags( Target *pTarget, const StrList &sTags ); 30 void addTargetToTags( Target *pTarget, const StrList &sTags );
31 TargetList &getTag( const Bu::FString &sTag ); 31 TargetList &getTag( const Bu::String &sTag );
32 32
33 Variable &getVariable( const Bu::FString &sName ); 33 Variable &getVariable( const Bu::String &sName );
34 void delVariable( const Bu::FString &sName ); 34 void delVariable( const Bu::String &sName );
35 35
36 void pushScope(); 36 void pushScope();
37 void pushScope( const VarHash &hNewVars ); 37 void pushScope( const VarHash &hNewVars );
38 VarHash &getScope(); 38 VarHash &getScope();
39 void popScope(); 39 void popScope();
40 40
41 Variable call( const Bu::FString &sName, Variable &input, VarList lParams ); 41 Variable call( const Bu::String &sName, Variable &input, VarList lParams );
42 42
43 Bu::FString expand( const Bu::FString &sIn ); 43 Bu::String expand( const Bu::String &sIn );
44 44
45 Target *getTarget( const Bu::FString &sOutput ); 45 Target *getTarget( const Bu::String &sOutput );
46 TargetList getExplicitTargets(); 46 TargetList getExplicitTargets();
47 47
48 /** 48 /**
@@ -77,15 +77,15 @@ public:
77 void printBasicInfo(); 77 void printBasicInfo();
78 78
79private: 79private:
80 void buildTargetTree( class Runner &r, class Target *pTarget, const Bu::FString &sInput, class Rule *pMaster, StrList &lNewIns ); 80 void buildTargetTree( class Runner &r, class Target *pTarget, const Bu::String &sInput, class Rule *pMaster, StrList &lNewIns );
81 81
82private: 82private:
83 typedef Bu::Hash<Bu::FString, Target *> TargetHash; 83 typedef Bu::Hash<Bu::String, Target *> TargetHash;
84 typedef Bu::Hash<Bu::FString, Rule *> RuleHash; 84 typedef Bu::Hash<Bu::String, Rule *> RuleHash;
85 typedef Bu::Hash<Bu::FString, Function *> FunctionHash; 85 typedef Bu::Hash<Bu::String, Function *> FunctionHash;
86 typedef Bu::Hash<Bu::FString, Action *> ActionHash; 86 typedef Bu::Hash<Bu::String, Action *> ActionHash;
87 typedef Bu::List<VarHash> ScopeStack; 87 typedef Bu::List<VarHash> ScopeStack;
88 typedef Bu::Hash<Bu::FString, TargetList> TagHash; 88 typedef Bu::Hash<Bu::String, TargetList> TagHash;
89 89
90 TargetHash hTarget; 90 TargetHash hTarget;
91 RuleHash hRule; 91 RuleHash hRule;
diff --git a/src/function.h b/src/function.h
index 9573bd3..1575bfd 100644
--- a/src/function.h
+++ b/src/function.h
@@ -1,7 +1,7 @@
1#ifndef FUNCTION_H 1#ifndef FUNCTION_H
2#define FUNCTION_H 2#define FUNCTION_H
3 3
4#include "bu/fstring.h" 4#include "bu/string.h"
5#include "variable.h" 5#include "variable.h"
6 6
7class Function 7class Function
@@ -10,7 +10,7 @@ public:
10 Function(); 10 Function();
11 virtual ~Function(); 11 virtual ~Function();
12 12
13 virtual Bu::FString getName() const=0; 13 virtual Bu::String getName() const=0;
14 14
15 virtual Variable call( Variable &input, VarList lParams )=0; 15 virtual Variable call( Variable &input, VarList lParams )=0;
16 16
diff --git a/src/functionast.cpp b/src/functionast.cpp
index ceee460..d4ec61f 100644
--- a/src/functionast.cpp
+++ b/src/functionast.cpp
@@ -20,7 +20,7 @@ FunctionAst::~FunctionAst()
20{ 20{
21} 21}
22 22
23Bu::FString FunctionAst::getName() const 23Bu::String FunctionAst::getName() const
24{ 24{
25 return sName; 25 return sName;
26} 26}
diff --git a/src/functionast.h b/src/functionast.h
index b971683..0de564f 100644
--- a/src/functionast.h
+++ b/src/functionast.h
@@ -9,11 +9,11 @@ public:
9 FunctionAst( const class AstBranch *pRoot, class Runner *pRunner ); 9 FunctionAst( const class AstBranch *pRoot, class Runner *pRunner );
10 virtual ~FunctionAst(); 10 virtual ~FunctionAst();
11 11
12 virtual Bu::FString getName() const; 12 virtual Bu::String getName() const;
13 virtual Variable call( Variable &input, VarList lParams ); 13 virtual Variable call( Variable &input, VarList lParams );
14 14
15private: 15private:
16 Bu::FString sName; 16 Bu::String sName;
17 const class AstBranch *pRoot; 17 const class AstBranch *pRoot;
18 class Runner *pRunner; 18 class Runner *pRunner;
19}; 19};
diff --git a/src/functiondirname.cpp b/src/functiondirname.cpp
index f72d181..7fc3bf2 100644
--- a/src/functiondirname.cpp
+++ b/src/functiondirname.cpp
@@ -12,30 +12,30 @@ FunctionDirName::~FunctionDirName()
12{ 12{
13} 13}
14 14
15Bu::FString FunctionDirName::getName() const 15Bu::String FunctionDirName::getName() const
16{ 16{
17 return "dirName"; 17 return "dirName";
18} 18}
19 19
20Variable FunctionDirName::call( Variable &input, VarList /*lParams*/ ) 20Variable FunctionDirName::call( Variable &input, VarList /*lParams*/ )
21{ 21{
22 Bu::FString sFile; 22 Bu::String sFile;
23 sFile = input.getString(); 23 sFile = input.getString();
24 24
25 Bu::FString::const_iterator i = sFile.begin(); 25 Bu::String::const_iterator i = sFile.begin();
26 Bu::FString::const_iterator io; 26 Bu::String::const_iterator io;
27 for(;;) 27 for(;;)
28 { 28 {
29 Bu::FString::const_iterator b = i.find('/'); 29 Bu::String::const_iterator b = i.find('/');
30 if( !b ) 30 if( !b )
31 { 31 {
32 return Variable( Bu::FString( sFile.begin(), io ) ); 32 return Variable( Bu::String( sFile.begin(), io ) );
33 } 33 }
34 io = b; 34 io = b;
35 i = b+1; 35 i = b+1;
36 if( !i ) 36 if( !i )
37 { 37 {
38 return Variable( Bu::FString( sFile.begin(), io ) ); 38 return Variable( Bu::String( sFile.begin(), io ) );
39 } 39 }
40 } 40 }
41} 41}
diff --git a/src/functiondirname.h b/src/functiondirname.h
index 830a992..45a943e 100644
--- a/src/functiondirname.h
+++ b/src/functiondirname.h
@@ -9,7 +9,7 @@ public:
9 FunctionDirName(); 9 FunctionDirName();
10 virtual ~FunctionDirName(); 10 virtual ~FunctionDirName();
11 11
12 virtual Bu::FString getName() const; 12 virtual Bu::String getName() const;
13 virtual Variable call( Variable &input, VarList lParams ); 13 virtual Variable call( Variable &input, VarList lParams );
14 14
15}; 15};
diff --git a/src/functiondirs.cpp b/src/functiondirs.cpp
index dee3c4c..e3b88dd 100644
--- a/src/functiondirs.cpp
+++ b/src/functiondirs.cpp
@@ -17,7 +17,7 @@ FunctionDirs::~FunctionDirs()
17{ 17{
18} 18}
19 19
20Bu::FString FunctionDirs::getName() const 20Bu::String FunctionDirs::getName() const
21{ 21{
22 return "dirs"; 22 return "dirs";
23} 23}
diff --git a/src/functiondirs.h b/src/functiondirs.h
index 5edfaf9..899c1ac 100644
--- a/src/functiondirs.h
+++ b/src/functiondirs.h
@@ -9,7 +9,7 @@ public:
9 FunctionDirs(); 9 FunctionDirs();
10 virtual ~FunctionDirs(); 10 virtual ~FunctionDirs();
11 11
12 virtual Bu::FString getName() const; 12 virtual Bu::String getName() const;
13 virtual Variable call( Variable &input, VarList lParams ); 13 virtual Variable call( Variable &input, VarList lParams );
14 14
15}; 15};
diff --git a/src/functionexecute.cpp b/src/functionexecute.cpp
index 0b0aabf..070ca53 100644
--- a/src/functionexecute.cpp
+++ b/src/functionexecute.cpp
@@ -18,7 +18,7 @@ FunctionExecute::~FunctionExecute()
18{ 18{
19} 19}
20 20
21Bu::FString FunctionExecute::getName() const 21Bu::String FunctionExecute::getName() const
22{ 22{
23 return "execute"; 23 return "execute";
24} 24}
@@ -30,7 +30,7 @@ Variable FunctionExecute::call( Variable &/*input*/, VarList lParams )
30 pContext->getView()->cmdStarted( lParams.first().getString() ); 30 pContext->getView()->cmdStarted( lParams.first().getString() );
31 Process pCmd( Process::Both, "/bin/bash", "/bin/bash", "-c", 31 Process pCmd( Process::Both, "/bin/bash", "/bin/bash", "-c",
32 lParams.first().getString().getStr(), NULL ); 32 lParams.first().getString().getStr(), NULL );
33 FString sStdOut, sStdErr; 33 String sStdOut, sStdErr;
34 do 34 do
35 { 35 {
36 char buf[4096]; 36 char buf[4096];
diff --git a/src/functionexecute.h b/src/functionexecute.h
index ebeaa7f..b70a2c5 100644
--- a/src/functionexecute.h
+++ b/src/functionexecute.h
@@ -9,7 +9,7 @@ public:
9 FunctionExecute(); 9 FunctionExecute();
10 virtual ~FunctionExecute(); 10 virtual ~FunctionExecute();
11 11
12 virtual Bu::FString getName() const; 12 virtual Bu::String getName() const;
13 virtual Variable call( Variable &input, VarList lParams ); 13 virtual Variable call( Variable &input, VarList lParams );
14}; 14};
15 15
diff --git a/src/functionexists.cpp b/src/functionexists.cpp
index 2207f84..5c71874 100644
--- a/src/functionexists.cpp
+++ b/src/functionexists.cpp
@@ -14,14 +14,14 @@ FunctionExists::~FunctionExists()
14{ 14{
15} 15}
16 16
17Bu::FString FunctionExists::getName() const 17Bu::String FunctionExists::getName() const
18{ 18{
19 return "exists"; 19 return "exists";
20} 20}
21 21
22Variable FunctionExists::call( Variable &input, VarList lParams ) 22Variable FunctionExists::call( Variable &input, VarList lParams )
23{ 23{
24 Bu::FString sFile; 24 Bu::String sFile;
25 if( input.getType() != Variable::typeNone ) 25 if( input.getType() != Variable::typeNone )
26 { 26 {
27 sFile = input.toString(); 27 sFile = input.toString();
diff --git a/src/functionexists.h b/src/functionexists.h
index 8a3001a..f4629fb 100644
--- a/src/functionexists.h
+++ b/src/functionexists.h
@@ -9,7 +9,7 @@ public:
9 FunctionExists(); 9 FunctionExists();
10 virtual ~FunctionExists(); 10 virtual ~FunctionExists();
11 11
12 virtual Bu::FString getName() const; 12 virtual Bu::String getName() const;
13 virtual Variable call( Variable &input, VarList lParams ); 13 virtual Variable call( Variable &input, VarList lParams );
14 14
15}; 15};
diff --git a/src/functionfilename.cpp b/src/functionfilename.cpp
index 57aada9..40f0048 100644
--- a/src/functionfilename.cpp
+++ b/src/functionfilename.cpp
@@ -12,28 +12,28 @@ FunctionFileName::~FunctionFileName()
12{ 12{
13} 13}
14 14
15Bu::FString FunctionFileName::getName() const 15Bu::String FunctionFileName::getName() const
16{ 16{
17 return "fileName"; 17 return "fileName";
18} 18}
19 19
20Variable FunctionFileName::call( Variable &input, VarList /*lParams*/ ) 20Variable FunctionFileName::call( Variable &input, VarList /*lParams*/ )
21{ 21{
22 Bu::FString sFile; 22 Bu::String sFile;
23 sFile = input.getString(); 23 sFile = input.getString();
24 24
25 Bu::FString::const_iterator i = sFile.begin(); 25 Bu::String::const_iterator i = sFile.begin();
26 for(;;) 26 for(;;)
27 { 27 {
28 Bu::FString::const_iterator b = i.find('/'); 28 Bu::String::const_iterator b = i.find('/');
29 if( !b ) 29 if( !b )
30 { 30 {
31 return Variable( Bu::FString( i ) ); 31 return Variable( Bu::String( i ) );
32 } 32 }
33 i = b+1; 33 i = b+1;
34 if( !i ) 34 if( !i )
35 { 35 {
36 return Variable( Bu::FString( i ) ); 36 return Variable( Bu::String( i ) );
37 } 37 }
38 } 38 }
39} 39}
diff --git a/src/functionfilename.h b/src/functionfilename.h
index 1401fc7..8f1cd13 100644
--- a/src/functionfilename.h
+++ b/src/functionfilename.h
@@ -9,7 +9,7 @@ public:
9 FunctionFileName(); 9 FunctionFileName();
10 virtual ~FunctionFileName(); 10 virtual ~FunctionFileName();
11 11
12 virtual Bu::FString getName() const; 12 virtual Bu::String getName() const;
13 virtual Variable call( Variable &input, VarList lParams ); 13 virtual Variable call( Variable &input, VarList lParams );
14 14
15}; 15};
diff --git a/src/functionfiles.cpp b/src/functionfiles.cpp
index e0f8268..cd5b122 100644
--- a/src/functionfiles.cpp
+++ b/src/functionfiles.cpp
@@ -17,7 +17,7 @@ FunctionFiles::~FunctionFiles()
17{ 17{
18} 18}
19 19
20Bu::FString FunctionFiles::getName() const 20Bu::String FunctionFiles::getName() const
21{ 21{
22 return "files"; 22 return "files";
23} 23}
diff --git a/src/functionfiles.h b/src/functionfiles.h
index 711288a..3828c3e 100644
--- a/src/functionfiles.h
+++ b/src/functionfiles.h
@@ -9,7 +9,7 @@ public:
9 FunctionFiles(); 9 FunctionFiles();
10 virtual ~FunctionFiles(); 10 virtual ~FunctionFiles();
11 11
12 virtual Bu::FString getName() const; 12 virtual Bu::String getName() const;
13 virtual Variable call( Variable &input, VarList lParams ); 13 virtual Variable call( Variable &input, VarList lParams );
14 14
15}; 15};
diff --git a/src/functiongetmakedeps.cpp b/src/functiongetmakedeps.cpp
index cfe5459..fda6aa2 100644
--- a/src/functiongetmakedeps.cpp
+++ b/src/functiongetmakedeps.cpp
@@ -18,7 +18,7 @@ FunctionGetMakeDeps::~FunctionGetMakeDeps()
18{ 18{
19} 19}
20 20
21Bu::FString FunctionGetMakeDeps::getName() const 21Bu::String FunctionGetMakeDeps::getName() const
22{ 22{
23 return "getMakeDeps"; 23 return "getMakeDeps";
24} 24}
@@ -30,7 +30,7 @@ Variable FunctionGetMakeDeps::call( Variable &/*input*/, VarList lParams )
30 lParams.first().getString().getStr(), NULL ); 30 lParams.first().getString().getStr(), NULL );
31 31
32 // Gather all data from the command. 32 // Gather all data from the command.
33 Bu::FString sBuf; 33 Bu::String sBuf;
34 do 34 do
35 { 35 {
36 char buf[4096]; 36 char buf[4096];
@@ -43,7 +43,7 @@ Variable FunctionGetMakeDeps::call( Variable &/*input*/, VarList lParams )
43 43
44 Variable vRet( Variable::typeList ); 44 Variable vRet( Variable::typeList );
45 45
46 Bu::FString::iterator i, j; 46 Bu::String::iterator i, j;
47 i = sBuf.find(':')+2; 47 i = sBuf.find(':')+2;
48 while( i ) 48 while( i )
49 { 49 {
@@ -51,7 +51,7 @@ Variable FunctionGetMakeDeps::call( Variable &/*input*/, VarList lParams )
51 // always a space after a word 51 // always a space after a word
52 for( j = i; j && *j != ' ' && *j != '\n' && *j != '\r'; j++ ) { } 52 for( j = i; j && *j != ' ' && *j != '\n' && *j != '\r'; j++ ) { }
53 53
54 Bu::FString sTmp( i, j ); 54 Bu::String sTmp( i, j );
55 vRet.append( sTmp ); 55 vRet.append( sTmp );
56 56
57 // Find the begining of the next word, trickier, we don't want to go 57 // Find the begining of the next word, trickier, we don't want to go
diff --git a/src/functiongetmakedeps.h b/src/functiongetmakedeps.h
index b8f20d5..566a96b 100644
--- a/src/functiongetmakedeps.h
+++ b/src/functiongetmakedeps.h
@@ -9,7 +9,7 @@ public:
9 FunctionGetMakeDeps(); 9 FunctionGetMakeDeps();
10 virtual ~FunctionGetMakeDeps(); 10 virtual ~FunctionGetMakeDeps();
11 11
12 virtual Bu::FString getName() const; 12 virtual Bu::String getName() const;
13 virtual Variable call( Variable &input, VarList lParams ); 13 virtual Variable call( Variable &input, VarList lParams );
14}; 14};
15 15
diff --git a/src/functionmatches.cpp b/src/functionmatches.cpp
index 5b96fa8..0f76316 100644
--- a/src/functionmatches.cpp
+++ b/src/functionmatches.cpp
@@ -14,14 +14,14 @@ FunctionMatches::~FunctionMatches()
14{ 14{
15} 15}
16 16
17Bu::FString FunctionMatches::getName() const 17Bu::String FunctionMatches::getName() const
18{ 18{
19 return "matches"; 19 return "matches";
20} 20}
21 21
22bool FunctionMatches::globcmp( const Bu::FString &sTxt, const Bu::FString &sMatches ) 22bool FunctionMatches::globcmp( const Bu::String &sTxt, const Bu::String &sMatches )
23{ 23{
24 Bu::FString::const_iterator t, g; 24 Bu::String::const_iterator t, g;
25 t = sTxt.begin(); 25 t = sTxt.begin();
26 g = sMatches.begin(); 26 g = sMatches.begin();
27 27
@@ -36,7 +36,7 @@ bool FunctionMatches::globcmp( const Bu::FString &sTxt, const Bu::FString &sMatc
36 return true; 36 return true;
37 // Now attempt to scan for the remainder as a matched set 37 // Now attempt to scan for the remainder as a matched set
38 { 38 {
39 Bu::FString::const_iterator tn = t+1, gn = g+1, gi=g+1; 39 Bu::String::const_iterator tn = t+1, gn = g+1, gi=g+1;
40 bool bFoundMatch = false; 40 bool bFoundMatch = false;
41 while( tn && gn ) 41 while( tn && gn )
42 { 42 {
@@ -87,7 +87,7 @@ bool FunctionMatches::globcmp( const Bu::FString &sTxt, const Bu::FString &sMatc
87 return true; 87 return true;
88} 88}
89 89
90bool FunctionMatches::matchlist( const Bu::FString &sTxt, VarList &lParams ) 90bool FunctionMatches::matchlist( const Bu::String &sTxt, VarList &lParams )
91{ 91{
92 for( VarList::iterator i = lParams.begin(); i; i++ ) 92 for( VarList::iterator i = lParams.begin(); i; i++ )
93 { 93 {
@@ -114,7 +114,7 @@ Variable FunctionMatches::call( Variable &input, VarList lParams )
114 { 114 {
115 case Variable::typeString: 115 case Variable::typeString:
116 { 116 {
117 Bu::FString sTxt = input.getString(); 117 Bu::String sTxt = input.getString();
118 return Variable( matchlist( sTxt, lParams ) ); 118 return Variable( matchlist( sTxt, lParams ) );
119 } 119 }
120 break; 120 break;
@@ -126,7 +126,7 @@ Variable FunctionMatches::call( Variable &input, VarList lParams )
126 { 126 {
127 if( (*i).getType() != Variable::typeString ) 127 if( (*i).getType() != Variable::typeString )
128 continue; 128 continue;
129 Bu::FString sTxt = (*i).getString(); 129 Bu::String sTxt = (*i).getString();
130 if( matchlist( sTxt, lParams ) ) 130 if( matchlist( sTxt, lParams ) )
131 vRet.append( *i ); 131 vRet.append( *i );
132 } 132 }
diff --git a/src/functionmatches.h b/src/functionmatches.h
index 7757a44..92ffe26 100644
--- a/src/functionmatches.h
+++ b/src/functionmatches.h
@@ -13,9 +13,9 @@ public:
13 * Really basic globbing function, it doesn't handle character classes, 13 * Really basic globbing function, it doesn't handle character classes,
14 * just * and ?. We can expand on it later, it may be handy. 14 * just * and ?. We can expand on it later, it may be handy.
15 */ 15 */
16 bool globcmp( const Bu::FString &sTxt, const Bu::FString &sMatches ); 16 bool globcmp( const Bu::String &sTxt, const Bu::String &sMatches );
17 bool matchlist( const Bu::FString &sTxt, VarList &lParams ); 17 bool matchlist( const Bu::String &sTxt, VarList &lParams );
18 virtual Bu::FString getName() const; 18 virtual Bu::String getName() const;
19 virtual Variable call( Variable &input, VarList lParams ); 19 virtual Variable call( Variable &input, VarList lParams );
20 20
21}; 21};
diff --git a/src/functionplugger.cpp b/src/functionplugger.cpp
index c8d3fd2..035e5b9 100644
--- a/src/functionplugger.cpp
+++ b/src/functionplugger.cpp
@@ -42,13 +42,13 @@ FunctionPlugger::FunctionPlugger()
42 if( strncmp("pluginFunction", de->d_name, 15 ) ) 42 if( strncmp("pluginFunction", de->d_name, 15 ) )
43 continue; 43 continue;
44 44
45 Bu::FString sFile("/usr/lib/build/"); 45 Bu::String sFile("/usr/lib/build/");
46 sFile += de->d_name; 46 sFile += de->d_name;
47 char *s = de->d_name; 47 char *s = de->d_name;
48 for(; *s && *s != '.'; s++ ) { } 48 for(; *s && *s != '.'; s++ ) { }
49 registerExternalPlugin( 49 registerExternalPlugin(
50 sFile, 50 sFile,
51 Bu::FString( de->d_name, (ptrdiff_t)s-(ptrdiff_t)de->d_name ) 51 Bu::String( de->d_name, (ptrdiff_t)s-(ptrdiff_t)de->d_name )
52 ); 52 );
53 } 53 }
54 54
diff --git a/src/functionregex.cpp b/src/functionregex.cpp
index f0abc35..c80f527 100644
--- a/src/functionregex.cpp
+++ b/src/functionregex.cpp
@@ -13,7 +13,7 @@ FunctionRegEx::~FunctionRegEx()
13{ 13{
14} 14}
15 15
16Bu::FString FunctionRegEx::getName() const 16Bu::String FunctionRegEx::getName() const
17{ 17{
18 return "regex"; 18 return "regex";
19} 19}
@@ -47,7 +47,7 @@ Variable FunctionRegEx::call( Variable &input, VarList lParams )
47 else if( lParams.getSize() == 2 ) 47 else if( lParams.getSize() == 2 )
48 { 48 {
49 Bu::RegEx re( lParams.first().getString() ); 49 Bu::RegEx re( lParams.first().getString() );
50 Bu::FString sPat = lParams.last().getString(); 50 Bu::String sPat = lParams.last().getString();
51 switch( input.getType() ) 51 switch( input.getType() )
52 { 52 {
53 case Variable::typeString: 53 case Variable::typeString:
@@ -83,10 +83,10 @@ Variable FunctionRegEx::call( Variable &input, VarList lParams )
83 "regex does not work on non-string or non-list types."); 83 "regex does not work on non-string or non-list types.");
84} 84}
85 85
86Bu::FString FunctionRegEx::replace( Bu::RegEx &re, const Bu::FString &sSrc, 86Bu::String FunctionRegEx::replace( Bu::RegEx &re, const Bu::String &sSrc,
87 const Bu::FString &sPat ) 87 const Bu::String &sPat )
88{ 88{
89 Bu::FString sOut; 89 Bu::String sOut;
90 90
91 int iStart, iEnd; 91 int iStart, iEnd;
92 re.getSubStringRange( 0, iStart, iEnd ); // Get the range of the full match 92 re.getSubStringRange( 0, iStart, iEnd ); // Get the range of the full match
@@ -94,7 +94,7 @@ Bu::FString FunctionRegEx::replace( Bu::RegEx &re, const Bu::FString &sSrc,
94 if( iStart > 0 ) 94 if( iStart > 0 )
95 sOut.append( sSrc, 0, iStart ); 95 sOut.append( sSrc, 0, iStart );
96 96
97 for( Bu::FString::const_iterator i = sPat.begin(); i; i++ ) 97 for( Bu::String::const_iterator i = sPat.begin(); i; i++ )
98 { 98 {
99 if( *i == '\\' ) 99 if( *i == '\\' )
100 { 100 {
diff --git a/src/functionregex.h b/src/functionregex.h
index 2096a64..edc21c6 100644
--- a/src/functionregex.h
+++ b/src/functionregex.h
@@ -14,11 +14,11 @@ public:
14 FunctionRegEx(); 14 FunctionRegEx();
15 virtual ~FunctionRegEx(); 15 virtual ~FunctionRegEx();
16 16
17 virtual Bu::FString getName() const; 17 virtual Bu::String getName() const;
18 virtual Variable call( Variable &input, VarList lParams ); 18 virtual Variable call( Variable &input, VarList lParams );
19 19
20 Bu::FString replace( Bu::RegEx &re, const Bu::FString &sSrc, 20 Bu::String replace( Bu::RegEx &re, const Bu::String &sSrc,
21 const Bu::FString &sPat ); 21 const Bu::String &sPat );
22}; 22};
23 23
24#endif 24#endif
diff --git a/src/functionreplace.cpp b/src/functionreplace.cpp
index b341e44..589ef55 100644
--- a/src/functionreplace.cpp
+++ b/src/functionreplace.cpp
@@ -12,14 +12,14 @@ FunctionReplace::~FunctionReplace()
12{ 12{
13} 13}
14 14
15Bu::FString FunctionReplace::getName() const 15Bu::String FunctionReplace::getName() const
16{ 16{
17 return "replace"; 17 return "replace";
18} 18}
19 19
20Variable FunctionReplace::call( Variable &input, VarList lParams ) 20Variable FunctionReplace::call( Variable &input, VarList lParams )
21{ 21{
22 Bu::FString sA, sB; 22 Bu::String sA, sB;
23 sA = lParams.first().getString(); 23 sA = lParams.first().getString();
24 sB = lParams.last().getString(); 24 sB = lParams.last().getString();
25 switch( input.getType() ) 25 switch( input.getType() )
diff --git a/src/functionreplace.h b/src/functionreplace.h
index 1bf4dae..05442d8 100644
--- a/src/functionreplace.h
+++ b/src/functionreplace.h
@@ -9,7 +9,7 @@ public:
9 FunctionReplace(); 9 FunctionReplace();
10 virtual ~FunctionReplace(); 10 virtual ~FunctionReplace();
11 11
12 virtual Bu::FString getName() const; 12 virtual Bu::String getName() const;
13 virtual Variable call( Variable &input, VarList lParams ); 13 virtual Variable call( Variable &input, VarList lParams );
14}; 14};
15 15
diff --git a/src/functiontargets.cpp b/src/functiontargets.cpp
index adafdfb..3fd145e 100644
--- a/src/functiontargets.cpp
+++ b/src/functiontargets.cpp
@@ -14,7 +14,7 @@ FunctionTargets::~FunctionTargets()
14{ 14{
15} 15}
16 16
17Bu::FString FunctionTargets::getName() const 17Bu::String FunctionTargets::getName() const
18{ 18{
19 return "targets"; 19 return "targets";
20} 20}
diff --git a/src/functiontargets.h b/src/functiontargets.h
index 9b65d30..a6e7d21 100644
--- a/src/functiontargets.h
+++ b/src/functiontargets.h
@@ -9,7 +9,7 @@ public:
9 FunctionTargets(); 9 FunctionTargets();
10 virtual ~FunctionTargets(); 10 virtual ~FunctionTargets();
11 11
12 virtual Bu::FString getName() const; 12 virtual Bu::String getName() const;
13 virtual Variable call( Variable &input, VarList lParams ); 13 virtual Variable call( Variable &input, VarList lParams );
14}; 14};
15 15
diff --git a/src/functiontostring.cpp b/src/functiontostring.cpp
index 1d614ce..bc5db6c 100644
--- a/src/functiontostring.cpp
+++ b/src/functiontostring.cpp
@@ -16,15 +16,15 @@ FunctionToString::~FunctionToString()
16{ 16{
17} 17}
18 18
19Bu::FString FunctionToString::getName() const 19Bu::String FunctionToString::getName() const
20{ 20{
21 return "toString"; 21 return "toString";
22} 22}
23 23
24Variable FunctionToString::call( Variable &input, VarList lParams ) 24Variable FunctionToString::call( Variable &input, VarList lParams )
25{ 25{
26 Bu::FString sStr; 26 Bu::String sStr;
27 Bu::FString sSep; 27 Bu::String sSep;
28 if( lParams.getSize() == 0 ) 28 if( lParams.getSize() == 0 )
29 { 29 {
30 sSep = " "; 30 sSep = " ";
diff --git a/src/functiontostring.h b/src/functiontostring.h
index 3c3ecc7..c5bc50d 100644
--- a/src/functiontostring.h
+++ b/src/functiontostring.h
@@ -9,7 +9,7 @@ public:
9 FunctionToString(); 9 FunctionToString();
10 virtual ~FunctionToString(); 10 virtual ~FunctionToString();
11 11
12 virtual Bu::FString getName() const; 12 virtual Bu::String getName() const;
13 virtual Variable call( Variable &input, VarList lParams ); 13 virtual Variable call( Variable &input, VarList lParams );
14}; 14};
15 15
diff --git a/src/functionunlink.cpp b/src/functionunlink.cpp
index d8ad899..48985bb 100644
--- a/src/functionunlink.cpp
+++ b/src/functionunlink.cpp
@@ -17,7 +17,7 @@ FunctionUnlink::~FunctionUnlink()
17{ 17{
18} 18}
19 19
20Bu::FString FunctionUnlink::getName() const 20Bu::String FunctionUnlink::getName() const
21{ 21{
22 return "unlink"; 22 return "unlink";
23} 23}
diff --git a/src/functionunlink.h b/src/functionunlink.h
index ac3f21e..ab95615 100644
--- a/src/functionunlink.h
+++ b/src/functionunlink.h
@@ -9,7 +9,7 @@ public:
9 FunctionUnlink(); 9 FunctionUnlink();
10 virtual ~FunctionUnlink(); 10 virtual ~FunctionUnlink();
11 11
12 virtual Bu::FString getName() const; 12 virtual Bu::String getName() const;
13 virtual Variable call( Variable &input, VarList lParams ); 13 virtual Variable call( Variable &input, VarList lParams );
14}; 14};
15 15
diff --git a/src/location.cpp b/src/location.cpp
index 03b8b43..933379c 100644
--- a/src/location.cpp
+++ b/src/location.cpp
@@ -19,7 +19,7 @@ Location::Location( struct YYLTYPE &loc ) :
19{ 19{
20} 20}
21 21
22Location::Location( const Bu::FString &sFile, int iStartRow, int iStartCol, 22Location::Location( const Bu::String &sFile, int iStartRow, int iStartCol,
23 int iEndRow, int iEndCol ) : 23 int iEndRow, int iEndCol ) :
24 sFile( sFile ), 24 sFile( sFile ),
25 iStartRow( iStartRow ), 25 iStartRow( iStartRow ),
diff --git a/src/location.h b/src/location.h
index 76699e3..db329bb 100644
--- a/src/location.h
+++ b/src/location.h
@@ -1,19 +1,19 @@
1#ifndef LOCATION_H 1#ifndef LOCATION_H
2#define LOCATION_H 2#define LOCATION_H
3 3
4#include <bu/fstring.h> 4#include <bu/string.h>
5 5
6class Location 6class Location
7{ 7{
8public: 8public:
9 Location(); 9 Location();
10 Location( struct YYLTYPE &loc ); 10 Location( struct YYLTYPE &loc );
11 Location( const Bu::FString &sFile, int iStartRow, int iStartCol, 11 Location( const Bu::String &sFile, int iStartRow, int iStartCol,
12 int iEndRow, int iEndCol ); 12 int iEndRow, int iEndCol );
13 virtual ~Location(); 13 virtual ~Location();
14 14
15private: 15private:
16 const Bu::FString sFile; 16 const Bu::String sFile;
17 int iStartRow; 17 int iStartRow;
18 int iStartCol; 18 int iStartCol;
19 int iEndRow; 19 int iEndRow;
diff --git a/src/main.cpp b/src/main.cpp
index 7637443..caa33e6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -40,7 +40,7 @@ public:
40 bool bClean = false; 40 bool bClean = false;
41 addHelpBanner("build mark 3\n"); 41 addHelpBanner("build mark 3\n");
42 42
43 Bu::FString sViews("Select a view from: "); 43 Bu::String sViews("Select a view from: ");
44 StrList lViews = ViewPlugger::getInstance().getPluginList(); 44 StrList lViews = ViewPlugger::getInstance().getPluginList();
45 for( StrList::iterator i = lViews.begin(); i; i++ ) 45 for( StrList::iterator i = lViews.begin(); i; i++ )
46 { 46 {
@@ -159,10 +159,10 @@ public:
159 return 0; 159 return 0;
160 } 160 }
161 161
162 Bu::FString sView; 162 Bu::String sView;
163 Bu::FString sAction; 163 Bu::String sAction;
164 Bu::FString sConfig; 164 Bu::String sConfig;
165 Bu::FString sCacheFile; 165 Bu::String sCacheFile;
166 bool bDot; 166 bool bDot;
167 bool bDebug; 167 bool bDebug;
168 bool bAutoInclude; 168 bool bAutoInclude;
@@ -174,7 +174,7 @@ public:
174 174
175int main( int argc, char *argv[] ) 175int main( int argc, char *argv[] )
176{ 176{
177 typedef Bu::List<Bu::FString> StrList; 177 typedef Bu::List<Bu::String> StrList;
178 StrList lShareList; 178 StrList lShareList;
179 lShareList.append("/usr/share/build/").append("./share/"); 179 lShareList.append("/usr/share/build/").append("./share/");
180 Ast ast; 180 Ast ast;
@@ -221,8 +221,8 @@ int main( int argc, char *argv[] )
221 int iSplit; 221 int iSplit;
222 for( iSplit = 0; (*env)[iSplit] != '='; iSplit++ ) { } 222 for( iSplit = 0; (*env)[iSplit] != '='; iSplit++ ) { }
223 cnt.addVariable( 223 cnt.addVariable(
224 FString( *env, iSplit ), 224 String( *env, iSplit ),
225 FString( *env+iSplit+1 ) 225 String( *env+iSplit+1 )
226 ); 226 );
227 } 227 }
228 } 228 }
@@ -230,7 +230,7 @@ int main( int argc, char *argv[] )
230 if( opts.bAutoInclude ) 230 if( opts.bAutoInclude )
231 { 231 {
232 DIR *d; 232 DIR *d;
233 Bu::FString sAutoDir; 233 Bu::String sAutoDir;
234 for( StrList::iterator i = lShareList.begin(); i; i++ ) 234 for( StrList::iterator i = lShareList.begin(); i; i++ )
235 { 235 {
236 sAutoDir = *i + "autoinclude"; 236 sAutoDir = *i + "autoinclude";
diff --git a/src/profile.cpp b/src/profile.cpp
index fd21097..a9c1d5b 100644
--- a/src/profile.cpp
+++ b/src/profile.cpp
@@ -35,7 +35,7 @@ Profile::~Profile()
35 pAst = NULL; 35 pAst = NULL;
36} 36}
37 37
38const Bu::FString &Profile::getName() const 38const Bu::String &Profile::getName() const
39{ 39{
40 return sName; 40 return sName;
41} 41}
@@ -86,7 +86,7 @@ void Profile::setCondition()
86 { 86 {
87 if( (*i)->getType() == AstNode::typeCondition ) 87 if( (*i)->getType() == AstNode::typeCondition )
88 { 88 {
89 Bu::FString sCond = dynamic_cast<const AstLeaf *>(*i)->getStrValue(); 89 Bu::String sCond = dynamic_cast<const AstLeaf *>(*i)->getStrValue();
90 delete pCond; 90 delete pCond;
91 pCond = ConditionPlugger::getInstance().instantiate( sCond ); 91 pCond = ConditionPlugger::getInstance().instantiate( sCond );
92 } 92 }
diff --git a/src/profile.h b/src/profile.h
index dbcc1ea..4f89306 100644
--- a/src/profile.h
+++ b/src/profile.h
@@ -1,7 +1,7 @@
1#ifndef PROFILE_H 1#ifndef PROFILE_H
2#define PROFILE_H 2#define PROFILE_H
3 3
4#include <bu/fstring.h> 4#include <bu/string.h>
5 5
6class Profile 6class Profile
7{ 7{
@@ -10,7 +10,7 @@ public:
10 Profile( const Profile &rSrc ); 10 Profile( const Profile &rSrc );
11 virtual ~Profile(); 11 virtual ~Profile();
12 12
13 const Bu::FString &getName() const; 13 const Bu::String &getName() const;
14 const class AstBranch *getRoot() const; 14 const class AstBranch *getRoot() const;
15 const class Condition *getCond() const; 15 const class Condition *getCond() const;
16 bool shouldExec( class Runner &r, class Target &rTarget ) const; 16 bool shouldExec( class Runner &r, class Target &rTarget ) const;
@@ -21,7 +21,7 @@ private:
21 void setCondition(); 21 void setCondition();
22 22
23private: 23private:
24 Bu::FString sName; 24 Bu::String sName;
25 const class AstBranch *pRoot; 25 const class AstBranch *pRoot;
26 class Condition *pCond; 26 class Condition *pCond;
27 class Ast *pAst; 27 class Ast *pAst;
diff --git a/src/rule.cpp b/src/rule.cpp
index 2cbb2ad..81e775e 100644
--- a/src/rule.cpp
+++ b/src/rule.cpp
@@ -11,7 +11,7 @@
11#include <bu/sio.h> 11#include <bu/sio.h>
12using namespace Bu; 12using namespace Bu;
13 13
14Rule::Rule( const Bu::FString &sName ) : 14Rule::Rule( const Bu::String &sName ) :
15 sName( sName ), 15 sName( sName ),
16 pInput( NULL ) 16 pInput( NULL )
17{ 17{
@@ -21,7 +21,7 @@ Rule::~Rule()
21{ 21{
22} 22}
23 23
24const Bu::FString &Rule::getName() const 24const Bu::String &Rule::getName() const
25{ 25{
26 return sName; 26 return sName;
27} 27}
@@ -73,7 +73,7 @@ void Rule::prepTarget( class Target *pTarget )
73 } 73 }
74} 74}
75 75
76Target *Rule::createTarget( class Runner &r, const Bu::FString &sInput, 76Target *Rule::createTarget( class Runner &r, const Bu::String &sInput,
77 Target *pParent ) 77 Target *pParent )
78{ 78{
79 r.getContext().pushScope( pParent->getVars() ); 79 r.getContext().pushScope( pParent->getVars() );
@@ -114,7 +114,7 @@ Target *Rule::createTarget( class Runner &r, const Bu::FString &sInput,
114 return pTrg; 114 return pTrg;
115} 115}
116 116
117bool Rule::ruleMatches( Runner &r, const Bu::FString &sInput ) 117bool Rule::ruleMatches( Runner &r, const Bu::String &sInput )
118{ 118{
119 r.getContext().pushScope(); 119 r.getContext().pushScope();
120 r.getContext().addVariable("INPUT", sInput ); 120 r.getContext().addVariable("INPUT", sInput );
@@ -131,7 +131,7 @@ bool Rule::ruleMatches( Runner &r, const Bu::FString &sInput )
131 return false; 131 return false;
132} 132}
133 133
134void Rule::addTag( const Bu::FString &sTag ) 134void Rule::addTag( const Bu::String &sTag )
135{ 135{
136 lsTags.append( sTag ); 136 lsTags.append( sTag );
137} 137}
@@ -141,12 +141,12 @@ const StrList &Rule::getTagList() const
141 return lsTags; 141 return lsTags;
142} 142}
143 143
144void Rule::setDisplay( const Bu::FString &sStr ) 144void Rule::setDisplay( const Bu::String &sStr )
145{ 145{
146 sDisplay = sStr; 146 sDisplay = sStr;
147} 147}
148 148
149const Bu::FString &Rule::getDisplay() const 149const Bu::String &Rule::getDisplay() const
150{ 150{
151 return (sDisplay.isSet())?(sDisplay):(sName); 151 return (sDisplay.isSet())?(sDisplay):(sName);
152} 152}
diff --git a/src/rule.h b/src/rule.h
index 5344d02..d8accf0 100644
--- a/src/rule.h
+++ b/src/rule.h
@@ -8,10 +8,10 @@ class Rule
8{ 8{
9 friend Bu::Formatter &operator<<( Bu::Formatter &f, const Rule &t ); 9 friend Bu::Formatter &operator<<( Bu::Formatter &f, const Rule &t );
10public: 10public:
11 Rule( const Bu::FString &sName ); 11 Rule( const Bu::String &sName );
12 virtual ~Rule(); 12 virtual ~Rule();
13 13
14 const Bu::FString &getName() const; 14 const Bu::String &getName() const;
15 15
16 void setInput( const AstBranch *pNewInput ); 16 void setInput( const AstBranch *pNewInput );
17 const AstBranch *getInput() const; 17 const AstBranch *getInput() const;
@@ -22,21 +22,21 @@ public:
22 void addProfile( const AstBranch *pProfile ); 22 void addProfile( const AstBranch *pProfile );
23 23
24 void prepTarget( class Target *pTarget ); 24 void prepTarget( class Target *pTarget );
25 class Target *createTarget( class Runner &r, const Bu::FString &sInput, 25 class Target *createTarget( class Runner &r, const Bu::String &sInput,
26 class Target *pParent ); 26 class Target *pParent );
27 bool ruleMatches( class Runner &r, const Bu::FString &sInput ); 27 bool ruleMatches( class Runner &r, const Bu::String &sInput );
28 28
29 void addTag( const Bu::FString &sTag ); 29 void addTag( const Bu::String &sTag );
30 const StrList &getTagList() const; 30 const StrList &getTagList() const;
31 31
32 void setDisplay( const Bu::FString &sStr ); 32 void setDisplay( const Bu::String &sStr );
33 const Bu::FString &getDisplay() const; 33 const Bu::String &getDisplay() const;
34 34
35 void addRequires( const AstBranch *pBr ); 35 void addRequires( const AstBranch *pBr );
36 36
37private: 37private:
38 Bu::FString sName; 38 Bu::String sName;
39 Bu::FString sDisplay; 39 Bu::String sDisplay;
40 const AstBranch *pInput; 40 const AstBranch *pInput;
41 AstBranchList lOutput; 41 AstBranchList lOutput;
42 ProfileHash hProfiles; 42 ProfileHash hProfiles;
diff --git a/src/runner.cpp b/src/runner.cpp
index e1f3da9..64ad8e8 100644
--- a/src/runner.cpp
+++ b/src/runner.cpp
@@ -47,7 +47,7 @@ void Runner::initialize()
47 47
48Variable Runner::execFunc( const AstBranch *pFunc, Variable &vIn ) 48Variable Runner::execFunc( const AstBranch *pFunc, Variable &vIn )
49{ 49{
50 Bu::FString sName = dynamic_cast<const AstLeaf *>( 50 Bu::String sName = dynamic_cast<const AstLeaf *>(
51 (*pFunc->getBranchBegin()).first())->getStrValue(); 51 (*pFunc->getBranchBegin()).first())->getStrValue();
52 52
53 VarList lParams; 53 VarList lParams;
@@ -382,7 +382,7 @@ Variable Runner::run( AstBranch::NodeList::const_iterator n )
382 { 382 {
383 case AstNode::typeError: 383 case AstNode::typeError:
384 { 384 {
385 Bu::FString sMsg = rCont.expand( pExpr->getStrValue() ); 385 Bu::String sMsg = rCont.expand( pExpr->getStrValue() );
386 rCont.getView()->userError( sMsg.getStr() ); 386 rCont.getView()->userError( sMsg.getStr() );
387 throw Bu::ExceptionBase( sMsg.getStr() ); 387 throw Bu::ExceptionBase( sMsg.getStr() );
388 } 388 }
@@ -470,7 +470,7 @@ Variable Runner::run( AstBranch::NodeList::const_iterator n )
470 { 470 {
471 AstBranch::NodeList::const_iterator n = 471 AstBranch::NodeList::const_iterator n =
472 (*pExpr->getBranchBegin()).begin(); 472 (*pExpr->getBranchBegin()).begin();
473 Bu::FString sVar = dynamic_cast<const AstLeaf *>( 473 Bu::String sVar = dynamic_cast<const AstLeaf *>(
474 *n )->getStrValue(); 474 *n )->getStrValue();
475 rCont.delVariable( sVar ); 475 rCont.delVariable( sVar );
476 } 476 }
@@ -511,7 +511,7 @@ Variable Runner::run( AstBranch::NodeList::const_iterator n )
511 { 511 {
512 AstBranch::BranchList::const_iterator b = 512 AstBranch::BranchList::const_iterator b =
513 pExpr->getBranchBegin(); 513 pExpr->getBranchBegin();
514 Bu::FString sVar = dynamic_cast<const AstLeaf *>( 514 Bu::String sVar = dynamic_cast<const AstLeaf *>(
515 (*b).first() )->getStrValue(); 515 (*b).first() )->getStrValue();
516 b++; 516 b++;
517 Variable v = execExpr( (*b).begin() ); 517 Variable v = execExpr( (*b).begin() );
@@ -585,7 +585,7 @@ Variable Runner::run( AstBranch::NodeList::const_iterator n )
585 { 585 {
586 AstBranch::BranchList::const_iterator b = 586 AstBranch::BranchList::const_iterator b =
587 pExpr->getBranchBegin(); 587 pExpr->getBranchBegin();
588 Bu::FString sName = dynamic_cast<const AstLeaf *>( 588 Bu::String sName = dynamic_cast<const AstLeaf *>(
589 (*b).first() 589 (*b).first()
590 )->getStrValue(); 590 )->getStrValue();
591 b++; 591 b++;
@@ -709,7 +709,7 @@ Variable Runner::run( AstBranch::NodeList::const_iterator n )
709 { 709 {
710 AstBranch::BranchList::const_iterator b = 710 AstBranch::BranchList::const_iterator b =
711 pExpr->getBranchBegin(); 711 pExpr->getBranchBegin();
712 Bu::FString sProfile = dynamic_cast<const AstLeaf *>( 712 Bu::String sProfile = dynamic_cast<const AstLeaf *>(
713 (*b).first() 713 (*b).first()
714 )->getStrValue(); 714 )->getStrValue();
715 b++; 715 b++;
@@ -747,7 +747,7 @@ Variable Runner::run( AstBranch::NodeList::const_iterator n )
747 } 747 }
748 else 748 else
749 { 749 {
750 Bu::FString sTag = vTags.toString(); 750 Bu::String sTag = vTags.toString();
751 if( sTag.isSet() ) 751 if( sTag.isSet() )
752 { 752 {
753 rCont.addTargetToTag( pCurTarget, sTag ); 753 rCont.addTargetToTag( pCurTarget, sTag );
@@ -774,7 +774,7 @@ Variable Runner::run( AstBranch::NodeList::const_iterator n )
774 } 774 }
775 else 775 else
776 { 776 {
777 Bu::FString sTag = vTags.toString(); 777 Bu::String sTag = vTags.toString();
778 if( sTag.isSet() ) 778 if( sTag.isSet() )
779 { 779 {
780 pCurRule->addTag( sTag ); 780 pCurRule->addTag( sTag );
@@ -810,7 +810,7 @@ Variable Runner::run( AstBranch::NodeList::const_iterator n )
810 return vReturn; 810 return vReturn;
811} 811}
812 812
813void Runner::execProfile( Target *pTarget, const Bu::FString &sProfile ) 813void Runner::execProfile( Target *pTarget, const Bu::String &sProfile )
814{ 814{
815 rCont.pushScope( pTarget->getVars() ); 815 rCont.pushScope( pTarget->getVars() );
816 run( (*(pTarget->getProfile( sProfile )->getRoot()-> 816 run( (*(pTarget->getProfile( sProfile )->getRoot()->
@@ -818,7 +818,7 @@ void Runner::execProfile( Target *pTarget, const Bu::FString &sProfile )
818 rCont.popScope(); 818 rCont.popScope();
819} 819}
820 820
821void Runner::execAction( const Bu::FString &sName ) 821void Runner::execAction( const Bu::String &sName )
822{ 822{
823 try 823 try
824 { 824 {
@@ -828,7 +828,7 @@ void Runner::execAction( const Bu::FString &sName )
828 } 828 }
829 catch( Bu::HashException &e ) 829 catch( Bu::HashException &e )
830 { 830 {
831 Bu::FString sError("No such action '" + sName + "' found."); 831 Bu::String sError("No such action '" + sName + "' found.");
832 rCont.getView()->sysError( sError ); 832 rCont.getView()->sysError( sError );
833 } 833 }
834} 834}
@@ -838,7 +838,7 @@ Context &Runner::getContext()
838 return rCont; 838 return rCont;
839} 839}
840 840
841Target *Runner::buildTarget( const Bu::FString &sOutput, 841Target *Runner::buildTarget( const Bu::String &sOutput,
842 AstBranch::NodeList::const_iterator n ) 842 AstBranch::NodeList::const_iterator n )
843{ 843{
844 Target *pTrg = NULL; 844 Target *pTrg = NULL;
@@ -868,7 +868,7 @@ Target *Runner::buildTarget( const Bu::FString &sOutput,
868 return pTrg; 868 return pTrg;
869} 869}
870 870
871Rule *Runner::buildRule( const Bu::FString &sName, 871Rule *Runner::buildRule( const Bu::String &sName,
872 AstBranch::NodeList::const_iterator n ) 872 AstBranch::NodeList::const_iterator n )
873{ 873{
874 Rule *pRule = new Rule( sName ); 874 Rule *pRule = new Rule( sName );
@@ -886,7 +886,7 @@ Variable Runner::doSet( const AstBranch *pRoot )
886{ 886{
887 AstBranch::NodeList::const_iterator n = 887 AstBranch::NodeList::const_iterator n =
888 (*pRoot->getBranchBegin()).begin(); 888 (*pRoot->getBranchBegin()).begin();
889 Bu::FString sVar = dynamic_cast<const AstLeaf *>( *n )->getStrValue(); 889 Bu::String sVar = dynamic_cast<const AstLeaf *>( *n )->getStrValue();
890 n++; 890 n++;
891 const AstLeaf *pLeaf = dynamic_cast<const AstLeaf *>( *n ); 891 const AstLeaf *pLeaf = dynamic_cast<const AstLeaf *>( *n );
892 n++; 892 n++;
diff --git a/src/runner.h b/src/runner.h
index 98894da..0efcb44 100644
--- a/src/runner.h
+++ b/src/runner.h
@@ -20,15 +20,15 @@ public:
20 Variable run( AstBranch::NodeList::const_iterator n ); 20 Variable run( AstBranch::NodeList::const_iterator n );
21 class Variable execFunc( const class AstBranch *pFunc, 21 class Variable execFunc( const class AstBranch *pFunc,
22 class Variable &vIn ); 22 class Variable &vIn );
23 void execProfile( class Target *pTarget, const Bu::FString &sProfile ); 23 void execProfile( class Target *pTarget, const Bu::String &sProfile );
24 void execAction( const Bu::FString &sName ); 24 void execAction( const Bu::String &sName );
25 25
26 Context &getContext(); 26 Context &getContext();
27 27
28private: 28private:
29 class Target *buildTarget( const Bu::FString &sOutput, 29 class Target *buildTarget( const Bu::String &sOutput,
30 AstBranch::NodeList::const_iterator n ); 30 AstBranch::NodeList::const_iterator n );
31 class Rule *buildRule( const Bu::FString &sName, 31 class Rule *buildRule( const Bu::String &sName,
32 AstBranch::NodeList::const_iterator n ); 32 AstBranch::NodeList::const_iterator n );
33 void attachDefaults(); 33 void attachDefaults();
34 Variable doSet( const AstBranch *pRoot ); 34 Variable doSet( const AstBranch *pRoot );
diff --git a/src/target.cpp b/src/target.cpp
index 958fcf5..3a90c01 100644
--- a/src/target.cpp
+++ b/src/target.cpp
@@ -23,7 +23,7 @@ Target::Target( bool bExplicit ) :
23{ 23{
24} 24}
25 25
26Target::Target( const Bu::FString &sOutput, bool bExplicit ) : 26Target::Target( const Bu::String &sOutput, bool bExplicit ) :
27 bExplicit( bExplicit ), 27 bExplicit( bExplicit ),
28 lsOutput( sOutput ), 28 lsOutput( sOutput ),
29 iDepCount( 0 ) 29 iDepCount( 0 )
@@ -34,7 +34,7 @@ Target::~Target()
34{ 34{
35} 35}
36 36
37void Target::addInput( const Bu::FString &sInput ) 37void Target::addInput( const Bu::String &sInput )
38{ 38{
39 lsInput.append( sInput ); 39 lsInput.append( sInput );
40} 40}
@@ -62,7 +62,7 @@ void Target::resetInputList( const StrList &lInputs )
62 } 62 }
63} 63}
64 64
65void Target::addRequires( const Bu::FString &sReq ) 65void Target::addRequires( const Bu::String &sReq )
66{ 66{
67 lsRequires.append( sReq ); 67 lsRequires.append( sReq );
68} 68}
@@ -101,7 +101,7 @@ void Target::buildRequires( Runner &r )
101 { 101 {
102 for( VarList::iterator j = v.begin(); j; j++ ) 102 for( VarList::iterator j = v.begin(); j; j++ )
103 { 103 {
104 Bu::FString sReq = (*j).toString(); 104 Bu::String sReq = (*j).toString();
105 addRequires( sReq ); 105 addRequires( sReq );
106 /* try 106 /* try
107 { 107 {
@@ -112,7 +112,7 @@ void Target::buildRequires( Runner &r )
112 } 112 }
113 else 113 else
114 { 114 {
115 Bu::FString sReq = v.toString(); 115 Bu::String sReq = v.toString();
116 addRequires( sReq ); 116 addRequires( sReq );
117 /* try 117 /* try
118 { 118 {
@@ -127,7 +127,7 @@ void Target::buildRequires( Runner &r )
127 c.setRequires( lsOutput.first(), lsRequires ); 127 c.setRequires( lsOutput.first(), lsRequires );
128} 128}
129 129
130void Target::addOutput( const Bu::FString &sOutput ) 130void Target::addOutput( const Bu::String &sOutput )
131{ 131{
132 lsOutput.append( sOutput ); 132 lsOutput.append( sOutput );
133} 133}
@@ -137,22 +137,22 @@ const StrList &Target::getOutputList() const
137 return lsOutput; 137 return lsOutput;
138} 138}
139 139
140void Target::setPrefix( const Bu::FString &sPrefix ) 140void Target::setPrefix( const Bu::String &sPrefix )
141{ 141{
142 this->sPrefix = sPrefix; 142 this->sPrefix = sPrefix;
143} 143}
144 144
145const Bu::FString &Target::getPrefix() const 145const Bu::String &Target::getPrefix() const
146{ 146{
147 return sPrefix; 147 return sPrefix;
148} 148}
149 149
150void Target::setRule( const Bu::FString &sRule ) 150void Target::setRule( const Bu::String &sRule )
151{ 151{
152 this->sRule = sRule; 152 this->sRule = sRule;
153} 153}
154 154
155const Bu::FString &Target::getRule() const 155const Bu::String &Target::getRule() const
156{ 156{
157 return sRule; 157 return sRule;
158} 158}
@@ -196,12 +196,12 @@ void Target::addProfile( const class Profile *pSrc )
196 hProfiles.insert( pSrc->getName(), new Profile( *pSrc ) ); 196 hProfiles.insert( pSrc->getName(), new Profile( *pSrc ) );
197} 197}
198 198
199bool Target::hasProfile( const Bu::FString &sName ) const 199bool Target::hasProfile( const Bu::String &sName ) const
200{ 200{
201 return hProfiles.has( sName ); 201 return hProfiles.has( sName );
202} 202}
203 203
204const Profile *Target::getProfile( const Bu::FString &sName ) const 204const Profile *Target::getProfile( const Bu::String &sName ) const
205{ 205{
206 return hProfiles.get( sName ); 206 return hProfiles.get( sName );
207} 207}
@@ -217,18 +217,18 @@ const VarHash &Target::getVars() const
217 return hVars; 217 return hVars;
218} 218}
219 219
220void Target::setDisplay( const Bu::FString &sNewDisplay ) 220void Target::setDisplay( const Bu::String &sNewDisplay )
221{ 221{
222 if( !sDisplay.isSet() ) 222 if( !sDisplay.isSet() )
223 sDisplay = sNewDisplay; 223 sDisplay = sNewDisplay;
224} 224}
225 225
226const Bu::FString &Target::getDisplay() const 226const Bu::String &Target::getDisplay() const
227{ 227{
228 return sDisplay; 228 return sDisplay;
229} 229}
230 230
231void Target::process( class Runner &r, const Bu::FString &sProfile ) 231void Target::process( class Runner &r, const Bu::String &sProfile )
232{ 232{
233 r.getContext().getView()->beginTarget( sProfile, *this ); 233 r.getContext().getView()->beginTarget( sProfile, *this );
234 bRun = true; 234 bRun = true;
@@ -320,7 +320,7 @@ void Target::mergeUnder( const Target *pSrc )
320 320
321void Target::merge( StrList &lOut, const StrList &lIn ) 321void Target::merge( StrList &lOut, const StrList &lIn )
322{ 322{
323 Bu::Heap<Bu::FString> hStr; 323 Bu::Heap<Bu::String> hStr;
324 for( StrList::const_iterator i = lOut.begin(); i; i++ ) 324 for( StrList::const_iterator i = lOut.begin(); i; i++ )
325 { 325 {
326 hStr.enqueue( *i ); 326 hStr.enqueue( *i );
diff --git a/src/target.h b/src/target.h
index 25af1f4..b325682 100644
--- a/src/target.h
+++ b/src/target.h
@@ -9,14 +9,14 @@ class Target
9 friend Bu::Formatter &operator<<( Bu::Formatter &f, const Target &t ); 9 friend Bu::Formatter &operator<<( Bu::Formatter &f, const Target &t );
10public: 10public:
11 Target( bool bExplicit ); 11 Target( bool bExplicit );
12 Target( const Bu::FString &sOutput, bool bExplicit ); 12 Target( const Bu::String &sOutput, bool bExplicit );
13 virtual ~Target(); 13 virtual ~Target();
14 14
15 void addInput( const Bu::FString &sInput ); 15 void addInput( const Bu::String &sInput );
16 const StrList &getInputList() const; 16 const StrList &getInputList() const;
17 void resetInputList( const StrList &lInputs ); 17 void resetInputList( const StrList &lInputs );
18 18
19 void addRequires( const Bu::FString &sReq ); 19 void addRequires( const Bu::String &sReq );
20 void addRequires( const AstBranch *pBr ); 20 void addRequires( const AstBranch *pBr );
21 const StrList &getRequiresList() const; 21 const StrList &getRequiresList() const;
22 /** 22 /**
@@ -27,14 +27,14 @@ public:
27 void gatherRequires( class Runner &r ); 27 void gatherRequires( class Runner &r );
28 void buildRequires( class Runner &r ); 28 void buildRequires( class Runner &r );
29 29
30 void addOutput( const Bu::FString &sOutput ); 30 void addOutput( const Bu::String &sOutput );
31 const StrList &getOutputList() const; 31 const StrList &getOutputList() const;
32 32
33 void setPrefix( const Bu::FString &sPrefix ); 33 void setPrefix( const Bu::String &sPrefix );
34 const Bu::FString &getPrefix() const; 34 const Bu::String &getPrefix() const;
35 35
36 void setRule( const Bu::FString &sRule ); 36 void setRule( const Bu::String &sRule );
37 const Bu::FString &getRule() const; 37 const Bu::String &getRule() const;
38 bool hasRule() const; 38 bool hasRule() const;
39 39
40 bool isExplicit() const; 40 bool isExplicit() const;
@@ -44,16 +44,16 @@ public:
44 44
45 void addProfile( const class AstBranch *pProfRoot ); 45 void addProfile( const class AstBranch *pProfRoot );
46 void addProfile( const class Profile *pSrc ); 46 void addProfile( const class Profile *pSrc );
47 bool hasProfile( const Bu::FString &sName ) const; 47 bool hasProfile( const Bu::String &sName ) const;
48 const class Profile *getProfile( const Bu::FString &sName ) const; 48 const class Profile *getProfile( const Bu::String &sName ) const;
49 49
50 void setVars( const VarHash &hNewVars ); 50 void setVars( const VarHash &hNewVars );
51 const VarHash &getVars() const; 51 const VarHash &getVars() const;
52 52
53 void setDisplay( const Bu::FString &sNewDisplay ); 53 void setDisplay( const Bu::String &sNewDisplay );
54 const Bu::FString &getDisplay() const; 54 const Bu::String &getDisplay() const;
55 55
56 void process( class Runner &r, const Bu::FString &sProfile ); 56 void process( class Runner &r, const Bu::String &sProfile );
57 57
58 void mergeUnder( const Target *pSrc ); 58 void mergeUnder( const Target *pSrc );
59 59
@@ -74,12 +74,12 @@ private:
74 StrList lsInput; 74 StrList lsInput;
75 StrList lsRequires; 75 StrList lsRequires;
76 StrList lsOutput; 76 StrList lsOutput;
77 Bu::FString sPrefix; 77 Bu::String sPrefix;
78 Bu::FString sRule; 78 Bu::String sRule;
79 VarHash hVars; 79 VarHash hVars;
80 TargetList lDeps; 80 TargetList lDeps;
81 ProfileHash hProfiles; 81 ProfileHash hProfiles;
82 Bu::FString sDisplay; 82 Bu::String sDisplay;
83 bool bRun; 83 bool bRun;
84 AstBranchList lbRequires; 84 AstBranchList lbRequires;
85 int iDepCount; 85 int iDepCount;
diff --git a/src/types.h b/src/types.h
index e405e35..9b8ecdf 100644
--- a/src/types.h
+++ b/src/types.h
@@ -1,22 +1,22 @@
1#ifndef TYPES_H 1#ifndef TYPES_H
2#define TYPES_H 2#define TYPES_H
3 3
4#include "bu/fstring.h" 4#include "bu/string.h"
5#include "bu/list.h" 5#include "bu/list.h"
6#include "bu/hash.h" 6#include "bu/hash.h"
7 7
8typedef Bu::List<Bu::FString> StrList; 8typedef Bu::List<Bu::String> StrList;
9 9
10class Variable; 10class Variable;
11typedef Bu::List<Variable> VarList; 11typedef Bu::List<Variable> VarList;
12typedef Bu::Hash<Bu::FString, Variable> VarHash; 12typedef Bu::Hash<Bu::String, Variable> VarHash;
13 13
14class Condition; 14class Condition;
15 15
16class Target; 16class Target;
17typedef Bu::List<Target *> TargetList; 17typedef Bu::List<Target *> TargetList;
18class Profile; 18class Profile;
19typedef Bu::Hash<Bu::FString, Profile *> ProfileHash; 19typedef Bu::Hash<Bu::String, Profile *> ProfileHash;
20 20
21class AstNode; 21class AstNode;
22class AstBranch; 22class AstBranch;
diff --git a/src/variable.cpp b/src/variable.cpp
index 87571b6..494338d 100644
--- a/src/variable.cpp
+++ b/src/variable.cpp
@@ -17,7 +17,7 @@ Variable::Variable( Type t ) :
17 memset( &uVal, 0, sizeof(uVal) ); 17 memset( &uVal, 0, sizeof(uVal) );
18 if( eType == typeString || eType == typeRef ) 18 if( eType == typeString || eType == typeRef )
19 { 19 {
20 uVal.sVal = new Bu::FString; 20 uVal.sVal = new Bu::String;
21 } 21 }
22 else if( eType == typeList ) 22 else if( eType == typeList )
23 { 23 {
@@ -46,18 +46,18 @@ Variable::Variable( bool bVal ) :
46 uVal.bVal = bVal; 46 uVal.bVal = bVal;
47} 47}
48 48
49Variable::Variable( const Bu::FString &sVal ) : 49Variable::Variable( const Bu::String &sVal ) :
50 eType( typeString ) 50 eType( typeString )
51{ 51{
52 memset( &uVal, 0, sizeof(uVal) ); 52 memset( &uVal, 0, sizeof(uVal) );
53 uVal.sVal = new Bu::FString( sVal ); 53 uVal.sVal = new Bu::String( sVal );
54} 54}
55 55
56Variable::Variable( const char *sVal ) : 56Variable::Variable( const char *sVal ) :
57 eType( typeString ) 57 eType( typeString )
58{ 58{
59 memset( &uVal, 0, sizeof(uVal) ); 59 memset( &uVal, 0, sizeof(uVal) );
60 uVal.sVal = new Bu::FString( sVal ); 60 uVal.sVal = new Bu::String( sVal );
61} 61}
62 62
63Variable::Variable( const Variable &v ) : 63Variable::Variable( const Variable &v ) :
@@ -66,7 +66,7 @@ Variable::Variable( const Variable &v ) :
66 memset( &uVal, 0, sizeof(uVal) ); 66 memset( &uVal, 0, sizeof(uVal) );
67 if( eType == typeString || eType == typeRef ) 67 if( eType == typeString || eType == typeRef )
68 { 68 {
69 uVal.sVal = new Bu::FString( *v.uVal.sVal ); 69 uVal.sVal = new Bu::String( *v.uVal.sVal );
70 } 70 }
71 else if( eType == typeList ) 71 else if( eType == typeList )
72 { 72 {
@@ -99,7 +99,7 @@ Variable::Variable( const class AstLeaf &l )
99 99
100 case AstNode::typeDataString: 100 case AstNode::typeDataString:
101 eType = typeString; 101 eType = typeString;
102 uVal.sVal = new Bu::FString( l.getStrValue() ); 102 uVal.sVal = new Bu::String( l.getStrValue() );
103 break; 103 break;
104 104
105 case AstNode::typeDataNone: 105 case AstNode::typeDataNone:
@@ -118,7 +118,7 @@ Variable::Variable( const StrList &lst )
118 if( lst.getSize() == 1 ) 118 if( lst.getSize() == 1 )
119 { 119 {
120 eType = typeString; 120 eType = typeString;
121 uVal.sVal = new Bu::FString( lst.first() ); 121 uVal.sVal = new Bu::String( lst.first() );
122 } 122 }
123 else 123 else
124 { 124 {
@@ -149,7 +149,7 @@ Variable::~Variable()
149 } 149 }
150} 150}
151 151
152Variable Variable::mkRef( const Bu::FString &sVal ) 152Variable Variable::mkRef( const Bu::String &sVal )
153{ 153{
154 Variable v( typeRef ); 154 Variable v( typeRef );
155 (*v.uVal.sVal) = sVal; 155 (*v.uVal.sVal) = sVal;
@@ -179,7 +179,7 @@ bool Variable::getBool() const
179 return uVal.bVal; 179 return uVal.bVal;
180} 180}
181 181
182const Bu::FString &Variable::getString() const 182const Bu::String &Variable::getString() const
183{ 183{
184 if( eType != typeString && eType != typeRef ) throw Bu::ExceptionBase("Wrong variable type."); 184 if( eType != typeString && eType != typeRef ) throw Bu::ExceptionBase("Wrong variable type.");
185 return *uVal.sVal; 185 return *uVal.sVal;
@@ -263,9 +263,9 @@ bool Variable::toBool() const
263 return false; 263 return false;
264} 264}
265 265
266Bu::FString Variable::toString() const 266Bu::String Variable::toString() const
267{ 267{
268 Bu::FString sRet; 268 Bu::String sRet;
269 switch( eType ) 269 switch( eType )
270 { 270 {
271 case typeNone: 271 case typeNone:
@@ -417,7 +417,7 @@ const Variable &Variable::operator=( const Variable &rhs )
417 reset( rhs.eType ); 417 reset( rhs.eType );
418 if( rhs.eType == typeString || rhs.eType == typeRef ) 418 if( rhs.eType == typeString || rhs.eType == typeRef )
419 { 419 {
420 uVal.sVal = new Bu::FString( *rhs.uVal.sVal ); 420 uVal.sVal = new Bu::String( *rhs.uVal.sVal );
421 } 421 }
422 else if( rhs.eType == typeList ) 422 else if( rhs.eType == typeList )
423 { 423 {
@@ -455,10 +455,10 @@ const Variable &Variable::operator=( const bool &rhs )
455 return *this; 455 return *this;
456} 456}
457 457
458const Variable &Variable::operator=( const Bu::FString &rhs ) 458const Variable &Variable::operator=( const Bu::String &rhs )
459{ 459{
460 reset( typeString ); 460 reset( typeString );
461 uVal.sVal = new Bu::FString( rhs ); 461 uVal.sVal = new Bu::String( rhs );
462 462
463 return *this; 463 return *this;
464} 464}
@@ -471,7 +471,7 @@ const Variable &Variable::operator+=( const Variable &rhs )
471 reset( rhs.eType ); 471 reset( rhs.eType );
472 if( eType == typeString || eType == typeRef ) 472 if( eType == typeString || eType == typeRef )
473 { 473 {
474 uVal.sVal = new Bu::FString( *rhs.uVal.sVal ); 474 uVal.sVal = new Bu::String( *rhs.uVal.sVal );
475 } 475 }
476 else if( eType == typeList ) 476 else if( eType == typeList )
477 { 477 {
@@ -521,7 +521,7 @@ const Variable &Variable::operator<<( const Variable &rhs )
521 reset( rhs.eType ); 521 reset( rhs.eType );
522 if( eType == typeString ) 522 if( eType == typeString )
523 { 523 {
524 uVal.sVal = new Bu::FString( *rhs.uVal.sVal ); 524 uVal.sVal = new Bu::String( *rhs.uVal.sVal );
525 } 525 }
526 else if( eType == typeList ) 526 else if( eType == typeList )
527 { 527 {
diff --git a/src/variable.h b/src/variable.h
index c8679a8..260c96a 100644
--- a/src/variable.h
+++ b/src/variable.h
@@ -30,7 +30,7 @@ public:
30 Variable( int iVal ); 30 Variable( int iVal );
31 Variable( double fVal ); 31 Variable( double fVal );
32 Variable( bool bVal ); 32 Variable( bool bVal );
33 Variable( const Bu::FString &sVal ); 33 Variable( const Bu::String &sVal );
34 Variable( const char *sVal ); 34 Variable( const char *sVal );
35 Variable( const Variable &v ); 35 Variable( const Variable &v );
36 Variable( const class AstLeaf &l ); 36 Variable( const class AstLeaf &l );
@@ -43,7 +43,7 @@ public:
43 Variable( const VarList &lst ); 43 Variable( const VarList &lst );
44 virtual ~Variable(); 44 virtual ~Variable();
45 45
46 static Variable mkRef( const Bu::FString &sVal ); 46 static Variable mkRef( const Bu::String &sVal );
47 47
48 Type getType() const; 48 Type getType() const;
49 49
@@ -52,7 +52,7 @@ public:
52 int getInt() const; 52 int getInt() const;
53 double getFloat() const; 53 double getFloat() const;
54 bool getBool() const; 54 bool getBool() const;
55 const Bu::FString &getString() const; 55 const Bu::String &getString() const;
56 const VarList &getList() const; 56 const VarList &getList() const;
57 57
58 // Conversion functions, they'll return the requested type, maybe an error 58 // Conversion functions, they'll return the requested type, maybe an error
@@ -60,7 +60,7 @@ public:
60 int toInt() const; 60 int toInt() const;
61 double toFloat() const; 61 double toFloat() const;
62 bool toBool() const; 62 bool toBool() const;
63 Bu::FString toString() const; 63 Bu::String toString() const;
64 VarList toList() const; 64 VarList toList() const;
65 65
66 Variable toType( Type eNewType ) const; 66 Variable toType( Type eNewType ) const;
@@ -76,7 +76,7 @@ public:
76 const Variable &operator=( const int &rhs ); 76 const Variable &operator=( const int &rhs );
77 const Variable &operator=( const double &rhs ); 77 const Variable &operator=( const double &rhs );
78 const Variable &operator=( const bool &rhs ); 78 const Variable &operator=( const bool &rhs );
79 const Variable &operator=( const Bu::FString &rhs ); 79 const Variable &operator=( const Bu::String &rhs );
80 80
81 const Variable &operator+=( const Variable &rhs ); 81 const Variable &operator+=( const Variable &rhs );
82 const Variable &operator<<( const Variable &rhs ); 82 const Variable &operator<<( const Variable &rhs );
@@ -100,7 +100,7 @@ private:
100 int iVal; 100 int iVal;
101 double fVal; 101 double fVal;
102 bool bVal; 102 bool bVal;
103 Bu::FString *sVal; 103 Bu::String *sVal;
104 VarList *lVal; 104 VarList *lVal;
105 } uVal; 105 } uVal;
106 106
diff --git a/src/view.h b/src/view.h
index fb172aa..389ad15 100644
--- a/src/view.h
+++ b/src/view.h
@@ -1,7 +1,7 @@
1#ifndef VIEW_H 1#ifndef VIEW_H
2#define VIEW_H 2#define VIEW_H
3 3
4#include <bu/fstring.h> 4#include <bu/string.h>
5#include "types.h" 5#include "types.h"
6 6
7/** 7/**
@@ -17,28 +17,28 @@ public:
17 View(); 17 View();
18 virtual ~View(); 18 virtual ~View();
19 19
20 virtual void beginAction( const Bu::FString &sAction )=0; 20 virtual void beginAction( const Bu::String &sAction )=0;
21 virtual void endAction()=0; 21 virtual void endAction()=0;
22 22
23 virtual void skipTarget( const Bu::FString &sProfile, 23 virtual void skipTarget( const Bu::String &sProfile,
24 const Target &rTarget )=0; 24 const Target &rTarget )=0;
25 virtual void beginTarget( const Bu::FString &sProfile, 25 virtual void beginTarget( const Bu::String &sProfile,
26 const Target &rTarget )=0; 26 const Target &rTarget )=0;
27 virtual void processTarget( const Bu::FString &sProfile, 27 virtual void processTarget( const Bu::String &sProfile,
28 const Target &rTarget )=0; 28 const Target &rTarget )=0;
29 virtual void endTarget()=0; 29 virtual void endTarget()=0;
30 30
31 virtual void buildRequires( const Target &rTarget )=0; 31 virtual void buildRequires( const Target &rTarget )=0;
32 virtual void cmdStarted( const Bu::FString &sCmd )=0; 32 virtual void cmdStarted( const Bu::String &sCmd )=0;
33 virtual void cmdFinished( const Bu::FString &sStdOut, 33 virtual void cmdFinished( const Bu::String &sStdOut,
34 const Bu::FString &sStdErr, long iExit )=0; 34 const Bu::String &sStdErr, long iExit )=0;
35 35
36 virtual void userError( const Bu::FString &sMsg )=0; 36 virtual void userError( const Bu::String &sMsg )=0;
37 virtual void userWarning( const Bu::FString &sMsg )=0; 37 virtual void userWarning( const Bu::String &sMsg )=0;
38 virtual void userNotice( const Bu::FString &sMsg )=0; 38 virtual void userNotice( const Bu::String &sMsg )=0;
39 39
40 virtual void sysError( const Bu::FString &sMsg )=0; 40 virtual void sysError( const Bu::String &sMsg )=0;
41 virtual void sysWarning( const Bu::FString &sMsg )=0; 41 virtual void sysWarning( const Bu::String &sMsg )=0;
42 42
43private: 43private:
44}; 44};
diff --git a/src/viewdefault.cpp b/src/viewdefault.cpp
index 49ba7e8..8b7e345 100644
--- a/src/viewdefault.cpp
+++ b/src/viewdefault.cpp
@@ -47,7 +47,7 @@ ViewDefault::~ViewDefault()
47 } 47 }
48} 48}
49 49
50void ViewDefault::beginAction( const Bu::FString &/*sAction*/ ) 50void ViewDefault::beginAction( const Bu::String &/*sAction*/ )
51{ 51{
52} 52}
53 53
@@ -55,13 +55,13 @@ void ViewDefault::endAction()
55{ 55{
56} 56}
57 57
58void ViewDefault::skipTarget( const Bu::FString &/*sProfile*/, 58void ViewDefault::skipTarget( const Bu::String &/*sProfile*/,
59 const Target &/*rTarget*/ ) 59 const Target &/*rTarget*/ )
60{ 60{
61 iCurrent++; 61 iCurrent++;
62} 62}
63 63
64void ViewDefault::beginTarget( const Bu::FString &sProfile, 64void ViewDefault::beginTarget( const Bu::String &sProfile,
65 const Target &rTarget ) 65 const Target &rTarget )
66{ 66{
67 if( iDepth == 0 ) 67 if( iDepth == 0 )
@@ -76,7 +76,7 @@ void ViewDefault::beginTarget( const Bu::FString &sProfile,
76 sCurProfile = sProfile; 76 sCurProfile = sProfile;
77} 77}
78 78
79void ViewDefault::drawTargetHdr( const Bu::FString &sProfile, 79void ViewDefault::drawTargetHdr( const Bu::String &sProfile,
80 const Target &rTarget ) 80 const Target &rTarget )
81{ 81{
82 if( bDispedTrg == false ) 82 if( bDispedTrg == false )
@@ -93,7 +93,7 @@ void ViewDefault::drawTargetHdr( const Bu::FString &sProfile,
93 } 93 }
94} 94}
95 95
96void ViewDefault::processTarget( const Bu::FString &sProfile, 96void ViewDefault::processTarget( const Bu::String &sProfile,
97 const Target &rTarget ) 97 const Target &rTarget )
98{ 98{
99 drawTargetHdr( sProfile, rTarget ); 99 drawTargetHdr( sProfile, rTarget );
@@ -125,23 +125,23 @@ void ViewDefault::buildRequires( const Target &rTarget )
125 bDisped = true; 125 bDisped = true;
126} 126}
127 127
128void ViewDefault::cmdStarted( const Bu::FString &/*sCmd*/ ) 128void ViewDefault::cmdStarted( const Bu::String &/*sCmd*/ )
129{ 129{
130} 130}
131 131
132void ViewDefault::cmdFinished( const Bu::FString &sStdOut, 132void ViewDefault::cmdFinished( const Bu::String &sStdOut,
133 const Bu::FString &sStdErr, long /*iExit*/ ) 133 const Bu::String &sStdErr, long /*iExit*/ )
134{ 134{
135 if( sStdOut.isSet() ) 135 if( sStdOut.isSet() )
136 { 136 {
137 Bu::FString::const_iterator b; 137 Bu::String::const_iterator b;
138 b = sStdOut.begin(); 138 b = sStdOut.begin();
139 while( b ) 139 while( b )
140 { 140 {
141 Bu::FString::const_iterator e, max; 141 Bu::String::const_iterator e, max;
142 max = b + 78; 142 max = b + 78;
143 for( e = b; e != max && *e != '\n'; e++ ) { } 143 for( e = b; e != max && *e != '\n'; e++ ) { }
144 sio << C_BR_GREEN << "| " << C_RESET << FString( b, e ) << sio.nl; 144 sio << C_BR_GREEN << "| " << C_RESET << String( b, e ) << sio.nl;
145 b = e; 145 b = e;
146 if( *b == '\n' ) 146 if( *b == '\n' )
147 b++; 147 b++;
@@ -150,14 +150,14 @@ void ViewDefault::cmdFinished( const Bu::FString &sStdOut,
150 } 150 }
151 if( sStdErr.isSet() ) 151 if( sStdErr.isSet() )
152 { 152 {
153 Bu::FString::const_iterator b; 153 Bu::String::const_iterator b;
154 b = sStdErr.begin(); 154 b = sStdErr.begin();
155 while( b ) 155 while( b )
156 { 156 {
157 Bu::FString::const_iterator e, max; 157 Bu::String::const_iterator e, max;
158 max = b + 78; 158 max = b + 78;
159 for( e = b; e != max && *e != '\n'; e++ ) { } 159 for( e = b; e != max && *e != '\n'; e++ ) { }
160 sio << C_BR_RED << "| " << C_RESET << FString( b, e ) << sio.nl; 160 sio << C_BR_RED << "| " << C_RESET << String( b, e ) << sio.nl;
161 b = e; 161 b = e;
162 if( *b == '\n' ) 162 if( *b == '\n' )
163 b++; 163 b++;
@@ -169,31 +169,31 @@ void ViewDefault::cmdFinished( const Bu::FString &sStdOut,
169 bDisped = true; 169 bDisped = true;
170} 170}
171 171
172void ViewDefault::userError( const Bu::FString &sMsg ) 172void ViewDefault::userError( const Bu::String &sMsg )
173{ 173{
174 sio << C_BR_RED << "Error: " << sMsg << C_RESET << sio.nl; 174 sio << C_BR_RED << "Error: " << sMsg << C_RESET << sio.nl;
175 bDisped = true; 175 bDisped = true;
176} 176}
177 177
178void ViewDefault::userWarning( const Bu::FString &sMsg ) 178void ViewDefault::userWarning( const Bu::String &sMsg )
179{ 179{
180 sio << C_BR_YELLOW << "Warning: " << sMsg << C_RESET << sio.nl; 180 sio << C_BR_YELLOW << "Warning: " << sMsg << C_RESET << sio.nl;
181 bDisped = true; 181 bDisped = true;
182} 182}
183 183
184void ViewDefault::userNotice( const Bu::FString &sMsg ) 184void ViewDefault::userNotice( const Bu::String &sMsg )
185{ 185{
186 sio << C_BR_GREEN << "Notice: " << sMsg << C_RESET << sio.nl; 186 sio << C_BR_GREEN << "Notice: " << sMsg << C_RESET << sio.nl;
187 bDisped = true; 187 bDisped = true;
188} 188}
189 189
190void ViewDefault::sysError( const Bu::FString &sMsg ) 190void ViewDefault::sysError( const Bu::String &sMsg )
191{ 191{
192 sio << C_BR_RED << sMsg << C_RESET << sio.nl; 192 sio << C_BR_RED << sMsg << C_RESET << sio.nl;
193 bDisped = true; 193 bDisped = true;
194} 194}
195 195
196void ViewDefault::sysWarning( const Bu::FString &sMsg ) 196void ViewDefault::sysWarning( const Bu::String &sMsg )
197{ 197{
198 sio << C_BR_YELLOW << sMsg << C_RESET << sio.nl; 198 sio << C_BR_YELLOW << sMsg << C_RESET << sio.nl;
199 bDisped = true; 199 bDisped = true;
diff --git a/src/viewdefault.h b/src/viewdefault.h
index 2c3db0e..ee9302b 100644
--- a/src/viewdefault.h
+++ b/src/viewdefault.h
@@ -9,30 +9,30 @@ public:
9 ViewDefault(); 9 ViewDefault();
10 virtual ~ViewDefault(); 10 virtual ~ViewDefault();
11 11
12 virtual void beginAction( const Bu::FString &sAction ); 12 virtual void beginAction( const Bu::String &sAction );
13 virtual void endAction(); 13 virtual void endAction();
14 14
15 virtual void skipTarget( const Bu::FString &sProfile, 15 virtual void skipTarget( const Bu::String &sProfile,
16 const Target &rTarget ); 16 const Target &rTarget );
17 virtual void beginTarget( const Bu::FString &sProfile, 17 virtual void beginTarget( const Bu::String &sProfile,
18 const Target &rTarget ); 18 const Target &rTarget );
19 virtual void processTarget( const Bu::FString &sProfile, 19 virtual void processTarget( const Bu::String &sProfile,
20 const Target &rTarget ); 20 const Target &rTarget );
21 virtual void endTarget(); 21 virtual void endTarget();
22 22
23 virtual void buildRequires( const Target &rTarget ); 23 virtual void buildRequires( const Target &rTarget );
24 virtual void cmdStarted( const Bu::FString &sCmd ); 24 virtual void cmdStarted( const Bu::String &sCmd );
25 virtual void cmdFinished( const Bu::FString &sStdOut, 25 virtual void cmdFinished( const Bu::String &sStdOut,
26 const Bu::FString &sStdErr, long iExit ); 26 const Bu::String &sStdErr, long iExit );
27 27
28 virtual void userError( const Bu::FString &sMsg ); 28 virtual void userError( const Bu::String &sMsg );
29 virtual void userWarning( const Bu::FString &sMsg ); 29 virtual void userWarning( const Bu::String &sMsg );
30 virtual void userNotice( const Bu::FString &sMsg ); 30 virtual void userNotice( const Bu::String &sMsg );
31 31
32 virtual void sysError( const Bu::FString &sMsg ); 32 virtual void sysError( const Bu::String &sMsg );
33 virtual void sysWarning( const Bu::FString &sMsg ); 33 virtual void sysWarning( const Bu::String &sMsg );
34 34
35 void drawTargetHdr( const Bu::FString &sProfile, const Target &rTarget ); 35 void drawTargetHdr( const Bu::String &sProfile, const Target &rTarget );
36 36
37private: 37private:
38 bool bFirst; 38 bool bFirst;
@@ -41,8 +41,8 @@ private:
41 int iDepth; 41 int iDepth;
42 int iTotal; 42 int iTotal;
43 int iCurrent; 43 int iCurrent;
44 Bu::FString sCurProfile; 44 Bu::String sCurProfile;
45 Bu::FString sTopTarget; 45 Bu::String sTopTarget;
46}; 46};
47 47
48#endif 48#endif
diff --git a/src/viewmake.cpp b/src/viewmake.cpp
index 39d1327..14f5526 100644
--- a/src/viewmake.cpp
+++ b/src/viewmake.cpp
@@ -17,7 +17,7 @@ ViewMake::~ViewMake()
17{ 17{
18} 18}
19 19
20void ViewMake::beginAction( const Bu::FString &/*sAction*/ ) 20void ViewMake::beginAction( const Bu::String &/*sAction*/ )
21{ 21{
22} 22}
23 23
@@ -25,17 +25,17 @@ void ViewMake::endAction()
25{ 25{
26} 26}
27 27
28void ViewMake::skipTarget( const Bu::FString &/*sProfile*/, 28void ViewMake::skipTarget( const Bu::String &/*sProfile*/,
29 const Target &/*rTarget*/ ) 29 const Target &/*rTarget*/ )
30{ 30{
31} 31}
32 32
33void ViewMake::beginTarget( const Bu::FString &/*sProfile*/, 33void ViewMake::beginTarget( const Bu::String &/*sProfile*/,
34 const Target &/*rTarget*/ ) 34 const Target &/*rTarget*/ )
35{ 35{
36} 36}
37 37
38void ViewMake::processTarget( const Bu::FString &/*sProfile*/, 38void ViewMake::processTarget( const Bu::String &/*sProfile*/,
39 const Target &/*rTarget*/ ) 39 const Target &/*rTarget*/ )
40{ 40{
41} 41}
@@ -48,38 +48,38 @@ void ViewMake::buildRequires( const Target &/*rTarget*/ )
48{ 48{
49} 49}
50 50
51void ViewMake::cmdStarted( const Bu::FString &sCmd ) 51void ViewMake::cmdStarted( const Bu::String &sCmd )
52{ 52{
53 sio << sCmd << sio.nl; 53 sio << sCmd << sio.nl;
54} 54}
55 55
56void ViewMake::cmdFinished( const Bu::FString &sStdOut, 56void ViewMake::cmdFinished( const Bu::String &sStdOut,
57 const Bu::FString &sStdErr, long /*iExit*/ ) 57 const Bu::String &sStdErr, long /*iExit*/ )
58{ 58{
59 sio << sStdOut << sStdErr; 59 sio << sStdOut << sStdErr;
60} 60}
61 61
62void ViewMake::userError( const Bu::FString &sMsg ) 62void ViewMake::userError( const Bu::String &sMsg )
63{ 63{
64 sio << "Error: " << sMsg << sio.nl; 64 sio << "Error: " << sMsg << sio.nl;
65} 65}
66 66
67void ViewMake::userWarning( const Bu::FString &sMsg ) 67void ViewMake::userWarning( const Bu::String &sMsg )
68{ 68{
69 sio << "Warning: " << sMsg << sio.nl; 69 sio << "Warning: " << sMsg << sio.nl;
70} 70}
71 71
72void ViewMake::userNotice( const Bu::FString &sMsg ) 72void ViewMake::userNotice( const Bu::String &sMsg )
73{ 73{
74 sio << "Notice: " << sMsg << sio.nl; 74 sio << "Notice: " << sMsg << sio.nl;
75} 75}
76 76
77void ViewMake::sysError( const Bu::FString &sMsg ) 77void ViewMake::sysError( const Bu::String &sMsg )
78{ 78{
79 sio << sMsg << sio.nl; 79 sio << sMsg << sio.nl;
80} 80}
81 81
82void ViewMake::sysWarning( const Bu::FString &sMsg ) 82void ViewMake::sysWarning( const Bu::String &sMsg )
83{ 83{
84 sio << sMsg << sio.nl; 84 sio << sMsg << sio.nl;
85} 85}
diff --git a/src/viewmake.h b/src/viewmake.h
index 9100a86..8960ef0 100644
--- a/src/viewmake.h
+++ b/src/viewmake.h
@@ -9,28 +9,28 @@ public:
9 ViewMake(); 9 ViewMake();
10 virtual ~ViewMake(); 10 virtual ~ViewMake();
11 11
12 virtual void beginAction( const Bu::FString &sAction ); 12 virtual void beginAction( const Bu::String &sAction );
13 virtual void endAction(); 13 virtual void endAction();
14 14
15 virtual void skipTarget( const Bu::FString &sProfile, 15 virtual void skipTarget( const Bu::String &sProfile,
16 const Target &rTarget ); 16 const Target &rTarget );
17 virtual void beginTarget( const Bu::FString &sProfile, 17 virtual void beginTarget( const Bu::String &sProfile,
18 const Target &rTarget ); 18 const Target &rTarget );
19 virtual void processTarget( const Bu::FString &sProfile, 19 virtual void processTarget( const Bu::String &sProfile,
20 const Target &rTarget ); 20 const Target &rTarget );
21 virtual void endTarget(); 21 virtual void endTarget();
22 22
23 virtual void buildRequires( const Target &rTarget ); 23 virtual void buildRequires( const Target &rTarget );
24 virtual void cmdStarted( const Bu::FString &sCmd ); 24 virtual void cmdStarted( const Bu::String &sCmd );
25 virtual void cmdFinished( const Bu::FString &sStdOut, 25 virtual void cmdFinished( const Bu::String &sStdOut,
26 const Bu::FString &sStdErr, long iExit ); 26 const Bu::String &sStdErr, long iExit );
27 27
28 virtual void userError( const Bu::FString &sMsg ); 28 virtual void userError( const Bu::String &sMsg );
29 virtual void userWarning( const Bu::FString &sMsg ); 29 virtual void userWarning( const Bu::String &sMsg );
30 virtual void userNotice( const Bu::FString &sMsg ); 30 virtual void userNotice( const Bu::String &sMsg );
31 31
32 virtual void sysError( const Bu::FString &sMsg ); 32 virtual void sysError( const Bu::String &sMsg );
33 virtual void sysWarning( const Bu::FString &sMsg ); 33 virtual void sysWarning( const Bu::String &sMsg );
34}; 34};
35 35
36#endif 36#endif
diff --git a/src/viewplugger.cpp b/src/viewplugger.cpp
index 58f3605..cdde2f6 100644
--- a/src/viewplugger.cpp
+++ b/src/viewplugger.cpp
@@ -19,13 +19,13 @@ ViewPlugger::ViewPlugger()
19 if( strncmp("pluginView", de->d_name, 15 ) ) 19 if( strncmp("pluginView", de->d_name, 15 ) )
20 continue; 20 continue;
21 21
22 Bu::FString sFile("/usr/lib/build/"); 22 Bu::String sFile("/usr/lib/build/");
23 sFile += de->d_name; 23 sFile += de->d_name;
24 char *s = de->d_name; 24 char *s = de->d_name;
25 for(; *s && *s != '.'; s++ ) { } 25 for(; *s && *s != '.'; s++ ) { }
26 registerExternalPlugin( 26 registerExternalPlugin(
27 sFile, 27 sFile,
28 Bu::FString( de->d_name, (ptrdiff_t)s-(ptrdiff_t)de->d_name ) 28 Bu::String( de->d_name, (ptrdiff_t)s-(ptrdiff_t)de->d_name )
29 ); 29 );
30 } 30 }
31 31