Added support for emitting and represeting null

include/conversion.h

@@ -4,6 +4,7 @@
 #define CONVERSION_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
 
+#include "null.h"
 #include <string>
 #include <sstream>
 
@@ -37,6 +38,9 @@ namespace YAML
 	template <>
 	bool Converter<bool>::Convert(const std::string& input, bool& output);
 	
+	template <>
+	bool Converter<_Null>::Convert(const std::string& input, _Null& output);
+	
 	template <>
 	bool Converter<std::wstring>::Convert(const std::string& input, std::wstring& output);
 }

include/emitter.h

@@ -6,6 +6,7 @@
 
 #include "emittermanip.h"
 #include "ostream.h"
+#include "null.h"
 #include <memory>
 #include <string>
 
@@ -51,6 +52,7 @@ namespace YAML
 		Emitter& Write(const _Alias& alias);
 		Emitter& Write(const _Anchor& anchor);
 		Emitter& Write(const _Comment& comment);
+		Emitter& Write(const _Null& null);
 		
 	private:
 		enum ATOMIC_TYPE { AT_SCALAR, AT_SEQ, AT_BLOCK_SEQ, AT_FLOW_SEQ, AT_MAP, AT_BLOCK_MAP, AT_FLOW_MAP };

include/null.h

+#pragma once
+
+#ifndef NULL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define NULL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+
+namespace YAML
+{
+	struct _Null {};
+	extern _Null Null;
+}
+
+#endif // NULL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
\ No newline at end of file

src/conversion.cpp

@@ -83,6 +83,12 @@ namespace YAML
 		return false;
 	}
 	
+	template <>
+	bool Converter<_Null>::Convert(const std::string& input, _Null& /*output*/)
+	{
+		return input.empty() || input == "~" || input == "null" || input == "Null" || input == "NULL";
+	}
+
 	template <>
 	bool Converter<std::wstring>::Convert(const std::string& input, std::wstring& output)
 	{

src/emitter.cpp

@@ -666,4 +666,16 @@ namespace YAML
 		Utils::WriteComment(m_stream, comment.content, m_pState->GetPostCommentIndent());
 		return *this;
 	}
+
+	Emitter& Emitter::Write(const _Null& /*null*/)
+	{
+		if(!good())
+			return *this;
+		
+		PreAtomicWrite();
+		EmitSeparationIfNecessary();
+		m_stream << "~";
+		PostAtomicWrite();
+		return *this;
+	}
 }

src/node.cpp

@@ -10,6 +10,7 @@
 #include "aliascontent.h"
 #include "iterpriv.h"
 #include "emitter.h"
+#include <stdexcept>
 
 namespace YAML
 {
@@ -85,6 +86,9 @@ namespace YAML
 				m_pContent = new Map;
 				break;
 			default:
+//				std::stringstream str;
+//				str << TokenNames[pScanner->peek().type];
+//				throw std::runtime_error(str.str());
 				break;
 		}
 

src/null.cpp

+#include "null.h"
+
+namespace YAML
+{
+	_Null Null;
+}

yaml-reader/emittertests.cpp

-#include "tests.h"
-#include "yaml.h"
-
-namespace Test
-{
-	namespace Emitter {
-		////////////////////////////////////////////////////////////////////////////////////////////////////////
-		// correct emitting
-
-		void SimpleScalar(YAML::Emitter& out, std::string& desiredOutput) {
-			out << "Hello, World!";
-			desiredOutput = "Hello, World!";
-		}
-		
-		void SimpleSeq(YAML::Emitter& out, std::string& desiredOutput) {
-			out << YAML::BeginSeq;
-			out << "eggs";
-			out << "bread";
-			out << "milk";
-			out << YAML::EndSeq;
-
-			desiredOutput = "- eggs\n- bread\n- milk";
-		}
-		
-		void SimpleFlowSeq(YAML::Emitter& out, std::string& desiredOutput) {
-			out << YAML::Flow;
-			out << YAML::BeginSeq;
-			out << "Larry";
-			out << "Curly";
-			out << "Moe";
-			out << YAML::EndSeq;
-			
-			desiredOutput = "[Larry, Curly, Moe]";
-		}
-		
-		void EmptyFlowSeq(YAML::Emitter& out, std::string& desiredOutput) {
-			out << YAML::Flow;
-			out << YAML::BeginSeq;
-			out << YAML::EndSeq;
-			
-			desiredOutput = "[]";
-		}
-		
-		void NestedBlockSeq(YAML::Emitter& out, std::string& desiredOutput) {
-			out << YAML::BeginSeq;
-			out << "item 1";
-			out << YAML::BeginSeq << "subitem 1" << "subitem 2" << YAML::EndSeq;
-			out << YAML::EndSeq;
-			
-			desiredOutput = "- item 1\n-\n  - subitem 1\n  - subitem 2";
-		}
-		
-		void NestedFlowSeq(YAML::Emitter& out, std::string& desiredOutput) {
-			out << YAML::BeginSeq;
-			out << "one";
-			out << YAML::Flow << YAML::BeginSeq << "two" << "three" << YAML::EndSeq;
-			out << YAML::EndSeq;
-			
-			desiredOutput = "- one\n- [two, three]";
-		}
-
-		void SimpleMap(YAML::Emitter& out, std::string& desiredOutput) {
-			out << YAML::BeginMap;
-			out << YAML::Key << "name";
-			out << YAML::Value << "Ryan Braun";
-			out << YAML::Key << "position";
-			out << YAML::Value << "3B";
-			out << YAML::EndMap;
-
-			desiredOutput = "name: Ryan Braun\nposition: 3B";
-		}
-		
-		void SimpleFlowMap(YAML::Emitter& out, std::string& desiredOutput) {
-			out << YAML::Flow;
-			out << YAML::BeginMap;
-			out << YAML::Key << "shape";
-			out << YAML::Value << "square";
-			out << YAML::Key << "color";
-			out << YAML::Value << "blue";
-			out << YAML::EndMap;
-			
-			desiredOutput = "{shape: square, color: blue}";
-		}
-		
-		void MapAndList(YAML::Emitter& out, std::string& desiredOutput) {
-			out << YAML::BeginMap;
-			out << YAML::Key << "name";
-			out << YAML::Value << "Barack Obama";
-			out << YAML::Key << "children";
-			out << YAML::Value << YAML::BeginSeq << "Sasha" << "Malia" << YAML::EndSeq;
-			out << YAML::EndMap;
-
-			desiredOutput = "name: Barack Obama\nchildren:\n  - Sasha\n  - Malia";
-		}
-		
-		void ListAndMap(YAML::Emitter& out, std::string& desiredOutput) {
-			out << YAML::BeginSeq;
-			out << "item 1";
-			out << YAML::BeginMap;
-			out << YAML::Key << "pens" << YAML::Value << 8;
-			out << YAML::Key << "pencils" << YAML::Value << 14;
-			out << YAML::EndMap;
-			out << "item 2";
-			out << YAML::EndSeq;
-			
-			desiredOutput = "- item 1\n-\n  pens: 8\n  pencils: 14\n- item 2";
-		}
-
-		void NestedBlockMap(YAML::Emitter& out, std::string& desiredOutput) {
-			out << YAML::BeginMap;
-			out << YAML::Key << "name";
-			out << YAML::Value << "Fred";
-			out << YAML::Key << "grades";
-			out << YAML::Value;
-			out << YAML::BeginMap;
-			out << YAML::Key << "algebra" << YAML::Value << "A";
-			out << YAML::Key << "physics" << YAML::Value << "C+";
-			out << YAML::Key << "literature" << YAML::Value << "B";
-			out << YAML::EndMap;
-			out << YAML::EndMap;
-			
-			desiredOutput = "name: Fred\ngrades:\n  algebra: A\n  physics: C+\n  literature: B";
-		}
-
-		void NestedFlowMap(YAML::Emitter& out, std::string& desiredOutput) {
-			out << YAML::Flow;
-			out << YAML::BeginMap;
-			out << YAML::Key << "name";
-			out << YAML::Value << "Fred";
-			out << YAML::Key << "grades";
-			out << YAML::Value;
-			out << YAML::BeginMap;
-			out << YAML::Key << "algebra" << YAML::Value << "A";
-			out << YAML::Key << "physics" << YAML::Value << "C+";
-			out << YAML::Key << "literature" << YAML::Value << "B";
-			out << YAML::EndMap;
-			out << YAML::EndMap;
-			
-			desiredOutput = "{name: Fred, grades: {algebra: A, physics: C+, literature: B}}";
-		}
-		
-		void MapListMix(YAML::Emitter& out, std::string& desiredOutput) {
-			out << YAML::BeginMap;
-			out << YAML::Key << "name";
-			out << YAML::Value << "Bob";
-			out << YAML::Key << "position";
-			out << YAML::Value;
-			out << YAML::Flow << YAML::BeginSeq << 2 << 4 << YAML::EndSeq;
-			out << YAML::Key << "invincible" << YAML::Value << YAML::OnOffBool << false;
-			out << YAML::EndMap;
-			
-			desiredOutput = "name: Bob\nposition: [2, 4]\ninvincible: off";
-		}
-
-		void SimpleLongKey(YAML::Emitter& out, std::string& desiredOutput)
-		{
-			out << YAML::LongKey;
-			out << YAML::BeginMap;
-			out << YAML::Key << "height";
-			out << YAML::Value << "5'9\"";
-			out << YAML::Key << "weight";
-			out << YAML::Value << 145;
-			out << YAML::EndMap;
-			
-			desiredOutput = "? height\n: 5'9\"\n? weight\n: 145";
-		}
-		
-		void SingleLongKey(YAML::Emitter& out, std::string& desiredOutput)
-		{
-			out << YAML::BeginMap;
-			out << YAML::Key << "age";
-			out << YAML::Value << "24";
-			out << YAML::LongKey << YAML::Key << "height";
-			out << YAML::Value << "5'9\"";
-			out << YAML::Key << "weight";
-			out << YAML::Value << 145;
-			out << YAML::EndMap;
-			
-			desiredOutput = "age: 24\n? height\n: 5'9\"\nweight: 145";
-		}
-		
-		void ComplexLongKey(YAML::Emitter& out, std::string& desiredOutput)
-		{
-			out << YAML::LongKey;
-			out << YAML::BeginMap;
-			out << YAML::Key << YAML::BeginSeq << 1 << 3 << YAML::EndSeq;
-			out << YAML::Value << "monster";
-			out << YAML::Key << YAML::Flow << YAML::BeginSeq << 2 << 0 << YAML::EndSeq;
-			out << YAML::Value << "demon";
-			out << YAML::EndMap;
-			
-			desiredOutput = "?\n  - 1\n  - 3\n: monster\n? [2, 0]\n: demon";
-		}
-
-		void AutoLongKey(YAML::Emitter& out, std::string& desiredOutput)
-		{
-			out << YAML::BeginMap;
-			out << YAML::Key << YAML::BeginSeq << 1 << 3 << YAML::EndSeq;
-			out << YAML::Value << "monster";
-			out << YAML::Key << YAML::Flow << YAML::BeginSeq << 2 << 0 << YAML::EndSeq;
-			out << YAML::Value << "demon";
-			out << YAML::Key << "the origin";
-			out << YAML::Value << "angel";
-			out << YAML::EndMap;
-			
-			desiredOutput = "?\n  - 1\n  - 3\n: monster\n? [2, 0]\n: demon\nthe origin: angel";
-		}
-		
-		void ScalarFormat(YAML::Emitter& out, std::string& desiredOutput)
-		{
-			out << YAML::BeginSeq;
-			out << "simple scalar";
-			out << YAML::SingleQuoted << "explicit single-quoted scalar";
-			out << YAML::DoubleQuoted << "explicit double-quoted scalar";
-			out << "auto-detected\ndouble-quoted scalar";
-			out << "a non-\"auto-detected\" double-quoted scalar";
-			out << YAML::Literal << "literal scalar\nthat may span\nmany, many\nlines and have \"whatever\" crazy\tsymbols that we like";
-			out << YAML::EndSeq;
-			
-			desiredOutput = "- simple scalar\n- 'explicit single-quoted scalar'\n- \"explicit double-quoted scalar\"\n- \"auto-detected\\x0adouble-quoted scalar\"\n- a non-\"auto-detected\" double-quoted scalar\n- |\n  literal scalar\n  that may span\n  many, many\n  lines and have \"whatever\" crazy\tsymbols that we like";
-		}
-
-		void AutoLongKeyScalar(YAML::Emitter& out, std::string& desiredOutput)
-		{
-			out << YAML::BeginMap;
-			out << YAML::Key << YAML::Literal << "multi-line\nscalar";
-			out << YAML::Value << "and its value";
-			out << YAML::EndMap;
-			
-			desiredOutput = "? |\n  multi-line\n  scalar\n: and its value";
-		}
-		
-		void LongKeyFlowMap(YAML::Emitter& out, std::string& desiredOutput)
-		{
-			out << YAML::Flow;
-			out << YAML::BeginMap;
-			out << YAML::Key << "simple key";
-			out << YAML::Value << "and value";
-			out << YAML::LongKey << YAML::Key << "long key";
-			out << YAML::Value << "and its value";
-			out << YAML::EndMap;
-			
-			desiredOutput = "{simple key: and value, ? long key: and its value}";
-		}
-
-		void BlockMapAsKey(YAML::Emitter& out, std::string& desiredOutput)
-		{
-			out << YAML::BeginMap;
-			out << YAML::Key;
-			out << YAML::BeginMap;
-			out << YAML::Key << "key" << YAML::Value << "value";
-			out << YAML::Key << "next key" << YAML::Value << "next value";
-			out << YAML::EndMap;
-			out << YAML::Value;
-			out << "total value";
-			out << YAML::EndMap;
-			
-			desiredOutput = "?\n  key: value\n  next key: next value\n: total value";
-		}
-		
-		void AliasAndAnchor(YAML::Emitter& out, std::string& desiredOutput)
-		{
-			out << YAML::BeginSeq;
-			out << YAML::Anchor("fred");
-			out << YAML::BeginMap;
-			out << YAML::Key << "name" << YAML::Value << "Fred";
-			out << YAML::Key << "age" << YAML::Value << 42;
-			out << YAML::EndMap;
-			out << YAML::Alias("fred");
-			out << YAML::EndSeq;
-			
-			desiredOutput = "- &fred\n  name: Fred\n  age: 42\n- *fred";
-		}
-
-		void ComplexDoc(YAML::Emitter& out, std::string& desiredOutput)
-		{
-			out << YAML::BeginMap;
-			out << YAML::Key << "receipt";
-			out << YAML::Value << "Oz-Ware Purchase Invoice";
-			out << YAML::Key << "date";
-			out << YAML::Value << "2007-08-06";
-			out << YAML::Key << "customer";
-			out << YAML::Value;
-			out << YAML::BeginMap;
-			out << YAML::Key << "given";
-			out << YAML::Value << "Dorothy";
-			out << YAML::Key << "family";
-			out << YAML::Value << "Gale";
-			out << YAML::EndMap;
-			out << YAML::Key << "items";
-			out << YAML::Value;
-			out << YAML::BeginSeq;
-			out << YAML::BeginMap;
-			out << YAML::Key << "part_no";
-			out << YAML::Value << "A4786";
-			out << YAML::Key << "descrip";
-			out << YAML::Value << "Water Bucket (Filled)";
-			out << YAML::Key << "price";
-			out << YAML::Value << 1.47;
-			out << YAML::Key << "quantity";
-			out << YAML::Value << 4;
-			out << YAML::EndMap;
-			out << YAML::BeginMap;
-			out << YAML::Key << "part_no";
-			out << YAML::Value << "E1628";
-			out << YAML::Key << "descrip";
-			out << YAML::Value << "High Heeled \"Ruby\" Slippers";
-			out << YAML::Key << "price";
-			out << YAML::Value << 100.27;
-			out << YAML::Key << "quantity";
-			out << YAML::Value << 1;
-			out << YAML::EndMap;
-			out << YAML::EndSeq;
-			out << YAML::Key << "bill-to";
-			out << YAML::Value << YAML::Anchor("id001");
-			out << YAML::BeginMap;
-			out << YAML::Key << "street";
-			out << YAML::Value << YAML::Literal << "123 Tornado Alley\nSuite 16";
-			out << YAML::Key << "city";
-			out << YAML::Value << "East Westville";
-			out << YAML::Key << "state";
-			out << YAML::Value << "KS";
-			out << YAML::EndMap;
-			out << YAML::Key << "ship-to";
-			out << YAML::Value << YAML::Alias("id001");
-			out << YAML::EndMap;
-			
-			desiredOutput = "receipt: Oz-Ware Purchase Invoice\ndate: 2007-08-06\ncustomer:\n  given: Dorothy\n  family: Gale\nitems:\n  -\n    part_no: A4786\n    descrip: Water Bucket (Filled)\n    price: 1.47\n    quantity: 4\n  -\n    part_no: E1628\n    descrip: High Heeled \"Ruby\" Slippers\n    price: 100.27\n    quantity: 1\nbill-to: &id001\n  street: |\n    123 Tornado Alley\n    Suite 16\n  city: East Westville\n  state: KS\nship-to: *id001";
-		}
-
-		void STLContainers(YAML::Emitter& out, std::string& desiredOutput)
-		{
-			out << YAML::BeginSeq;
-			std::vector <int> primes;
-			primes.push_back(2);
-			primes.push_back(3);
-			primes.push_back(5);
-			primes.push_back(7);
-			primes.push_back(11);
-			primes.push_back(13);
-			out << YAML::Flow << primes;
-			std::map <std::string, int> ages;
-			ages["Daniel"] = 26;
-			ages["Jesse"] = 24;
-			out << ages;
-			out << YAML::EndSeq;
-			
-			desiredOutput = "- [2, 3, 5, 7, 11, 13]\n-\n  Daniel: 26\n  Jesse: 24";
-		}
-
-		void SimpleComment(YAML::Emitter& out, std::string& desiredOutput)
-		{
-			out << YAML::BeginMap;
-			out << YAML::Key << "method";
-			out << YAML::Value << "least squares" << YAML::Comment("should we change this method?");
-			out << YAML::EndMap;
-			
-			desiredOutput = "method: least squares  # should we change this method?";
-		}
-
-		void MultiLineComment(YAML::Emitter& out, std::string& desiredOutput)
-		{
-			out << YAML::BeginSeq;
-			out << "item 1" << YAML::Comment("really really long\ncomment that couldn't possibly\nfit on one line");
-			out << "item 2";
-			out << YAML::EndSeq;
-			
-			desiredOutput = "- item 1  # really really long\n          # comment that couldn't possibly\n          # fit on one line\n- item 2";
-		}
-
-		void ComplexComments(YAML::Emitter& out, std::string& desiredOutput)
-		{
-			out << YAML::BeginMap;
-			out << YAML::LongKey << YAML::Key << "long key" << YAML::Comment("long key");
-			out << YAML::Value << "value";
-			out << YAML::EndMap;
-			
-			desiredOutput = "? long key  # long key\n: value";
-		}
-
-		void Indentation(YAML::Emitter& out, std::string& desiredOutput)
-		{
-			out << YAML::Indent(4);
-			out << YAML::BeginSeq;
-			out << YAML::BeginMap;
-			out << YAML::Key << "key 1" << YAML::Value << "value 1";
-			out << YAML::Key << "key 2" << YAML::Value << YAML::BeginSeq << "a" << "b" << "c" << YAML::EndSeq;
-			out << YAML::EndMap;
-			out << YAML::EndSeq;
-			
-			desiredOutput = "-\n    key 1: value 1\n    key 2:\n        - a\n        - b\n        - c";
-		}
-
-		void SimpleGlobalSettings(YAML::Emitter& out, std::string& desiredOutput)
-		{
-			out.SetIndent(4);
-			out.SetMapFormat(YAML::LongKey);
-
-			out << YAML::BeginSeq;
-			out << YAML::BeginMap;
-			out << YAML::Key << "key 1" << YAML::Value << "value 1";
-			out << YAML::Key << "key 2" << YAML::Value << YAML::Flow << YAML::BeginSeq << "a" << "b" << "c" << YAML::EndSeq;
-			out << YAML::EndMap;
-			out << YAML::EndSeq;
-			
-			desiredOutput = "-\n    ? key 1\n    : value 1\n    ? key 2\n    : [a, b, c]";
-		}
-		
-		void ComplexGlobalSettings(YAML::Emitter& out, std::string& desiredOutput)
-		{
-			out << YAML::BeginSeq;
-			out << YAML::Block;
-			out << YAML::BeginMap;
-			out << YAML::Key << "key 1" << YAML::Value << "value 1";
-			out << YAML::Key << "key 2" << YAML::Value;
-			out.SetSeqFormat(YAML::Flow);
-			out << YAML::BeginSeq << "a" << "b" << "c" << YAML::EndSeq;
-			out << YAML::EndMap;
-			out << YAML::BeginMap;
-			out << YAML::Key << YAML::BeginSeq << 1 << 2 << YAML::EndSeq;
-			out << YAML::Value << YAML::BeginMap << YAML::Key << "a" << YAML::Value << "b" << YAML::EndMap;
-			out << YAML::EndMap;
-			out << YAML::EndSeq;
-			
-			desiredOutput = "-\n  key 1: value 1\n  key 2: [a, b, c]\n-\n  ? [1, 2]\n  :\n    a: b";
-		}
-
-		////////////////////////////////////////////////////////////////////////////////////////////////////////
-		// incorrect emitting
-		
-		void ExtraEndSeq(YAML::Emitter& out, std::string& desiredError)
-		{
-			desiredError = YAML::ErrorMsg::UNEXPECTED_END_SEQ;
-
-			out << YAML::BeginSeq;
-			out << "Hello";
-			out << "World";
-			out << YAML::EndSeq;
-			out << YAML::EndSeq;
-		}
-
-		void ExtraEndMap(YAML::Emitter& out, std::string& desiredError)
-		{
-			desiredError = YAML::ErrorMsg::UNEXPECTED_END_MAP;
-			
-			out << YAML::BeginMap;
-			out << YAML::Key << "Hello" << YAML::Value << "World";
-			out << YAML::EndMap;
-			out << YAML::EndMap;
-		}
-
-		void BadSingleQuoted(YAML::Emitter& out, std::string& desiredError)
-		{
-			desiredError = YAML::ErrorMsg::SINGLE_QUOTED_CHAR;
-			
-			out << YAML::SingleQuoted << "Hello\nWorld";
-		}
-
-		void InvalidAnchor(YAML::Emitter& out, std::string& desiredError)
-		{
-			desiredError = YAML::ErrorMsg::INVALID_ANCHOR;
-			
-			out << YAML::BeginSeq;
-			out << YAML::Anchor("new\nline") << "Test";
-			out << YAML::EndSeq;
-		}
-		
-		void InvalidAlias(YAML::Emitter& out, std::string& desiredError)
-		{
-			desiredError = YAML::ErrorMsg::INVALID_ALIAS;
-			
-			out << YAML::BeginSeq;
-			out << YAML::Alias("new\nline");
-			out << YAML::EndSeq;
-		}
-
-		void MissingKey(YAML::Emitter& out, std::string& desiredError)
-		{
-			desiredError = YAML::ErrorMsg::EXPECTED_KEY_TOKEN;
-			
-			out << YAML::BeginMap;
-			out << YAML::Key << "key" << YAML::Value << "value";
-			out << "missing key" << YAML::Value << "value";
-			out << YAML::EndMap;
-		}
-		
-		void MissingValue(YAML::Emitter& out, std::string& desiredError)
-		{
-			desiredError = YAML::ErrorMsg::EXPECTED_VALUE_TOKEN;
-			
-			out << YAML::BeginMap;
-			out << YAML::Key << "key" << "value";
-			out << YAML::EndMap;
-		}
-
-		void UnexpectedKey(YAML::Emitter& out, std::string& desiredError)
-		{
-			desiredError = YAML::ErrorMsg::UNEXPECTED_KEY_TOKEN;
-			
-			out << YAML::BeginSeq;
-			out << YAML::Key << "hi";
-			out << YAML::EndSeq;
-		}
-		
-		void UnexpectedValue(YAML::Emitter& out, std::string& desiredError)
-		{
-			desiredError = YAML::ErrorMsg::UNEXPECTED_VALUE_TOKEN;
-			
-			out << YAML::BeginSeq;
-			out << YAML::Value << "hi";
-			out << YAML::EndSeq;
-		}
-	}
-}
+#include "tests.h"
+#include "yaml.h"
+
+namespace Test
+{
+	namespace Emitter {
+		////////////////////////////////////////////////////////////////////////////////////////////////////////
+		// correct emitting
+
+		void SimpleScalar(YAML::Emitter& out, std::string& desiredOutput) {
+			out << "Hello, World!";
+			desiredOutput = "Hello, World!";
+		}
+		
+		void SimpleSeq(YAML::Emitter& out, std::string& desiredOutput) {
+			out << YAML::BeginSeq;
+			out << "eggs";
+			out << "bread";
+			out << "milk";
+			out << YAML::EndSeq;
+
+			desiredOutput = "- eggs\n- bread\n- milk";
+		}
+		
+		void SimpleFlowSeq(YAML::Emitter& out, std::string& desiredOutput) {
+			out << YAML::Flow;
+			out << YAML::BeginSeq;
+			out << "Larry";
+			out << "Curly";
+			out << "Moe";
+			out << YAML::EndSeq;
+			
+			desiredOutput = "[Larry, Curly, Moe]";
+		}
+		
+		void EmptyFlowSeq(YAML::Emitter& out, std::string& desiredOutput) {
+			out << YAML::Flow;
+			out << YAML::BeginSeq;
+			out << YAML::EndSeq;
+			
+			desiredOutput = "[]";
+		}
+		
+		void NestedBlockSeq(YAML::Emitter& out, std::string& desiredOutput) {
+			out << YAML::BeginSeq;
+			out << "item 1";
+			out << YAML::BeginSeq << "subitem 1" << "subitem 2" << YAML::EndSeq;
+			out << YAML::EndSeq;
+			
+			desiredOutput = "- item 1\n-\n  - subitem 1\n  - subitem 2";
+		}
+		
+		void NestedFlowSeq(YAML::Emitter& out, std::string& desiredOutput) {
+			out << YAML::BeginSeq;
+			out << "one";
+			out << YAML::Flow << YAML::BeginSeq << "two" << "three" << YAML::EndSeq;
+			out << YAML::EndSeq;
+			
+			desiredOutput = "- one\n- [two, three]";
+		}
+
+		void SimpleMap(YAML::Emitter& out, std::string& desiredOutput) {
+			out << YAML::BeginMap;
+			out << YAML::Key << "name";
+			out << YAML::Value << "Ryan Braun";
+			out << YAML::Key << "position";
+			out << YAML::Value << "3B";
+			out << YAML::EndMap;
+
+			desiredOutput = "name: Ryan Braun\nposition: 3B";
+		}
+		
+		void SimpleFlowMap(YAML::Emitter& out, std::string& desiredOutput) {
+			out << YAML::Flow;
+			out << YAML::BeginMap;
+			out << YAML::Key << "shape";
+			out << YAML::Value << "square";
+			out << YAML::Key << "color";
+			out << YAML::Value << "blue";
+			out << YAML::EndMap;
+			
+			desiredOutput = "{shape: square, color: blue}";
+		}
+		
+		void MapAndList(YAML::Emitter& out, std::string& desiredOutput) {
+			out << YAML::BeginMap;
+			out << YAML::Key << "name";
+			out << YAML::Value << "Barack Obama";
+			out << YAML::Key << "children";
+			out << YAML::Value << YAML::BeginSeq << "Sasha" << "Malia" << YAML::EndSeq;
+			out << YAML::EndMap;
+
+			desiredOutput = "name: Barack Obama\nchildren:\n  - Sasha\n  - Malia";
+		}
+		
+		void ListAndMap(YAML::Emitter& out, std::string& desiredOutput) {
+			out << YAML::BeginSeq;
+			out << "item 1";
+			out << YAML::BeginMap;
+			out << YAML::Key << "pens" << YAML::Value << 8;
+			out << YAML::Key << "pencils" << YAML::Value << 14;
+			out << YAML::EndMap;
+			out << "item 2";
+			out << YAML::EndSeq;
+			
+			desiredOutput = "- item 1\n-\n  pens: 8\n  pencils: 14\n- item 2";
+		}
+
+		void NestedBlockMap(YAML::Emitter& out, std::string& desiredOutput) {
+			out << YAML::BeginMap;
+			out << YAML::Key << "name";
+			out << YAML::Value << "Fred";
+			out << YAML::Key << "grades";
+			out << YAML::Value;
+			out << YAML::BeginMap;
+			out << YAML::Key << "algebra" << YAML::Value << "A";
+			out << YAML::Key << "physics" << YAML::Value << "C+";
+			out << YAML::Key << "literature" << YAML::Value << "B";
+			out << YAML::EndMap;
+			out << YAML::EndMap;
+			
+			desiredOutput = "name: Fred\ngrades:\n  algebra: A\n  physics: C+\n  literature: B";
+		}
+
+		void NestedFlowMap(YAML::Emitter& out, std::string& desiredOutput) {
+			out << YAML::Flow;
+			out << YAML::BeginMap;
+			out << YAML::Key << "name";
+			out << YAML::Value << "Fred";
+			out << YAML::Key << "grades";
+			out << YAML::Value;
+			out << YAML::BeginMap;
+			out << YAML::Key << "algebra" << YAML::Value << "A";
+			out << YAML::Key << "physics" << YAML::Value << "C+";
+			out << YAML::Key << "literature" << YAML::Value << "B";
+			out << YAML::EndMap;
+			out << YAML::EndMap;
+			
+			desiredOutput = "{name: Fred, grades: {algebra: A, physics: C+, literature: B}}";
+		}
+		
+		void MapListMix(YAML::Emitter& out, std::string& desiredOutput) {
+			out << YAML::BeginMap;
+			out << YAML::Key << "name";
+			out << YAML::Value << "Bob";
+			out << YAML::Key << "position";
+			out << YAML::Value;
+			out << YAML::Flow << YAML::BeginSeq << 2 << 4 << YAML::EndSeq;
+			out << YAML::Key << "invincible" << YAML::Value << YAML::OnOffBool << false;
+			out << YAML::EndMap;
+			
+			desiredOutput = "name: Bob\nposition: [2, 4]\ninvincible: off";
+		}
+
+		void SimpleLongKey(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << YAML::LongKey;
+			out << YAML::BeginMap;
+			out << YAML::Key << "height";
+			out << YAML::Value << "5'9\"";
+			out << YAML::Key << "weight";
+			out << YAML::Value << 145;
+			out << YAML::EndMap;
+			
+			desiredOutput = "? height\n: 5'9\"\n? weight\n: 145";
+		}
+		
+		void SingleLongKey(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << YAML::BeginMap;
+			out << YAML::Key << "age";
+			out << YAML::Value << "24";
+			out << YAML::LongKey << YAML::Key << "height";
+			out << YAML::Value << "5'9\"";
+			out << YAML::Key << "weight";
+			out << YAML::Value << 145;
+			out << YAML::EndMap;
+			
+			desiredOutput = "age: 24\n? height\n: 5'9\"\nweight: 145";
+		}
+		
+		void ComplexLongKey(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << YAML::LongKey;
+			out << YAML::BeginMap;
+			out << YAML::Key << YAML::BeginSeq << 1 << 3 << YAML::EndSeq;
+			out << YAML::Value << "monster";
+			out << YAML::Key << YAML::Flow << YAML::BeginSeq << 2 << 0 << YAML::EndSeq;
+			out << YAML::Value << "demon";
+			out << YAML::EndMap;
+			
+			desiredOutput = "?\n  - 1\n  - 3\n: monster\n? [2, 0]\n: demon";
+		}
+
+		void AutoLongKey(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << YAML::BeginMap;
+			out << YAML::Key << YAML::BeginSeq << 1 << 3 << YAML::EndSeq;
+			out << YAML::Value << "monster";
+			out << YAML::Key << YAML::Flow << YAML::BeginSeq << 2 << 0 << YAML::EndSeq;
+			out << YAML::Value << "demon";
+			out << YAML::Key << "the origin";
+			out << YAML::Value << "angel";
+			out << YAML::EndMap;
+			
+			desiredOutput = "?\n  - 1\n  - 3\n: monster\n? [2, 0]\n: demon\nthe origin: angel";
+		}
+		
+		void ScalarFormat(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << YAML::BeginSeq;
+			out << "simple scalar";
+			out << YAML::SingleQuoted << "explicit single-quoted scalar";
+			out << YAML::DoubleQuoted << "explicit double-quoted scalar";
+			out << "auto-detected\ndouble-quoted scalar";
+			out << "a non-\"auto-detected\" double-quoted scalar";
+			out << YAML::Literal << "literal scalar\nthat may span\nmany, many\nlines and have \"whatever\" crazy\tsymbols that we like";
+			out << YAML::EndSeq;
+			
+			desiredOutput = "- simple scalar\n- 'explicit single-quoted scalar'\n- \"explicit double-quoted scalar\"\n- \"auto-detected\\x0adouble-quoted scalar\"\n- a non-\"auto-detected\" double-quoted scalar\n- |\n  literal scalar\n  that may span\n  many, many\n  lines and have \"whatever\" crazy\tsymbols that we like";
+		}
+
+		void AutoLongKeyScalar(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << YAML::BeginMap;
+			out << YAML::Key << YAML::Literal << "multi-line\nscalar";
+			out << YAML::Value << "and its value";
+			out << YAML::EndMap;
+			
+			desiredOutput = "? |\n  multi-line\n  scalar\n: and its value";
+		}
+		
+		void LongKeyFlowMap(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << YAML::Flow;
+			out << YAML::BeginMap;
+			out << YAML::Key << "simple key";
+			out << YAML::Value << "and value";
+			out << YAML::LongKey << YAML::Key << "long key";
+			out << YAML::Value << "and its value";
+			out << YAML::EndMap;
+			
+			desiredOutput = "{simple key: and value, ? long key: and its value}";
+		}
+
+		void BlockMapAsKey(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << YAML::BeginMap;
+			out << YAML::Key;
+			out << YAML::BeginMap;
+			out << YAML::Key << "key" << YAML::Value << "value";
+			out << YAML::Key << "next key" << YAML::Value << "next value";
+			out << YAML::EndMap;
+			out << YAML::Value;
+			out << "total value";
+			out << YAML::EndMap;
+			
+			desiredOutput = "?\n  key: value\n  next key: next value\n: total value";
+		}
+		
+		void AliasAndAnchor(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << YAML::BeginSeq;
+			out << YAML::Anchor("fred");
+			out << YAML::BeginMap;
+			out << YAML::Key << "name" << YAML::Value << "Fred";
+			out << YAML::Key << "age" << YAML::Value << 42;
+			out << YAML::EndMap;
+			out << YAML::Alias("fred");
+			out << YAML::EndSeq;
+			
+			desiredOutput = "- &fred\n  name: Fred\n  age: 42\n- *fred";
+		}
+
+		void ComplexDoc(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << YAML::BeginMap;
+			out << YAML::Key << "receipt";
+			out << YAML::Value << "Oz-Ware Purchase Invoice";
+			out << YAML::Key << "date";
+			out << YAML::Value << "2007-08-06";
+			out << YAML::Key << "customer";
+			out << YAML::Value;
+			out << YAML::BeginMap;
+			out << YAML::Key << "given";
+			out << YAML::Value << "Dorothy";
+			out << YAML::Key << "family";
+			out << YAML::Value << "Gale";
+			out << YAML::EndMap;
+			out << YAML::Key << "items";
+			out << YAML::Value;
+			out << YAML::BeginSeq;
+			out << YAML::BeginMap;
+			out << YAML::Key << "part_no";
+			out << YAML::Value << "A4786";
+			out << YAML::Key << "descrip";
+			out << YAML::Value << "Water Bucket (Filled)";
+			out << YAML::Key << "price";
+			out << YAML::Value << 1.47;
+			out << YAML::Key << "quantity";
+			out << YAML::Value << 4;
+			out << YAML::EndMap;
+			out << YAML::BeginMap;
+			out << YAML::Key << "part_no";
+			out << YAML::Value << "E1628";
+			out << YAML::Key << "descrip";
+			out << YAML::Value << "High Heeled \"Ruby\" Slippers";
+			out << YAML::Key << "price";
+			out << YAML::Value << 100.27;
+			out << YAML::Key << "quantity";
+			out << YAML::Value << 1;
+			out << YAML::EndMap;
+			out << YAML::EndSeq;
+			out << YAML::Key << "bill-to";
+			out << YAML::Value << YAML::Anchor("id001");
+			out << YAML::BeginMap;
+			out << YAML::Key << "street";
+			out << YAML::Value << YAML::Literal << "123 Tornado Alley\nSuite 16";
+			out << YAML::Key << "city";
+			out << YAML::Value << "East Westville";
+			out << YAML::Key << "state";
+			out << YAML::Value << "KS";
+			out << YAML::EndMap;
+			out << YAML::Key << "ship-to";
+			out << YAML::Value << YAML::Alias("id001");
+			out << YAML::EndMap;
+			
+			desiredOutput = "receipt: Oz-Ware Purchase Invoice\ndate: 2007-08-06\ncustomer:\n  given: Dorothy\n  family: Gale\nitems:\n  -\n    part_no: A4786\n    descrip: Water Bucket (Filled)\n    price: 1.47\n    quantity: 4\n  -\n    part_no: E1628\n    descrip: High Heeled \"Ruby\" Slippers\n    price: 100.27\n    quantity: 1\nbill-to: &id001\n  street: |\n    123 Tornado Alley\n    Suite 16\n  city: East Westville\n  state: KS\nship-to: *id001";
+		}
+
+		void STLContainers(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << YAML::BeginSeq;
+			std::vector <int> primes;
+			primes.push_back(2);
+			primes.push_back(3);
+			primes.push_back(5);
+			primes.push_back(7);
+			primes.push_back(11);
+			primes.push_back(13);
+			out << YAML::Flow << primes;
+			std::map <std::string, int> ages;
+			ages["Daniel"] = 26;
+			ages["Jesse"] = 24;
+			out << ages;
+			out << YAML::EndSeq;
+			
+			desiredOutput = "- [2, 3, 5, 7, 11, 13]\n-\n  Daniel: 26\n  Jesse: 24";
+		}
+
+		void SimpleComment(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << YAML::BeginMap;
+			out << YAML::Key << "method";
+			out << YAML::Value << "least squares" << YAML::Comment("should we change this method?");
+			out << YAML::EndMap;
+			
+			desiredOutput = "method: least squares  # should we change this method?";
+		}
+
+		void MultiLineComment(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << YAML::BeginSeq;
+			out << "item 1" << YAML::Comment("really really long\ncomment that couldn't possibly\nfit on one line");
+			out << "item 2";
+			out << YAML::EndSeq;
+			
+			desiredOutput = "- item 1  # really really long\n          # comment that couldn't possibly\n          # fit on one line\n- item 2";
+		}
+
+		void ComplexComments(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << YAML::BeginMap;
+			out << YAML::LongKey << YAML::Key << "long key" << YAML::Comment("long key");
+			out << YAML::Value << "value";
+			out << YAML::EndMap;
+			
+			desiredOutput = "? long key  # long key\n: value";
+		}
+
+		void Indentation(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << YAML::Indent(4);
+			out << YAML::BeginSeq;
+			out << YAML::BeginMap;
+			out << YAML::Key << "key 1" << YAML::Value << "value 1";
+			out << YAML::Key << "key 2" << YAML::Value << YAML::BeginSeq << "a" << "b" << "c" << YAML::EndSeq;
+			out << YAML::EndMap;
+			out << YAML::EndSeq;
+			
+			desiredOutput = "-\n    key 1: value 1\n    key 2:\n        - a\n        - b\n        - c";
+		}
+
+		void SimpleGlobalSettings(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out.SetIndent(4);
+			out.SetMapFormat(YAML::LongKey);
+
+			out << YAML::BeginSeq;
+			out << YAML::BeginMap;
+			out << YAML::Key << "key 1" << YAML::Value << "value 1";
+			out << YAML::Key << "key 2" << YAML::Value << YAML::Flow << YAML::BeginSeq << "a" << "b" << "c" << YAML::EndSeq;
+			out << YAML::EndMap;
+			out << YAML::EndSeq;
+			
+			desiredOutput = "-\n    ? key 1\n    : value 1\n    ? key 2\n    : [a, b, c]";
+		}
+		
+		void ComplexGlobalSettings(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << YAML::BeginSeq;
+			out << YAML::Block;
+			out << YAML::BeginMap;
+			out << YAML::Key << "key 1" << YAML::Value << "value 1";
+			out << YAML::Key << "key 2" << YAML::Value;
+			out.SetSeqFormat(YAML::Flow);
+			out << YAML::BeginSeq << "a" << "b" << "c" << YAML::EndSeq;
+			out << YAML::EndMap;
+			out << YAML::BeginMap;
+			out << YAML::Key << YAML::BeginSeq << 1 << 2 << YAML::EndSeq;
+			out << YAML::Value << YAML::BeginMap << YAML::Key << "a" << YAML::Value << "b" << YAML::EndMap;
+			out << YAML::EndMap;
+			out << YAML::EndSeq;
+			
+			desiredOutput = "-\n  key 1: value 1\n  key 2: [a, b, c]\n-\n  ? [1, 2]\n  :\n    a: b";
+		}
+
+		void Null(YAML::Emitter& out, std::string& desiredOutput)
+		{
+			out << YAML::BeginSeq;
+			out << YAML::Null;
+			out << YAML::BeginMap;
+			out << YAML::Key << "null value" << YAML::Value << YAML::Null;
+			out << YAML::Key << YAML::Null << YAML::Value << "null key";
+			out << YAML::EndMap;
+			out << YAML::EndSeq;
+			
+			desiredOutput = "- ~\n-\n  null value: ~\n  ~: null key";
+		}
+
+		////////////////////////////////////////////////////////////////////////////////////////////////////////
+		// incorrect emitting
+		
+		void ExtraEndSeq(YAML::Emitter& out, std::string& desiredError)
+		{
+			desiredError = YAML::ErrorMsg::UNEXPECTED_END_SEQ;
+
+			out << YAML::BeginSeq;
+			out << "Hello";
+			out << "World";
+			out << YAML::EndSeq;
+			out << YAML::EndSeq;
+		}
+
+		void ExtraEndMap(YAML::Emitter& out, std::string& desiredError)
+		{
+			desiredError = YAML::ErrorMsg::UNEXPECTED_END_MAP;
+			
+			out << YAML::BeginMap;
+			out << YAML::Key << "Hello" << YAML::Value << "World";
+			out << YAML::EndMap;
+			out << YAML::EndMap;
+		}
+
+		void BadSingleQuoted(YAML::Emitter& out, std::string& desiredError)
+		{
+			desiredError = YAML::ErrorMsg::SINGLE_QUOTED_CHAR;
+			
+			out << YAML::SingleQuoted << "Hello\nWorld";
+		}
+
+		void InvalidAnchor(YAML::Emitter& out, std::string& desiredError)
+		{
+			desiredError = YAML::ErrorMsg::INVALID_ANCHOR;
+			
+			out << YAML::BeginSeq;
+			out << YAML::Anchor("new\nline") << "Test";
+			out << YAML::EndSeq;
+		}
+		
+		void InvalidAlias(YAML::Emitter& out, std::string& desiredError)
+		{
+			desiredError = YAML::ErrorMsg::INVALID_ALIAS;
+			
+			out << YAML::BeginSeq;
+			out << YAML::Alias("new\nline");
+			out << YAML::EndSeq;
+		}
+
+		void MissingKey(YAML::Emitter& out, std::string& desiredError)
+		{
+			desiredError = YAML::ErrorMsg::EXPECTED_KEY_TOKEN;
+			
+			out << YAML::BeginMap;
+			out << YAML::Key << "key" << YAML::Value << "value";
+			out << "missing key" << YAML::Value << "value";
+			out << YAML::EndMap;
+		}
+		
+		void MissingValue(YAML::Emitter& out, std::string& desiredError)
+		{
+			desiredError = YAML::ErrorMsg::EXPECTED_VALUE_TOKEN;
+			
+			out << YAML::BeginMap;
+			out << YAML::Key << "key" << "value";
+			out << YAML::EndMap;
+		}
+
+		void UnexpectedKey(YAML::Emitter& out, std::string& desiredError)
+		{
+			desiredError = YAML::ErrorMsg::UNEXPECTED_KEY_TOKEN;
+			
+			out << YAML::BeginSeq;
+			out << YAML::Key << "hi";
+			out << YAML::EndSeq;
+		}
+		
+		void UnexpectedValue(YAML::Emitter& out, std::string& desiredError)
+		{
+			desiredError = YAML::ErrorMsg::UNEXPECTED_VALUE_TOKEN;
+			
+			out << YAML::BeginSeq;
+			out << YAML::Value << "hi";
+			out << YAML::EndSeq;
+		}
+	}
+}

yaml-reader/tests.cpp

@@ -351,6 +351,7 @@ namespace Test
 		RunEmitterTest(&Emitter::Indentation, "indentation", passed);
 		RunEmitterTest(&Emitter::SimpleGlobalSettings, "simple global settings", passed);
 		RunEmitterTest(&Emitter::ComplexGlobalSettings, "complex global settings", passed);
+		RunEmitterTest(&Emitter::Null, "null", passed);
 		
 		RunEmitterErrorTest(&Emitter::ExtraEndSeq, "extra EndSeq", passed);
 		RunEmitterErrorTest(&Emitter::ExtraEndMap, "extra EndMap", passed);

yaml-reader/tests.h

@@ -68,6 +68,7 @@ namespace Test {
 		void Indentation(YAML::Emitter& out, std::string& desiredOutput);
 		void SimpleGlobalSettings(YAML::Emitter& out, std::string& desiredOutput);
 		void ComplexGlobalSettings(YAML::Emitter& out, std::string& desiredOutput);
+		void Null(YAML::Emitter& out, std::string& desiredOutput);
 
 		// incorrect emitting
 		void ExtraEndSeq(YAML::Emitter& out, std::string& desiredError);