From f5aca1a1b402bd7ebc944dc6e6fe65828d863365 Mon Sep 17 00:00:00 2001
From: Mike Buland <eichlan@xagasoft.com>
Date: Thu, 20 Jan 2011 02:14:08 +0000
Subject: Bu::FString is now String, and there's a shell script to fix any
 other programs that were using fstring, I hope.

---
 src/tools/bnfcompile.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/tools/bnfcompile.cpp')

diff --git a/src/tools/bnfcompile.cpp b/src/tools/bnfcompile.cpp
index 16e75a5..b7b363c 100644
--- a/src/tools/bnfcompile.cpp
+++ b/src/tools/bnfcompile.cpp
@@ -123,7 +123,7 @@ public:
 		}
 	}
 
-	virtual FString tokenToString( const Token &t )
+	virtual String tokenToString( const Token &t )
 	{
 		switch( (TokenType)t.iToken )
 		{
@@ -146,7 +146,7 @@ public:
 private:
 	Stream &rSrc;
 	QueueBuf qbIn;
-	FString sBuf;
+	String sBuf;
 };
 
 class BnfParser
@@ -201,9 +201,9 @@ private:
 			next();
 			if( pCur->iToken == tokIdentifier )
 			{
-				hTokens.insert( pCur->vExtra.get<Bu::FString>(), ++iLastToken );
+				hTokens.insert( pCur->vExtra.get<Bu::String>(), ++iLastToken );
 				sio << "Added token[" << iLastToken << "]: "
-					<< pCur->vExtra.get<Bu::FString>() << sio.nl;
+					<< pCur->vExtra.get<Bu::String>() << sio.nl;
 			}
 			else if( pCur->iToken == tokSemiColon )
 				break;
@@ -214,7 +214,7 @@ private:
 
 	void nonTerminal()
 	{
-		Bu::FString sNtName = pCur->vExtra.get<Bu::FString>();
+		Bu::String sNtName = pCur->vExtra.get<Bu::String>();
 		Parser::NonTerminal nt;
 		p.addNonTerminal( sNtName );
 		sio.incIndent();
@@ -258,8 +258,8 @@ private:
 			{
 				case tokIdentifier:
 					{
-						const Bu::FString &sName =
-							pCur->vExtra.get<Bu::FString>();
+						const Bu::String &sName =
+							pCur->vExtra.get<Bu::String>();
 						if( hTokens.has( sName ) )
 						{
 							pr.append(
@@ -292,8 +292,8 @@ private:
 						next();
 						if( pCur->iToken != tokIdentifier )
 							tokenError("tokIdentifier");
-						Bu::FString sName =
-							pCur->vExtra.get<Bu::FString>();
+						Bu::String sName =
+							pCur->vExtra.get<Bu::String>();
 						next();
 						if( pCur->iToken != tokCloseSquare )
 							tokenError("tokCloseSquare");
@@ -317,8 +317,8 @@ private:
 						next();
 						if( pCur->iToken != tokIdentifier )
 							tokenError("tokIdentifier");
-						Bu::FString sName =
-							pCur->vExtra.get<Bu::FString>();
+						Bu::String sName =
+							pCur->vExtra.get<Bu::String>();
 						next();
 						if( pCur->iToken != tokCloseCurly )
 							tokenError("tokCloseCurly");
@@ -366,14 +366,14 @@ private:
 		pCur = l.nextToken();
 	}
 
-	void tokenError( const FString &s )
+	void tokenError( const String &s )
 	{
 		throw ExceptionBase( ("Expected " + s + " but found "
 				+ l.tokenToString( *pCur ) + ".").getStr() );
 	}
 
 private:
-	typedef Bu::Hash<Bu::FString, int> TokenHash;
+	typedef Bu::Hash<Bu::String, int> TokenHash;
 	TokenHash hTokens;
 	BnfLexer &l;
 	BnfLexer::Token *pCur;
-- 
cgit v1.2.3