Commit: c86beced2c79b62e36b9c1629a7699c9df4be7c8 - BSON (git)

Aさん

Commit MetaInfo

• Revision: c86beced2c79b62e36b9c1629a7699c9df4be7c8 (tree)
• Time: 2011-01-18 02:04:57
• Author: beru <berupon@gmai...>
• Commiter: beru

Log Message

plan changed, idea to new implementation

Change Summary

• modified: bson/bson.h

Incremental Difference

--- a/bson/bson.h
+++ b/bson/bson.h
@@ -1,8 +1,104 @@
 #pragma once
 
-// http://bsonspec.org/#/specification
+// BSON like format, BSAN version 1 beta
 
-namespace BSON {
+/*
+
+// optional mark ?
+
+type bool_t : uint8_t {
+	false = 0,
+	true = 1,
+}
+
+// byte sequence
+type binary<N>_t {
+	uint<N>_t			count
+	uint8_t[count]		data
+}
+
+type var_t {
+	eValueType			type
+	value_t				value
+}
+
+// variable array
+type var_array_t {
+	uint32_t			count
+	var_t[count]		values
+}
+
+type var_keyval_t {
+	binary8_t			key
+	var_t				value
+}
+
+// variable map
+type var_map_t {
+	uint32_t			count
+	var_keyval_t[count] pairs
+}
+
+// same type values array
+type typed_array_t {
+	uint32_t			count
+	value_t[count]		values
+}
+
+type typed_keyval_t {
+	binary8_t			key
+	value_t				value
+}
+
+// same type values map
+type typed_map_t {
+	uint32_t				count
+	typed_keyval_t[count] 	pairs
+}
+
+enum eValueType : uint8_t {
+	null_t = 0,
+	
+	int8_t = 1,
+	int16_t = 2,
+	int32_t = 3,
+	int64_t = 4,
+	
+	uint8_t = 5,
+	uint16_t = 6,
+	uint32_t = 7,
+	uint64_t = 8,
+	
+	float16_t = 9,
+	float32_t = 10,
+	float64_t = 11,
+	
+	bool_t = 12,
+	
+	binary8_t = 13,
+	binary16_t = 14,
+	binary32_t = 15,
+	
+	var_array_t = 16,
+	var_map_t = 17,
+	
+	typed_array_t = 50 + value_t,
+	typed_map_t = 100 + value_t,
+	
+}
+
+type document_t {
+	int8_t[4]	signature	= "BSAN"
+	uint32_t	version		= 1
+	var_map_t	map
+}
+
+
+*/
+
+
+
+namespace CSON {
 
 enum ElementType {
 	ElementType_Double = 0x01,
@@ -48,7 +144,7 @@ struct IReader {
 	const char* ReadElementDataPtr() const;
 	
 	void ReadElement_Double(double& val) const;
-	void ReadElement_String(char* str, uint32_t& strLen) const;
+	void ReadElement_String(uint32_t& strLen, char*& str, ) const;
 	void ReadElement_Binary(uint32_t& nBytes, BinarySubType& subType, char* data) const;
 	void ReadElement_Boolean(bool& val);
 	void ReadElement_Regex(char* pattern, char* option);