Moved CharStream class out of Parser.{h,cpp} and into its own file

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1874 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/private/storage/sniffer/CharStream.h

@@ -0,0 +1,56 @@
+//----------------------------------------------------------------------
+//  This software is part of the OpenBeOS distribution and is covered 
+//  by the OpenBeOS license.
+//---------------------------------------------------------------------
+/*!
+	\file sniffer/CharStream.h
+	Character stream class
+*/
+#ifndef _SNIFFER_CHAR_STREAM_H
+#define _SNIFFER_CHAR_STREAM_H
+
+#include <SupportDefs.h>
+
+#include <string>
+
+namespace BPrivate {
+namespace Storage {
+namespace Sniffer {
+
+//! Manages a stream of characters
+/*! CharStream is used by the scanner portion of the parser, which is implemented
+	in TokenStream::SetTo().
+	
+	It's also used by BPrivate::TRoster while parsing through the the
+	roster's RosterSettings file.
+*/
+class CharStream {
+public:
+	CharStream(const std::string &string);
+	CharStream();
+	virtual ~CharStream();
+	
+	status_t SetTo(const std::string &string);
+	void Unset();
+	status_t InitCheck() const;
+	bool IsEmpty() const;
+	size_t Pos() const;
+	const std::string& String() const;
+	
+	char Get();
+	void Unget();
+
+private:
+	std::string fString;
+	size_t fPos;
+	status_t fCStatus;
+	
+	CharStream(const CharStream &ref);
+	CharStream& operator=(const CharStream &ref);
+};
+
+};	// namespace Sniffer
+};	// namespace Storage
+};	// namespace BPrivate
+
+#endif // _SNIFFER_CHAR_STREAM_H

headers/private/storage/sniffer/Parser.h

@@ -10,6 +10,7 @@
 #define _SNIFFER_PARSER_H
 
 #include <SupportDefs.h>
+#include <sniffer/CharStream.h>
 #include <sniffer/Err.h>
 #include <sniffer/Range.h>
 #include <sniffer/Rule.h>
@@ -39,35 +40,6 @@ status_t parse(const char *rule, Rule *result, BString *parseError = NULL);
 // Classes used internally by the parser
 //------------------------------------------------------------------------------
 
-//! Manages a stream of characters
-/*! CharStream is used by the scanner portion of the parser, which is implemented
-	in TokenStream::SetTo().
-*/
-class CharStream {
-public:
-	CharStream(const std::string &string);
-	CharStream();
-	~CharStream();
-	
-	status_t SetTo(const std::string &string);
-	void Unset();
-	status_t InitCheck() const;
-	bool IsEmpty() const;
-	size_t Pos() const;
-	const std::string& String() const;
-	
-	char Get();
-	void Unget();
-
-private:
-	std::string fString;
-	size_t fPos;
-	status_t fCStatus;
-	
-	CharStream(const CharStream &ref);
-	CharStream& operator=(const CharStream &ref);
-};
-
 //! Types of tokens
 typedef enum TokenType {
 	EmptyToken,