JSONParser init and shutdown methods removed

src/CMakeLists.txt

@@ -230,14 +230,10 @@ set (OS_SRC
 
 set (NETWORK_SRC
 	network/BitMessage.cpp
-	network/AsyncConnection.cpp
-	network/PacketQueue.h
 )
 
 set (NETWORK_HEADERS
 	network/BitMessage.h
-	network/AsyncConnection.h
-	network/PacketQueue.h
 )
 
 set (CROWN_SOURCES

src/JSONParser.cpp

@@ -19,6 +19,14 @@ JSONParser::JSONParser(Stream* stream, size_t size)
 	m_size = size;
 
 	m_stream = stream;
+
+	m_pos = m_stream->position();
+
+	m_next_token = 0;
+
+	m_prev_token = -1;
+
+	is_init = true;
 }
 
 //--------------------------------------------------------------------------
@@ -33,30 +41,20 @@ JSONParser::~JSONParser()
 		delete [] m_tokens_list;
 	}
 }
-//--------------------------------------------------------------------------
-void 
-JSONParser::init()
-{ 
-	m_pos = m_stream->position();
-	m_next_token = 0;
-	m_prev_token = -1;
-
-	is_init = true;
-}
 
 //--------------------------------------------------------------------------
-void
-JSONParser::shutdown()
-{
-	m_pos = 0;
-	m_next_token = 0;
-	m_prev_token = -1;
+// void
+// JSONParser::shutdown()
+// {
+// 	m_pos = 0;
+// 	m_next_token = 0;
+// 	m_prev_token = -1;
 
-	is_init = false;
-}
+// 	is_init = false;
+// }
 
 //--------------------------------------------------------------------------
-json_error 
+JSONError 
 JSONParser::parse()
 {
 	if (!is_init)
@@ -64,14 +62,14 @@ JSONParser::parse()
 		return JSON_NO_INIT; 
 	}
 
-	json_error error;
+	JSONError error;
 	JSONToken* token;
 
 	char c;
 
 	while(!m_stream->end_of_stream())
 	{
-		json_type type;
+		JSONType type;
 
 		c = (char)m_stream->read_byte();
 		m_pos = m_stream->position();
@@ -191,7 +189,7 @@ JSONParser::parse()
 }
 
 //--------------------------------------------------------------------------
-json_error
+JSONError
 JSONParser::parse_string()
 {
 	JSONToken* token;
@@ -253,7 +251,7 @@ JSONParser::parse_string()
 }
 
 //--------------------------------------------------------------------------
-json_error
+JSONError
 JSONParser::parse_primitive()
 {
 	JSONToken* token;
@@ -321,7 +319,7 @@ JSONParser::allocate_token()
 }
 
 //--------------------------------------------------------------------------
-void JSONParser::fill_token(JSONToken* token, json_type type, int32_t start, int32_t end)
+void JSONParser::fill_token(JSONToken* token, JSONType type, int32_t start, int32_t end)
 {
 	token->m_type = type;
 	token->m_start = start;

src/JSONParser.h

@@ -8,7 +8,7 @@ namespace crown
 {
 
 /// JSON Token types
-enum json_type
+enum JSONType
 {
 	JSON_PRIMITIVE 	= 0,	// Number, boolean or null
 	JSON_OBJECT 	= 1,	// Object
@@ -17,7 +17,7 @@ enum json_type
 };
 
 /// JSON error typology
-enum json_error
+enum JSONError
 {
 	JSON_NO_MEMORY	= 0,	// Not enough token provided
 	JSON_INV_CHAR	= 1,	// Invalid character inside JSON string
@@ -30,7 +30,7 @@ enum json_error
 /// (primitive, object, array or string) of a json file.
 struct JSONToken
 {
-	json_type	m_type;
+	JSONType	m_type;
 	int32_t 	m_start;
 	int32_t 	m_end;
 	size_t 		m_size;
@@ -58,12 +58,12 @@ public:
 					JSONParser(Stream* stream, size_t size = 1024);
 	/// Destructor
 					~JSONParser();
-	/// Init JSON parser, must be called for each different JSON string
-	void 			init();
-	/// Shutdown JSON parser
-	void			shutdown();
+	// /// Init JSON parser, must be called for each different JSON string
+	// void 			init();
+	// /// Shutdown JSON parser
+	// void			shutdown();
 	/// Parse JSON data
-	json_error 		parse();
+	JSONError 		parse();
 	/// Get all tokens
 	JSONToken*		get_tokens();
 	/// Get next token
@@ -71,13 +71,13 @@ public:
 
 private:
 	/// Parse string in JSON data
-	json_error		parse_string();
+	JSONError		parse_string();
 	/// Parse number or boolean in JSON data
-	json_error		parse_primitive();
+	JSONError		parse_primitive();
 	/// Allocate token node
 	JSONToken* 		allocate_token();
 	/// Fill token and set boundaries
-	void			fill_token(JSONToken* token, json_type type, int32_t start, int32_t end);
+	void			fill_token(JSONToken* token, JSONType type, int32_t start, int32_t end);
 
 	/// JSON stream of data
 	Stream*			m_stream;