Improved list handling in hessian_ipc

src/hessian_ipc/hessian_reader.cpp

@@ -23,7 +23,7 @@ bool Reader::Parse(vector<unsigned char>::const_iterator begin, vector<unsigned
 			const bool result = ParseValue();
 			if (!result) return false; // need more input
 
-			if (m_result->IsList() || m_result->IsHandle()) {
+			if (m_state == list_1 || m_state == proxy_handle) {
 				m_stateStack.push_back(new savedstate(m_state, 0, m_result));
 				m_state = value_start;
 				continue;
@@ -58,17 +58,20 @@ bool Reader::Parse(vector<unsigned char>::const_iterator begin, vector<unsigned
 					}
 				case proxy_handle:
 					s.value->AsInteger() = m_result->GetInt();
-					m_result = s.value;
-
 					needmore = false;
 					break;
+				case list_1:
+					if (m_state == end_marker) needmore = false;
+					else s.value->AsList().Add(m_result);
+					break;
 				default:
 					throw value_exception("invalid state");
 				}
 
+				m_state = value_start;
 				if (needmore) break; // Parse more values;
 				else {
-					m_state = value_start;
+					m_result = s.value;
 					m_stateStack.pop_back();
 				}
 			}
@@ -293,7 +296,9 @@ bool Reader::ParseValue() {
 
 			// Variable-length untyped list
 			case 0x57:
-				break;
+				m_state = list_1;
+				m_result.reset(new List());
+				return true;
 
 			// Fixed-length list
 			case 'V':
@@ -313,6 +318,11 @@ bool Reader::ParseValue() {
 			case 0x7c: case 0x7d: case 0x7e: case 0x7f:
 				break;
 
+			// End marker for list
+			case 'Z':
+				m_state = end_marker;
+				return true;
+
 			// Remote Proxy Handle
 			case 'P':
 				m_result.reset(new ProxyHandle());

src/hessian_ipc/hessian_reader.h

@@ -61,6 +61,8 @@ namespace hessian_ipc {
 			string_data,
 			string_next,
 			proxy_handle,
+			list_1,
+			end_marker,
 			value_last
 		};
 

src/hessian_ipc/hessian_values.h

@@ -22,6 +22,7 @@ namespace hessian_ipc {
 	class String;
 	class Call;
 	class Writer;
+	class List;
 
 	enum fault_type {
 		ProtocolException,
@@ -131,6 +132,8 @@ namespace hessian_ipc {
 		virtual Date& AsDate() {throw value_exception("invalid value type");};
 		virtual String& AsString() {throw value_exception("invalid value type");};
 		virtual Call& AsCall() {throw value_exception("invalid value type");};
+		virtual List& AsList() {throw value_exception("invalid value type");};
+		virtual const List& AsList() const {throw value_exception("invalid value type");};
 
 		// dump
 		virtual void Print(std::string& out) const = 0;
@@ -278,13 +281,21 @@ namespace hessian_ipc {
 
 		// get the value
 		List& AsList() {return *this;};
+		const List& AsList() const {return *this;};
+
+		bool empty() const {return m_values.empty();};
+		size_t size() const {return m_values.size();};
+		const Value& get(size_t n) const {return m_values[n];};
 
 		// set value
 		void Add(auto_ptr<Value> v) {m_values.push_back(v);};
 
+		// dump
+		void Print(string&) const {};
+		void Write(Writer&) const {};
+
 	private:
 		boost::ptr_vector<Value> m_values;
-
 	};
 
 	class Call : public Value {