diff options
| author | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 18:21:03 +0000 |
|---|---|---|
| committer | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 18:21:03 +0000 |
| commit | c435c7daa9df1b08dc85132fcd1c154bea9b69e2 (patch) | |
| tree | 5537f3c91a67b35c4c8aa918b708b7e4aad8f146 /src/rule.cpp | |
| parent | 59690513123de8904eef2a03fe7fcaaed98b1b7b (diff) | |
| download | build-c435c7daa9df1b08dc85132fcd1c154bea9b69e2.tar.gz build-c435c7daa9df1b08dc85132fcd1c154bea9b69e2.tar.bz2 build-c435c7daa9df1b08dc85132fcd1c154bea9b69e2.tar.xz build-c435c7daa9df1b08dc85132fcd1c154bea9b69e2.zip | |
Fixes to use libbu++ Bu::String
Diffstat (limited to '')
| -rw-r--r-- | src/rule.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
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> |
| 12 | using namespace Bu; | 12 | using namespace Bu; |
| 13 | 13 | ||
| 14 | Rule::Rule( const Bu::FString &sName ) : | 14 | Rule::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 | ||
| 24 | const Bu::FString &Rule::getName() const | 24 | const 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 | ||
| 76 | Target *Rule::createTarget( class Runner &r, const Bu::FString &sInput, | 76 | Target *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 | ||
| 117 | bool Rule::ruleMatches( Runner &r, const Bu::FString &sInput ) | 117 | bool 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 | ||
| 134 | void Rule::addTag( const Bu::FString &sTag ) | 134 | void 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 | ||
| 144 | void Rule::setDisplay( const Bu::FString &sStr ) | 144 | void Rule::setDisplay( const Bu::String &sStr ) |
| 145 | { | 145 | { |
| 146 | sDisplay = sStr; | 146 | sDisplay = sStr; |
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | const Bu::FString &Rule::getDisplay() const | 149 | const Bu::String &Rule::getDisplay() const |
| 150 | { | 150 | { |
| 151 | return (sDisplay.isSet())?(sDisplay):(sName); | 151 | return (sDisplay.isSet())?(sDisplay):(sName); |
| 152 | } | 152 | } |
