Fix line endings. WHAMMY.

1 files changed, 480 insertions, 480 deletions

diff --git a/mp/src/tier1/tokenreader.cpp b/mp/src/tier1/tokenreader.cpp
index aed6ea36..39d01080 100644
--- a/mp/src/tier1/tokenreader.cpp
+++ b/mp/src/tier1/tokenreader.cpp
@@ -1,480 +1,480 @@
-//========= Copyright Valve Corporation, All rights reserved. ============//

-//

-// Purpose: 

-//

-// $NoKeywords: $

-//===========================================================================//

-

-#include <ctype.h>

-#include <stdio.h>

-#include <string.h>

-#include "tokenreader.h"

-#include "tier0/platform.h"

-#include "tier1/strtools.h"

-#include "tier0/dbg.h"

-

-//-----------------------------------------------------------------------------

-// Purpose: 

-//-----------------------------------------------------------------------------

-TokenReader::TokenReader(void)

-{

-	m_szFilename[0] = '\0';

-	m_nLine = 1;

-	m_nErrorCount = 0;

-	m_bStuffed = false;

-}

-

-

-//-----------------------------------------------------------------------------

-// Purpose: 

-// Input  : *pszFilename - 

-// Output : Returns true on success, false on failure.

-//-----------------------------------------------------------------------------

-bool TokenReader::Open(const char *pszFilename)

-{

-	open(pszFilename, std::ios::in | std::ios::binary );

-	Q_strncpy(m_szFilename, pszFilename, sizeof( m_szFilename ) );

-	m_nLine = 1;

-	m_nErrorCount = 0;

-	m_bStuffed = false;

-	return(is_open() != 0);

-}

-

-

-//-----------------------------------------------------------------------------

-// Purpose: 

-//-----------------------------------------------------------------------------

-void TokenReader::Close()

-{

-	close();

-}

-

-

-//-----------------------------------------------------------------------------

-// Purpose: 

-// Input  : *error - 

-// Output : const char

-//-----------------------------------------------------------------------------

-const char *TokenReader::Error(char *error, ...)

-{

-	static char szErrorBuf[256];

-	Q_snprintf(szErrorBuf, sizeof( szErrorBuf ), "File %s, line %d: ", m_szFilename, m_nLine);

-	Q_strncat(szErrorBuf, error, sizeof( szErrorBuf ), COPY_ALL_CHARACTERS );

-	m_nErrorCount++;

-	return(szErrorBuf);

-}

-

-

-//-----------------------------------------------------------------------------

-// Purpose: 

-// Input  : pszStore - 

-//			nSize - 

-// Output : Returns true on success, false on failure.

-//-----------------------------------------------------------------------------

-trtoken_t TokenReader::GetString(char *pszStore, int nSize)

-{

-	if (nSize <= 0)

-	{

-		return TOKENERROR;

-	}

-

-	char szBuf[1024];

-

-	//

-	// Until we reach the end of this string or run out of room in

-	// the destination buffer...

-	//

-	while (true)

-	{

-		//

-		// Fetch the next batch of text from the file.

-		//

-		get(szBuf, sizeof(szBuf), '\"');

-		if (eof())

-		{

-			return TOKENEOF;

-		}

-

-		if (fail())

-		{

-			// Just means nothing was read (empty string probably "")

-			clear();

-		}

-

-		//

-		// Transfer the text to the destination buffer.

-		//

-		char *pszSrc = szBuf;

-		while ((*pszSrc != '\0') && (nSize > 1))

-		{

-			if (*pszSrc == 0x0d)

-			{

-				//

-				// Newline encountered before closing quote -- unterminated string.

-				//

-				*pszStore = '\0';

-				return TOKENSTRINGTOOLONG;

-			}

-			else if (*pszSrc != '\\')

-			{

-				*pszStore = *pszSrc;

-				pszSrc++;

-			}

-			else

-			{

-				//

-				// Backslash sequence - replace with the appropriate character.

-				//

-				pszSrc++;

-

-				if (*pszSrc == 'n')

-				{

-					*pszStore = '\n';

-				}

-

-				pszSrc++;

-			}

-

-			pszStore++;

-			nSize--;

-		}

-

-		if (*pszSrc != '\0')

-		{

-			//

-			// Ran out of room in the destination buffer. Skip to the close-quote,

-			// terminate the string, and exit.

-			//

-			ignore(1024, '\"');

-			*pszStore = '\0';

-			return TOKENSTRINGTOOLONG; 

-		}

-

-		//

-		// Check for closing quote.

-		//

-		if (peek() == '\"')

-		{

-			//

-			// Eat the close quote and any whitespace.

-			//

-			get();

-

-			bool bCombineStrings = SkipWhiteSpace();

-

-			//

-			// Combine consecutive quoted strings if the combine strings character was

-			// encountered between the two strings.

-			//

-			if (bCombineStrings && (peek() == '\"'))

-			{

-				//

-				// Eat the open quote and keep parsing this string.

-				//

-				get();

-			}

-			else

-			{

-				//

-				// Done with this string, terminate the string and exit.

-				//

-				*pszStore = '\0';

-				return STRING;

-			}

-		}

-	}

-}

-

-

-//-----------------------------------------------------------------------------

-// Purpose: Returns the next token, allocating enough memory to store the token

-//			plus a terminating NULL.

-// Input  : pszStore - Pointer to a string that will be allocated.

-// Output : Returns the type of token that was read, or TOKENERROR.

-//-----------------------------------------------------------------------------

-trtoken_t TokenReader::NextTokenDynamic(char **ppszStore)

-{

-	char szTempBuffer[8192];

-	trtoken_t eType = NextToken(szTempBuffer, sizeof(szTempBuffer));

-

-	int len = Q_strlen(szTempBuffer) + 1;

-	*ppszStore = new char [len];

-	Assert( *ppszStore );

-	Q_strncpy(*ppszStore, szTempBuffer, len );

-

-	return(eType);

-}

-

-

-//-----------------------------------------------------------------------------

-// Purpose: Returns the next token.

-// Input  : pszStore - Pointer to a string that will receive the token.

-// Output : Returns the type of token that was read, or TOKENERROR.

-//-----------------------------------------------------------------------------

-trtoken_t TokenReader::NextToken(char *pszStore, int nSize)

-{

-	char *pStart = pszStore;

-

-	if (!is_open())

-	{

-		return TOKENEOF;

-	}

-

-	//

-	// If they stuffed a token, return that token.

-	//

-	if (m_bStuffed)

-	{

-		m_bStuffed = false;

-		Q_strncpy( pszStore, m_szStuffed, nSize );

-		return m_eStuffed;

-	}

-	

-	SkipWhiteSpace();

-

-	if (eof())

-	{

-		return TOKENEOF;

-	}

-

-	if (fail())

-	{

-		return TOKENEOF;

-	}

-

-	char ch = get();

-

-	//

-	// Look for all the valid operators.

-	//

-	switch (ch)

-	{

-		case '@':

-		case ',':

-		case '!':

-		case '+':

-		case '&':

-		case '*':

-		case '$':

-		case '.':

-		case '=':

-		case ':':

-		case '[':

-		case ']':

-		case '(':

-		case ')':

-		case '{':

-		case '}':

-		case '\\':

-		{

-			pszStore[0] = ch;

-			pszStore[1] = 0;

-			return OPERATOR;

-		}

-	}

-

-	//

-	// Look for the start of a quoted string.

-	//

-	if (ch == '\"')

-	{

-		return GetString(pszStore, nSize);

-	}

-

-	//

-	// Integers consist of numbers with an optional leading minus sign.

-	//

-	if (isdigit(ch) || (ch == '-'))

-	{

-		do

-		{

-			if ( (pszStore - pStart + 1) < nSize )

-			{

-				*pszStore = ch;

-				pszStore++;

-			}

-

-			ch = get();

-			if (ch == '-')

-			{

-				return TOKENERROR;

-			}

-		} while (isdigit(ch));

-		

-		//

-		// No identifier characters are allowed contiguous with numbers.

-		//

-		if (isalpha(ch) || (ch == '_'))

-		{

-			return TOKENERROR;

-		}

-

-		//

-		// Put back the non-numeric character for the next call.

-		//

-		putback(ch);

-		*pszStore = '\0';

-		return INTEGER;

-	}

- 

-	//

-	// Identifiers consist of a consecutive string of alphanumeric

-	// characters and underscores.

-	//

-	while ( isalpha(ch) || isdigit(ch) || (ch == '_') )

-	{

-		if ( (pszStore - pStart + 1) < nSize )

-		{

-			*pszStore = ch;

-			pszStore++;

-		}

-

-		ch = get();

-	}

-

-	//

-	// Put back the non-identifier character for the next call.

-	//

-	putback(ch);

-	*pszStore = '\0';

-	return IDENT;

-}

-

-

-//-----------------------------------------------------------------------------

-// Purpose: 

-// Input  : ttype - 

-//			*pszToken - 

-//-----------------------------------------------------------------------------

-void TokenReader::IgnoreTill(trtoken_t ttype, const char *pszToken)

-{

-	trtoken_t _ttype;

-	char szBuf[1024];

-

-	while(1)

-	{

-		_ttype = NextToken(szBuf, sizeof(szBuf));

-		if(_ttype == TOKENEOF)

-			return;

-		if(_ttype == ttype)

-		{

-			if(IsToken(pszToken, szBuf))

-			{

-				Stuff(ttype, pszToken);

-				return;

-			}

-		}

-	}

-}

-

-

-//-----------------------------------------------------------------------------

-// Purpose: 

-// Input  : ttype - 

-//			pszToken - 

-//-----------------------------------------------------------------------------

-void TokenReader::Stuff(trtoken_t eType, const char *pszToken)

-{

-	m_eStuffed = eType;

-	Q_strncpy(m_szStuffed, pszToken, sizeof( m_szStuffed ) );

-	m_bStuffed = true;

-}

-

-

-//-----------------------------------------------------------------------------

-// Purpose: 

-// Input  : ttype - 

-//			pszToken - 

-// Output : Returns true on success, false on failure.

-//-----------------------------------------------------------------------------

-bool TokenReader::Expecting(trtoken_t ttype, const char *pszToken)

-{

-	char szBuf[1024];

-	if (NextToken(szBuf, sizeof(szBuf)) != ttype || !IsToken(pszToken, szBuf))

-	{

-		return false;

-	}

-	return true;

-}

-

-

-//-----------------------------------------------------------------------------

-// Purpose: 

-// Input  : pszStore - 

-// Output : 

-//-----------------------------------------------------------------------------

-trtoken_t TokenReader::PeekTokenType(char *pszStore, int maxlen )

-{

-	if (!m_bStuffed)

-	{

-		m_eStuffed = NextToken(m_szStuffed, sizeof(m_szStuffed));

-		m_bStuffed = true;

-	}

-	

-	if (pszStore)

-	{

-		Q_strncpy(pszStore, m_szStuffed, maxlen );

-	}

-

-	return(m_eStuffed);

-}

-

-

-//-----------------------------------------------------------------------------

-// Purpose: Gets the next non-whitespace character from the file.

-// Input  : ch - Receives the character.

-// Output : Returns true if the whitespace contained the combine strings

-//			character '\', which is used to merge consecutive quoted strings.

-//-----------------------------------------------------------------------------

-bool TokenReader::SkipWhiteSpace(void)

-{

-	bool bCombineStrings = false;

-

-	while (true)

-	{

-		char ch = get();

-

-		if ((ch == ' ') || (ch == '\t') || (ch == '\r') || (ch == 0))

-		{

-			continue;

-		}

-

-		if (ch == '+')

-		{

-			bCombineStrings = true;

-			continue;

-		}

-

-		if (ch == '\n')

-		{

-			m_nLine++;

-			continue;

-		}

-

-		if (eof())

-		{

-			return(bCombineStrings);

-		}

-

-		//

-		// Check for the start of a comment.

-		//

-		if (ch == '/')

-		{

-			if (peek() == '/')

-			{

-				ignore(1024, '\n');

-				m_nLine++;

-			}

-		}

-		else

-		{

-			//

-			// It is a worthy character. Put it back.

-			//

-			putback(ch);

-			return(bCombineStrings);

-		}

-	}

-}

-

+//========= Copyright Valve Corporation, All rights reserved. ============//
+//
+// Purpose: 
+//
+// $NoKeywords: $
+//===========================================================================//
+
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
+#include "tokenreader.h"
+#include "tier0/platform.h"
+#include "tier1/strtools.h"
+#include "tier0/dbg.h"
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+//-----------------------------------------------------------------------------
+TokenReader::TokenReader(void)
+{
+	m_szFilename[0] = '\0';
+	m_nLine = 1;
+	m_nErrorCount = 0;
+	m_bStuffed = false;
+}
+
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+// Input  : *pszFilename - 
+// Output : Returns true on success, false on failure.
+//-----------------------------------------------------------------------------
+bool TokenReader::Open(const char *pszFilename)
+{
+	open(pszFilename, std::ios::in | std::ios::binary );
+	Q_strncpy(m_szFilename, pszFilename, sizeof( m_szFilename ) );
+	m_nLine = 1;
+	m_nErrorCount = 0;
+	m_bStuffed = false;
+	return(is_open() != 0);
+}
+
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+//-----------------------------------------------------------------------------
+void TokenReader::Close()
+{
+	close();
+}
+
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+// Input  : *error - 
+// Output : const char
+//-----------------------------------------------------------------------------
+const char *TokenReader::Error(char *error, ...)
+{
+	static char szErrorBuf[256];
+	Q_snprintf(szErrorBuf, sizeof( szErrorBuf ), "File %s, line %d: ", m_szFilename, m_nLine);
+	Q_strncat(szErrorBuf, error, sizeof( szErrorBuf ), COPY_ALL_CHARACTERS );
+	m_nErrorCount++;
+	return(szErrorBuf);
+}
+
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+// Input  : pszStore - 
+//			nSize - 
+// Output : Returns true on success, false on failure.
+//-----------------------------------------------------------------------------
+trtoken_t TokenReader::GetString(char *pszStore, int nSize)
+{
+	if (nSize <= 0)
+	{
+		return TOKENERROR;
+	}
+
+	char szBuf[1024];
+
+	//
+	// Until we reach the end of this string or run out of room in
+	// the destination buffer...
+	//
+	while (true)
+	{
+		//
+		// Fetch the next batch of text from the file.
+		//
+		get(szBuf, sizeof(szBuf), '\"');
+		if (eof())
+		{
+			return TOKENEOF;
+		}
+
+		if (fail())
+		{
+			// Just means nothing was read (empty string probably "")
+			clear();
+		}
+
+		//
+		// Transfer the text to the destination buffer.
+		//
+		char *pszSrc = szBuf;
+		while ((*pszSrc != '\0') && (nSize > 1))
+		{
+			if (*pszSrc == 0x0d)
+			{
+				//
+				// Newline encountered before closing quote -- unterminated string.
+				//
+				*pszStore = '\0';
+				return TOKENSTRINGTOOLONG;
+			}
+			else if (*pszSrc != '\\')
+			{
+				*pszStore = *pszSrc;
+				pszSrc++;
+			}
+			else
+			{
+				//
+				// Backslash sequence - replace with the appropriate character.
+				//
+				pszSrc++;
+
+				if (*pszSrc == 'n')
+				{
+					*pszStore = '\n';
+				}
+
+				pszSrc++;
+			}
+
+			pszStore++;
+			nSize--;
+		}
+
+		if (*pszSrc != '\0')
+		{
+			//
+			// Ran out of room in the destination buffer. Skip to the close-quote,
+			// terminate the string, and exit.
+			//
+			ignore(1024, '\"');
+			*pszStore = '\0';
+			return TOKENSTRINGTOOLONG; 
+		}
+
+		//
+		// Check for closing quote.
+		//
+		if (peek() == '\"')
+		{
+			//
+			// Eat the close quote and any whitespace.
+			//
+			get();
+
+			bool bCombineStrings = SkipWhiteSpace();
+
+			//
+			// Combine consecutive quoted strings if the combine strings character was
+			// encountered between the two strings.
+			//
+			if (bCombineStrings && (peek() == '\"'))
+			{
+				//
+				// Eat the open quote and keep parsing this string.
+				//
+				get();
+			}
+			else
+			{
+				//
+				// Done with this string, terminate the string and exit.
+				//
+				*pszStore = '\0';
+				return STRING;
+			}
+		}
+	}
+}
+
+
+//-----------------------------------------------------------------------------
+// Purpose: Returns the next token, allocating enough memory to store the token
+//			plus a terminating NULL.
+// Input  : pszStore - Pointer to a string that will be allocated.
+// Output : Returns the type of token that was read, or TOKENERROR.
+//-----------------------------------------------------------------------------
+trtoken_t TokenReader::NextTokenDynamic(char **ppszStore)
+{
+	char szTempBuffer[8192];
+	trtoken_t eType = NextToken(szTempBuffer, sizeof(szTempBuffer));
+
+	int len = Q_strlen(szTempBuffer) + 1;
+	*ppszStore = new char [len];
+	Assert( *ppszStore );
+	Q_strncpy(*ppszStore, szTempBuffer, len );
+
+	return(eType);
+}
+
+
+//-----------------------------------------------------------------------------
+// Purpose: Returns the next token.
+// Input  : pszStore - Pointer to a string that will receive the token.
+// Output : Returns the type of token that was read, or TOKENERROR.
+//-----------------------------------------------------------------------------
+trtoken_t TokenReader::NextToken(char *pszStore, int nSize)
+{
+	char *pStart = pszStore;
+
+	if (!is_open())
+	{
+		return TOKENEOF;
+	}
+
+	//
+	// If they stuffed a token, return that token.
+	//
+	if (m_bStuffed)
+	{
+		m_bStuffed = false;
+		Q_strncpy( pszStore, m_szStuffed, nSize );
+		return m_eStuffed;
+	}
+	
+	SkipWhiteSpace();
+
+	if (eof())
+	{
+		return TOKENEOF;
+	}
+
+	if (fail())
+	{
+		return TOKENEOF;
+	}
+
+	char ch = get();
+
+	//
+	// Look for all the valid operators.
+	//
+	switch (ch)
+	{
+		case '@':
+		case ',':
+		case '!':
+		case '+':
+		case '&':
+		case '*':
+		case '$':
+		case '.':
+		case '=':
+		case ':':
+		case '[':
+		case ']':
+		case '(':
+		case ')':
+		case '{':
+		case '}':
+		case '\\':
+		{
+			pszStore[0] = ch;
+			pszStore[1] = 0;
+			return OPERATOR;
+		}
+	}
+
+	//
+	// Look for the start of a quoted string.
+	//
+	if (ch == '\"')
+	{
+		return GetString(pszStore, nSize);
+	}
+
+	//
+	// Integers consist of numbers with an optional leading minus sign.
+	//
+	if (isdigit(ch) || (ch == '-'))
+	{
+		do
+		{
+			if ( (pszStore - pStart + 1) < nSize )
+			{
+				*pszStore = ch;
+				pszStore++;
+			}
+
+			ch = get();
+			if (ch == '-')
+			{
+				return TOKENERROR;
+			}
+		} while (isdigit(ch));
+		
+		//
+		// No identifier characters are allowed contiguous with numbers.
+		//
+		if (isalpha(ch) || (ch == '_'))
+		{
+			return TOKENERROR;
+		}
+
+		//
+		// Put back the non-numeric character for the next call.
+		//
+		putback(ch);
+		*pszStore = '\0';
+		return INTEGER;
+	}
+ 
+	//
+	// Identifiers consist of a consecutive string of alphanumeric
+	// characters and underscores.
+	//
+	while ( isalpha(ch) || isdigit(ch) || (ch == '_') )
+	{
+		if ( (pszStore - pStart + 1) < nSize )
+		{
+			*pszStore = ch;
+			pszStore++;
+		}
+
+		ch = get();
+	}
+
+	//
+	// Put back the non-identifier character for the next call.
+	//
+	putback(ch);
+	*pszStore = '\0';
+	return IDENT;
+}
+
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+// Input  : ttype - 
+//			*pszToken - 
+//-----------------------------------------------------------------------------
+void TokenReader::IgnoreTill(trtoken_t ttype, const char *pszToken)
+{
+	trtoken_t _ttype;
+	char szBuf[1024];
+
+	while(1)
+	{
+		_ttype = NextToken(szBuf, sizeof(szBuf));
+		if(_ttype == TOKENEOF)
+			return;
+		if(_ttype == ttype)
+		{
+			if(IsToken(pszToken, szBuf))
+			{
+				Stuff(ttype, pszToken);
+				return;
+			}
+		}
+	}
+}
+
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+// Input  : ttype - 
+//			pszToken - 
+//-----------------------------------------------------------------------------
+void TokenReader::Stuff(trtoken_t eType, const char *pszToken)
+{
+	m_eStuffed = eType;
+	Q_strncpy(m_szStuffed, pszToken, sizeof( m_szStuffed ) );
+	m_bStuffed = true;
+}
+
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+// Input  : ttype - 
+//			pszToken - 
+// Output : Returns true on success, false on failure.
+//-----------------------------------------------------------------------------
+bool TokenReader::Expecting(trtoken_t ttype, const char *pszToken)
+{
+	char szBuf[1024];
+	if (NextToken(szBuf, sizeof(szBuf)) != ttype || !IsToken(pszToken, szBuf))
+	{
+		return false;
+	}
+	return true;
+}
+
+
+//-----------------------------------------------------------------------------
+// Purpose: 
+// Input  : pszStore - 
+// Output : 
+//-----------------------------------------------------------------------------
+trtoken_t TokenReader::PeekTokenType(char *pszStore, int maxlen )
+{
+	if (!m_bStuffed)
+	{
+		m_eStuffed = NextToken(m_szStuffed, sizeof(m_szStuffed));
+		m_bStuffed = true;
+	}
+	
+	if (pszStore)
+	{
+		Q_strncpy(pszStore, m_szStuffed, maxlen );
+	}
+
+	return(m_eStuffed);
+}
+
+
+//-----------------------------------------------------------------------------
+// Purpose: Gets the next non-whitespace character from the file.
+// Input  : ch - Receives the character.
+// Output : Returns true if the whitespace contained the combine strings
+//			character '\', which is used to merge consecutive quoted strings.
+//-----------------------------------------------------------------------------
+bool TokenReader::SkipWhiteSpace(void)
+{
+	bool bCombineStrings = false;
+
+	while (true)
+	{
+		char ch = get();
+
+		if ((ch == ' ') || (ch == '\t') || (ch == '\r') || (ch == 0))
+		{
+			continue;
+		}
+
+		if (ch == '+')
+		{
+			bCombineStrings = true;
+			continue;
+		}
+
+		if (ch == '\n')
+		{
+			m_nLine++;
+			continue;
+		}
+
+		if (eof())
+		{
+			return(bCombineStrings);
+		}
+
+		//
+		// Check for the start of a comment.
+		//
+		if (ch == '/')
+		{
+			if (peek() == '/')
+			{
+				ignore(1024, '\n');
+				m_nLine++;
+			}
+		}
+		else
+		{
+			//
+			// It is a worthy character. Put it back.
+			//
+			putback(ch);
+			return(bCombineStrings);
+		}
+	}
+}
+