diff options
| author | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 02:14:08 +0000 |
|---|---|---|
| committer | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 02:14:08 +0000 |
| commit | f5aca1a1b402bd7ebc944dc6e6fe65828d863365 (patch) | |
| tree | 4a0fdd8e166d5c4b03543279d332b9a858ef62df /src/parser.cpp | |
| parent | 10c557562e1d67c55314c212371ea9cb7f802863 (diff) | |
| download | libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.tar.gz libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.tar.bz2 libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.tar.xz libbu++-f5aca1a1b402bd7ebc944dc6e6fe65828d863365.zip | |
Bu::FString is now String, and there's a shell script to fix any other programs
that were using fstring, I hope.
Diffstat (limited to 'src/parser.cpp')
| -rw-r--r-- | src/parser.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/parser.cpp b/src/parser.cpp index 4ad4ff9..e46967c 100644 --- a/src/parser.cpp +++ b/src/parser.cpp | |||
| @@ -172,12 +172,12 @@ void Bu::Parser::setRootNonTerminal( int iRoot ) | |||
| 172 | iRootNonTerminal = iRoot; | 172 | iRootNonTerminal = iRoot; |
| 173 | } | 173 | } |
| 174 | 174 | ||
| 175 | void Bu::Parser::setRootNonTerminal( const Bu::FString &sRoot ) | 175 | void Bu::Parser::setRootNonTerminal( const Bu::String &sRoot ) |
| 176 | { | 176 | { |
| 177 | setRootNonTerminal( hNonTerminalName.get( sRoot ) ); | 177 | setRootNonTerminal( hNonTerminalName.get( sRoot ) ); |
| 178 | } | 178 | } |
| 179 | 179 | ||
| 180 | int Bu::Parser::addNonTerminal( const Bu::FString &sName, NonTerminal &nt ) | 180 | int Bu::Parser::addNonTerminal( const Bu::String &sName, NonTerminal &nt ) |
| 181 | { | 181 | { |
| 182 | int iId = aNonTerminal.getSize(); | 182 | int iId = aNonTerminal.getSize(); |
| 183 | aNonTerminal.append( nt ); | 183 | aNonTerminal.append( nt ); |
| @@ -186,7 +186,7 @@ int Bu::Parser::addNonTerminal( const Bu::FString &sName, NonTerminal &nt ) | |||
| 186 | return iId; | 186 | return iId; |
| 187 | } | 187 | } |
| 188 | 188 | ||
| 189 | int Bu::Parser::addNonTerminal( const Bu::FString &sName ) | 189 | int Bu::Parser::addNonTerminal( const Bu::String &sName ) |
| 190 | { | 190 | { |
| 191 | int iId = aNonTerminal.getSize(); | 191 | int iId = aNonTerminal.getSize(); |
| 192 | aNonTerminal.append( NonTerminal() ); | 192 | aNonTerminal.append( NonTerminal() ); |
| @@ -195,22 +195,22 @@ int Bu::Parser::addNonTerminal( const Bu::FString &sName ) | |||
| 195 | return iId; | 195 | return iId; |
| 196 | } | 196 | } |
| 197 | 197 | ||
| 198 | void Bu::Parser::setNonTerminal( const Bu::FString &sName, NonTerminal &nt ) | 198 | void Bu::Parser::setNonTerminal( const Bu::String &sName, NonTerminal &nt ) |
| 199 | { | 199 | { |
| 200 | aNonTerminal[hNonTerminalName.get(sName)] = nt; | 200 | aNonTerminal[hNonTerminalName.get(sName)] = nt; |
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | int Bu::Parser::getNonTerminalId( const Bu::FString &sName ) | 203 | int Bu::Parser::getNonTerminalId( const Bu::String &sName ) |
| 204 | { | 204 | { |
| 205 | return hNonTerminalName.get( sName ); | 205 | return hNonTerminalName.get( sName ); |
| 206 | } | 206 | } |
| 207 | 207 | ||
| 208 | bool Bu::Parser::hasNonTerminal( const Bu::FString &sName ) | 208 | bool Bu::Parser::hasNonTerminal( const Bu::String &sName ) |
| 209 | { | 209 | { |
| 210 | return hNonTerminalName.has( sName ); | 210 | return hNonTerminalName.has( sName ); |
| 211 | } | 211 | } |
| 212 | 212 | ||
| 213 | int Bu::Parser::addReduction( const Bu::FString &sName, const Reduction &r ) | 213 | int Bu::Parser::addReduction( const Bu::String &sName, const Reduction &r ) |
| 214 | { | 214 | { |
| 215 | int iId = aReduction.getSize(); | 215 | int iId = aReduction.getSize(); |
| 216 | aReduction.append( r ); | 216 | aReduction.append( r ); |
| @@ -218,7 +218,7 @@ int Bu::Parser::addReduction( const Bu::FString &sName, const Reduction &r ) | |||
| 218 | return iId; | 218 | return iId; |
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | int Bu::Parser::addReduction( const Bu::FString &sName ) | 221 | int Bu::Parser::addReduction( const Bu::String &sName ) |
| 222 | { | 222 | { |
| 223 | int iId = aReduction.getSize(); | 223 | int iId = aReduction.getSize(); |
| 224 | aReduction.append( Reduction() ); | 224 | aReduction.append( Reduction() ); |
| @@ -226,17 +226,17 @@ int Bu::Parser::addReduction( const Bu::FString &sName ) | |||
| 226 | return iId; | 226 | return iId; |
| 227 | } | 227 | } |
| 228 | 228 | ||
| 229 | void Bu::Parser::setReduction( const Bu::FString &sName, const Reduction &r ) | 229 | void Bu::Parser::setReduction( const Bu::String &sName, const Reduction &r ) |
| 230 | { | 230 | { |
| 231 | aReduction[hReductionName.get(sName)] = r; | 231 | aReduction[hReductionName.get(sName)] = r; |
| 232 | } | 232 | } |
| 233 | 233 | ||
| 234 | int Bu::Parser::getReductionId( const Bu::FString &sName ) | 234 | int Bu::Parser::getReductionId( const Bu::String &sName ) |
| 235 | { | 235 | { |
| 236 | return hReductionName.get( sName ); | 236 | return hReductionName.get( sName ); |
| 237 | } | 237 | } |
| 238 | 238 | ||
| 239 | bool Bu::Parser::hasReduction( const Bu::FString &sName ) | 239 | bool Bu::Parser::hasReduction( const Bu::String &sName ) |
| 240 | { | 240 | { |
| 241 | return hReductionName.has( sName ); | 241 | return hReductionName.has( sName ); |
| 242 | } | 242 | } |
