- Reintegrated the other-tags branch into my staging branch. Local edits were required to integrate with the changes from the event-api branch.

More to the point, the yaml-reader program doesn't do any file IO, so it doesn't require a specific working directory.

.hgeol

@@ -1,4 +0,0 @@
-**.h = native
-**.c = native
-**.cpp = native
-**.txt = native

.hgignore

@@ -1 +0,0 @@
-syntax: glob

CMakeLists.txt

@@ -1,285 +1,77 @@
-###
-### CMake settings
-###
-## Due to Mac OSX we need to keep compatibility with CMake 2.6
-# see http://www.cmake.org/Wiki/CMake_Policies
 cmake_minimum_required(VERSION 2.6)
-# see http://www.cmake.org/cmake/help/cmake-2-8-docs.html#policy:CMP0012
-if(POLICY CMP0012)
-	cmake_policy(SET CMP0012 OLD)
-endif()
-# see http://www.cmake.org/cmake/help/cmake-2-8-docs.html#policy:CMP0015
-if(POLICY CMP0015)
-	cmake_policy(SET CMP0015 OLD)
-endif()
 
-include(CheckCXXCompilerFlag)
+project (YAML_CPP)
 
+set(LIB_TYPE SHARED)
 
-###
-### Project settings
-###
-project(YAML_CPP)
+if(IPHONE)
+  set(CMAKE_OSX_SYSROOT iphoneos2.2.1)
+  set(LIB_TYPE)
+endif(IPHONE)
+
+if(CMAKE_COMPILER_IS_GNUCC)
+  set(CMAKE_CXX_FLAGS "-O2 -Wall -Wextra -pedantic -Wno-long-long ${CMAKE_CXX_FLAGS}")
+endif(CMAKE_COMPILER_IS_GNUCC)
+
+if(MSVC)
+  set(LIB_TYPE) # I can't figure out how CMake handles Windows shared libraries
+  set(CMAKE_CXX_FLAGS "/W3 /wd4127 /wd4355 /D_SCL_SECURE_NO_WARNINGS ${CMAKE_CXX_FLAGS}")
+endif(MSVC)
 
 set(YAML_CPP_VERSION_MAJOR "0")
-set(YAML_CPP_VERSION_MINOR "5")
-set(YAML_CPP_VERSION_PATCH "1")
+set(YAML_CPP_VERSION_MINOR "2")
+set(YAML_CPP_VERSION_PATCH "5")
 set(YAML_CPP_VERSION "${YAML_CPP_VERSION_MAJOR}.${YAML_CPP_VERSION_MINOR}.${YAML_CPP_VERSION_PATCH}")
 
 enable_testing()
 
-
-###
-### Project options
-###
-## Project stuff
-option(YAML_CPP_BUILD_TOOLS "Enable testing and parse tools" ON)
-option(YAML_CPP_BUILD_CONTRIB "Enable contrib stuff in library" ON)
-
-## Build options
-# --> General
-# see http://www.cmake.org/cmake/help/cmake2.6docs.html#variable:BUILD_SHARED_LIBS
-#     http://www.cmake.org/cmake/help/cmake2.6docs.html#command:add_library
-option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF)
-
-# --> Apple
-option(APPLE_UNIVERSAL_BIN "Apple: Build universal binary" OFF)
-
-# --> Microsoft Visual C++
-# see http://msdn.microsoft.com/en-us/library/aa278396(v=VS.60).aspx
-#     http://msdn.microsoft.com/en-us/library/2kzt1wy3(v=VS.71).aspx
-option(MSVC_SHARED_RT "MSVC: Build with shared runtime libs (/MD)" ON)
-option(MSVC_STHREADED_RT "MSVC: Build with single-threaded static runtime libs (/ML until VS .NET 2003)" OFF)
-
-###
-### Sources, headers, directories and libs
-###
-set(header_directory "include/yaml-cpp/")
-
-file(GLOB sources "src/[a-zA-Z]*.cpp")
-file(GLOB_RECURSE public_headers "include/yaml-cpp/[a-zA-Z]*.h")
-file(GLOB private_headers "src/[a-zA-Z]*.h")
-
-if(YAML_CPP_BUILD_CONTRIB)
-	file(GLOB contrib_sources "src/contrib/[a-zA-Z]*.cpp")
-	file(GLOB contrib_public_headers "include/yaml-cpp/contrib/[a-zA-Z]*.h")
-	file(GLOB contrib_private_headers "src/contrib/[a-zA-Z]*.h")
-else()
-	add_definitions(-DYAML_CPP_NO_CONTRIB)
-endif()
-
-if(VERBOSE)
-	message(STATUS "sources: ${sources}")
-	message(STATUS "public_headers: ${public_headers}")
-	message(STATUS "private_headers: ${private_headers}")
-	message(STATUS "contrib_sources: ${contrib_sources}")
-	message(STATUS "contrib_public_headers: ${contrib_public_headers}")
-	message(STATUS "contrib_private_headers: ${contrib_private_headers}")
-endif()
-
-include_directories(${YAML_CPP_SOURCE_DIR}/src)
-include_directories(${YAML_CPP_SOURCE_DIR}/include)
-
-find_package(Boost REQUIRED)
-include_directories(${Boost_INCLUDE_DIRS})
-
-
-###
-### General compilation settings
-###
-if(BUILD_SHARED_LIBS)
-	set(LABEL_SUFFIX "shared")
-else()
-	set(LABEL_SUFFIX "static")
-endif()
-
-if(APPLE)
-	if(APPLE_UNIVERSAL_BIN)
-		set(CMAKE_OSX_ARCHITECTURES ppc;i386)
-	endif()
-endif()
-
-if(IPHONE)
-	set(CMAKE_OSX_SYSROOT "iphoneos4.2")
-	set(CMAKE_OSX_ARCHITECTURES "armv6;armv7")
-endif()
+option(YAML_CPP_BUILD_TOOLS "Enables or disables testing and parse tools" true)
 
 if(WIN32)
-	if(BUILD_SHARED_LIBS)
-		add_definitions(-D${PROJECT_NAME}_DLL)	# use or build Windows DLL
-	endif()
-	if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-		set(CMAKE_INSTALL_PREFIX "C:/")
-	endif()
-endif()
+  set(_library_dir bin) # .dll are in PATH, like executables
+else(WIN32)
+  set(_library_dir lib)
+endif(WIN32)
 
-# GCC specialities
-if(CMAKE_COMPILER_IS_GNUCXX)
-	### General stuff
-	if(WIN32)
-		set(CMAKE_SHARED_LIBRARY_PREFIX "")	# DLLs do not have a "lib" prefix
-		set(CMAKE_IMPORT_LIBRARY_PREFIX "")	# same for DLL import libs
-		set(CMAKE_LINK_DEF_FILE_FLAG "")	# CMake workaround (2.8.3)
-	endif()
-
-	### Project stuff
-	if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
-		set(CMAKE_BUILD_TYPE Release)
-	endif()
-	#
-	set(CMAKE_CXX_FLAGS_RELEASE "-O2")
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
-	set(CMAKE_CXX_FLAGS_DEBUG "-g")
-	set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os")
-	#
-	set(GCC_EXTRA_OPTIONS "")
-	#
-	set(FLAG_TESTED "-Wextra")
-	check_cxx_compiler_flag(${FLAG_TESTED} FLAG_WEXTRA)
-	if(FLAG_WEXTRA)
-		set(GCC_EXTRA_OPTIONS "${GCC_EXTRA_OPTIONS} ${FLAG_TESTED}")
-	endif()
-	#
-	set(CMAKE_CXX_FLAGS "-Wall ${GCC_EXTRA_OPTIONS} -pedantic -Wno-long-long ${CMAKE_CXX_FLAGS}")
-	#
-	add_custom_target(debuggable $(MAKE) clean
-		COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Debug ${CMAKE_SOURCE_DIR}
-		COMMENT "Adjusting settings for debug compilation"
-		VERBATIM)
-	add_custom_target(releasable $(MAKE) clean
-		COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Release ${CMAKE_SOURCE_DIR}
-		COMMENT "Adjusting settings for release compilation"
-		VERBATIM)
-endif()
-
-# Microsoft VisualC++ specialities
-if(MSVC)
-	### General stuff
-	# a) Change MSVC runtime library settings (/MD[d], /MT[d], /ML[d] (single-threaded until VS 2003))
-	#    plus set lib suffix for later use and project label accordingly
-	# see http://msdn.microsoft.com/en-us/library/aa278396(v=VS.60).aspx
-	#     http://msdn.microsoft.com/en-us/library/2kzt1wy3(v=VS.71).aspx
-	set(LIB_RT_SUFFIX "md")	# CMake defaults to /MD for MSVC
-	set(LIB_RT_OPTION "/MD")
-	#
-	if(NOT MSVC_SHARED_RT)	# User wants to have static runtime libraries (/MT, /ML)
-		if(MSVC_STHREADED_RT)	# User wants to have old single-threaded static runtime libraries
-			set(LIB_RT_SUFFIX "ml")
-			set(LIB_RT_OPTION "/ML")
-			if(NOT ${MSVC_VERSION} LESS 1400)
-				message(FATAL_ERROR "Single-threaded static runtime libraries (/ML) only available until VS .NET 2003 (7.1).")
-			endif()
-		else()
-			set(LIB_RT_SUFFIX "mt")
-			set(LIB_RT_OPTION "/MT")
-		endif()
-
-		# correct linker options
-		foreach(flag_var  CMAKE_C_FLAGS  CMAKE_CXX_FLAGS)
-			foreach(config_name  ""  DEBUG  RELEASE  MINSIZEREL  RELWITHDEBINFO)
-				set(var_name "${flag_var}")
-				if(NOT "${config_name}" STREQUAL "")
-					set(var_name "${var_name}_${config_name}")
-				endif()
-				string(REPLACE "/MD" "${LIB_RT_OPTION}" ${var_name} "${${var_name}}")
-			endforeach()
-		endforeach()
-	endif()
-	#
-	set(LABEL_SUFFIX "${LABEL_SUFFIX} ${LIB_RT_SUFFIX}")
-
-	# b) Change prefix for static libraries
-	set(CMAKE_STATIC_LIBRARY_PREFIX "lib")	# to distinguish static libraries from DLL import libs
-
-	# c) Correct suffixes for static libraries
-	if(NOT BUILD_SHARED_LIBS)
-		### General stuff
-		set(LIB_TARGET_SUFFIX "${LIB_SUFFIX}${LIB_RT_SUFFIX}")
-	endif()
-
-	### Project stuff
-	# /W3 = set warning level; see http://msdn.microsoft.com/en-us/library/thxezb7y.aspx
-	# /wd4127 = disable warning C4127 "conditional expression is constant"; see http://msdn.microsoft.com/en-us/library/6t66728h.aspx
-	# /wd4355 = disable warning C4355 "'this' : used in base member initializer list"; http://msdn.microsoft.com/en-us/library/3c594ae3.aspx
-	set(CMAKE_CXX_FLAGS "/W3 /wd4127 /wd4355 /D_SCL_SECURE_NO_WARNINGS ${CMAKE_CXX_FLAGS}")
-endif()
-
-
-###
-### General install settings
-###
-if(WIN32)
-	set(_library_dir bin)	# .dll are in PATH, like executables
-else()
-	set(_library_dir lib)
-endif()
-
-set(INCLUDE_INSTALL_ROOT_DIR include)
-
-set(INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_ROOT_DIR}/yaml-cpp)
-set(LIB_INSTALL_DIR "${_library_dir}${LIB_SUFFIX}")
+set(INCLUDE_INSTALL_DIR include/yaml-cpp)
+set(LIB_INSTALL_DIR ${_library_dir}${LIB_SUFFIX})
 
+#
 set(_INSTALL_DESTINATIONS
 	RUNTIME DESTINATION bin
 	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-	ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
+	ARCHIVE DESTINATION lib${LIB_SUFFIX}
 )
+#
+file(GLOB public_headers include/[a-z]*.h)
+file(GLOB private_headers src/[a-z]*.h)
+file(GLOB sources src/[a-z]*.cpp)
 
-
-###
-### Library
-###
+include_directories(${YAML_CPP_SOURCE_DIR}/include)
 add_library(yaml-cpp
-	${sources}
+	${LIB_TYPE}
 	${public_headers}
 	${private_headers}
-	${contrib_sources}
-	${contrib_public_headers}
-	${contrib_private_headers}
+	${sources}
 )
-
 set_target_properties(yaml-cpp PROPERTIES
 	VERSION "${YAML_CPP_VERSION}"
 	SOVERSION "${YAML_CPP_VERSION_MAJOR}.${YAML_CPP_VERSION_MINOR}"
-	PROJECT_LABEL "yaml-cpp ${LABEL_SUFFIX}"
 )
 
-if(IPHONE)
-	set_target_properties(yaml-cpp PROPERTIES
-		XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "3.0"
-	)
-endif()
-
-if(MSVC)
-	if(NOT BUILD_SHARED_LIBS)
-		# correct library names
-		set_target_properties(yaml-cpp PROPERTIES
-			DEBUG_POSTFIX "${LIB_TARGET_SUFFIX}d"
-			RELEASE_POSTFIX "${LIB_TARGET_SUFFIX}"
-			MINSIZEREL_POSTFIX "${LIB_TARGET_SUFFIX}"
-			RELWITHDEBINFO_POSTFIX "${LIB_TARGET_SUFFIX}"
-		)
-	endif()
-endif()
-
 install(TARGETS yaml-cpp ${_INSTALL_DESTINATIONS})
 install(
-	DIRECTORY ${header_directory}
+	FILES ${public_headers}
 	DESTINATION ${INCLUDE_INSTALL_DIR}
-	FILES_MATCHING PATTERN "*.h"
 )
 
 if(UNIX)
 	set(PC_FILE ${CMAKE_BINARY_DIR}/yaml-cpp.pc)
 	configure_file("yaml-cpp.pc.cmake" ${PC_FILE} @ONLY)
 	install(FILES ${PC_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-endif()
+endif(UNIX)
 
-
-###
-### Extras
-###
 if(YAML_CPP_BUILD_TOOLS)
-	add_subdirectory(test)
-	add_subdirectory(util)
-endif()
+	add_subdirectory (test)
+	add_subdirectory (util)
+endif(YAML_CPP_BUILD_TOOLS)

include/aliasmanager.h

@@ -0,0 +1,38 @@
+#pragma once
+
+#ifndef ALIASMANAGER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define ALIASMANAGER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+#include "anchor.h"
+#include <map>
+
+namespace YAML
+{
+	class Node;
+	
+	class AliasManager
+	{
+	public:
+		AliasManager();
+		
+		void RegisterReference(const Node& node);
+		
+		const Node *LookupReference(const Node& node) const;
+		anchor_t LookupAnchor(const Node& node) const;
+		
+	private:
+		const Node *_LookupReference(const Node& oldIdentity) const;
+		anchor_t _CreateNewAnchor();
+		
+	private:
+		typedef std::map<const Node*, const Node*> NodeByNode;
+		NodeByNode m_newIdentityByOldIdentity;
+		
+		typedef std::map<const Node*, anchor_t> AnchorByIdentity;
+		AnchorByIdentity m_anchorByIdentity;
+		
+		anchor_t m_curAnchor;
+	};
+}
+
+#endif // ALIASMANAGER_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/anchor.h

@@ -1,10 +1,8 @@
+#pragma once
+
 #ifndef ANCHOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define ANCHOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
 #include <cstddef>
 
 namespace YAML

include/anchordict.h

@@ -1,13 +1,11 @@
+#pragma once
+
 #ifndef ANCHORDICT_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define ANCHORDICT_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
 #include <vector>
 
-#include "../anchor.h"
+#include "anchor.h"
 
 namespace YAML
 {

include/conversion.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#ifndef CONVERSION_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define CONVERSION_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+
+#include "null.h"
+#include "traits.h"
+#include <string>
+#include <sstream>
+
+namespace YAML
+{
+	inline bool Convert(const std::string& input, std::string& output) {
+		output = input;
+		return true;
+	}
+	
+	bool Convert(const std::string& input, bool& output);
+	bool Convert(const std::string& input, _Null& output);
+	
+	template <typename T> 
+	inline bool Convert(const std::string& input, T& output, typename enable_if<is_numeric<T> >::type * = 0) {
+		std::stringstream stream(input);
+		stream.unsetf(std::ios::dec);
+		stream >> output;
+		return !!stream;
+	}
+}
+
+#endif // CONVERSION_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/emitfromevents.h

@@ -1,11 +1,9 @@
+#pragma once
+
 #ifndef EMITFROMEVENTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define EMITFROMEVENTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-#include "yaml-cpp/eventhandler.h"
+#include "eventhandler.h"
 #include <stack>
 
 namespace YAML
@@ -20,7 +18,7 @@ namespace YAML
 		virtual void OnDocumentStart(const Mark& mark);
 		virtual void OnDocumentEnd();
 		
-		virtual void OnNull(const Mark& mark, anchor_t anchor);
+		virtual void OnNull(const std::string& tag, anchor_t anchor);
 		virtual void OnAlias(const Mark& mark, anchor_t anchor);
 		virtual void OnScalar(const Mark& mark, const std::string& tag, anchor_t anchor, const std::string& value);
 		

include/emitter.h

@@ -0,0 +1,148 @@
+#pragma once
+
+#ifndef EMITTER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define EMITTER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+
+#include "emittermanip.h"
+#include "ostream.h"
+#include "null.h"
+#include <memory>
+#include <string>
+#include <sstream>
+
+namespace YAML
+{
+	class EmitterState;
+	
+	class Emitter
+	{
+	public:
+		Emitter();
+		~Emitter();
+		
+		// output
+		const char *c_str() const;
+		unsigned size() const;
+		
+		// state checking
+		bool good() const;
+		const std::string GetLastError() const;
+		
+		// global setters
+		bool SetOutputCharset(EMITTER_MANIP value);
+		bool SetStringFormat(EMITTER_MANIP value);
+		bool SetBoolFormat(EMITTER_MANIP value);
+		bool SetIntBase(EMITTER_MANIP value);
+		bool SetSeqFormat(EMITTER_MANIP value);
+		bool SetMapFormat(EMITTER_MANIP value);
+		bool SetIndent(unsigned n);
+		bool SetPreCommentIndent(unsigned n);
+		bool SetPostCommentIndent(unsigned n);
+		
+		// local setters
+		Emitter& SetLocalValue(EMITTER_MANIP value);
+		Emitter& SetLocalIndent(const _Indent& indent);
+		
+		// overloads of write
+		Emitter& Write(const std::string& str);
+		Emitter& Write(bool b);
+		Emitter& Write(const _Alias& alias);
+		Emitter& Write(const _Anchor& anchor);
+		Emitter& Write(const _Tag& tag);
+		Emitter& Write(const _Comment& comment);
+		Emitter& Write(const _Null& null);
+		
+		template <typename T>
+		Emitter& WriteIntegralType(T value);
+		
+		template <typename T>
+		Emitter& WriteStreamable(T value);
+
+	private:
+		void PreWriteIntegralType(std::stringstream& str);
+		void PostWriteIntegralType(const std::stringstream& str);
+	
+	private:
+		enum ATOMIC_TYPE { AT_SCALAR, AT_SEQ, AT_BLOCK_SEQ, AT_FLOW_SEQ, AT_MAP, AT_BLOCK_MAP, AT_FLOW_MAP };
+		
+		void PreAtomicWrite();
+		bool GotoNextPreAtomicState();
+		void PostAtomicWrite();
+		void EmitSeparationIfNecessary();
+		
+		void EmitBeginSeq();
+		void EmitEndSeq();
+		void EmitBeginMap();
+		void EmitEndMap();
+		void EmitKey();
+		void EmitValue();
+		void EmitKindTag();
+		void EmitTag(bool verbatim, const _Tag& tag);
+		
+	private:
+		ostream m_stream;
+		std::auto_ptr <EmitterState> m_pState;
+	};
+	
+	template <typename T>
+	inline Emitter& Emitter::WriteIntegralType(T value)
+	{
+		if(!good())
+			return *this;
+		
+		std::stringstream str;
+		PreWriteIntegralType(str);
+		str << value;
+		PostWriteIntegralType(str);
+		return *this;
+	}
+
+	template <typename T>
+	inline Emitter& Emitter::WriteStreamable(T value)
+	{
+		if(!good())
+			return *this;
+		
+		PreAtomicWrite();
+		EmitSeparationIfNecessary();
+		
+		std::stringstream str;
+		str << value;
+		m_stream << str.str();
+		
+		PostAtomicWrite();
+		return *this;
+	}
+	
+	// overloads of insertion
+	inline Emitter& operator << (Emitter& emitter, const std::string& v) { return emitter.Write(v); }
+	inline Emitter& operator << (Emitter& emitter, bool v) { return emitter.Write(v); }
+	inline Emitter& operator << (Emitter& emitter, const _Alias& v) { return emitter.Write(v); }
+	inline Emitter& operator << (Emitter& emitter, const _Anchor& v) { return emitter.Write(v); }
+	inline Emitter& operator << (Emitter& emitter, const _Tag& v) { return emitter.Write(v); }
+	inline Emitter& operator << (Emitter& emitter, const _Comment& v) { return emitter.Write(v); }
+	inline Emitter& operator << (Emitter& emitter, const _Null& v) { return emitter.Write(v); }
+
+	inline Emitter& operator << (Emitter& emitter, const char *v) { return emitter.Write(std::string(v)); }
+
+	inline Emitter& operator << (Emitter& emitter, int v) { return emitter.WriteIntegralType(v); }
+	inline Emitter& operator << (Emitter& emitter, unsigned int v) { return emitter.WriteIntegralType(v); }
+	inline Emitter& operator << (Emitter& emitter, short v) { return emitter.WriteIntegralType(v); }
+	inline Emitter& operator << (Emitter& emitter, unsigned short v) { return emitter.WriteIntegralType(v); }
+	inline Emitter& operator << (Emitter& emitter, long v) { return emitter.WriteIntegralType(v); }
+	inline Emitter& operator << (Emitter& emitter, unsigned long v) { return emitter.WriteIntegralType(v); }
+
+	inline Emitter& operator << (Emitter& emitter, float v) { return emitter.WriteStreamable(v); }
+	inline Emitter& operator << (Emitter& emitter, double v) { return emitter.WriteStreamable(v); }
+
+	inline Emitter& operator << (Emitter& emitter, EMITTER_MANIP value) {
+		return emitter.SetLocalValue(value);
+	}
+	
+	inline Emitter& operator << (Emitter& emitter, _Indent indent) {
+		return emitter.SetLocalIndent(indent);
+	}
+}
+
+#endif // EMITTER_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/emittermanip.h

@@ -1,10 +1,8 @@
+#pragma once
+
 #ifndef EMITTERMANIP_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define EMITTERMANIP_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
 
 #include <string>
 
@@ -14,7 +12,6 @@ namespace YAML
 		// general manipulators
 		Auto,
 		TagByKind,
-		Newline,
 
 		// output character set
 		EmitNonAscii,
@@ -41,10 +38,6 @@ namespace YAML
 		Hex,
 		Oct,
 		
-		// document manipulators
-		BeginDoc,
-		EndDoc,
-		
 		// sequence manipulators
 		BeginSeq,
 		EndSeq,
@@ -90,32 +83,24 @@ namespace YAML
 	}
 	
 	struct _Tag {
-		struct Type { enum value { Verbatim, PrimaryHandle, NamedHandle }; };
-		
-		explicit _Tag(const std::string& prefix_, const std::string& content_, Type::value type_)
-		: prefix(prefix_), content(content_), type(type_)
+		explicit _Tag(const std::string& content_)
+		: content(content_), verbatim(true)
 		{
 		}
-		std::string prefix;
 		std::string content;
-		Type::value type;
+		bool verbatim;
 	};
 	
-	inline _Tag VerbatimTag(const std::string content) {
-		return _Tag("", content, _Tag::Type::Verbatim);
-	}
-
-	inline _Tag LocalTag(const std::string content) {
-		return _Tag("", content, _Tag::Type::PrimaryHandle);
-	}
-
-	inline _Tag LocalTag(const std::string& prefix, const std::string content) {
-		return _Tag(prefix, content, _Tag::Type::NamedHandle);
-	}
-
-	inline _Tag SecondaryTag(const std::string content) {
-		return _Tag("", content, _Tag::Type::NamedHandle);
-	}
+	typedef _Tag VerbatimTag;
+	
+	struct LocalTag : public _Tag
+	{
+		explicit LocalTag(const std::string& content_)
+		: _Tag(content_)
+		{
+			verbatim = false;
+		}
+	};
 
 	struct _Comment {
 		_Comment(const std::string& content_): content(content_) {}
@@ -125,25 +110,6 @@ namespace YAML
 	inline _Comment Comment(const std::string content) {
 		return _Comment(content);
 	}
-    
-    struct _Precision {
-        _Precision(int floatPrecision_, int doublePrecision_): floatPrecision(floatPrecision_), doublePrecision(doublePrecision_) {}
-        
-        int floatPrecision;
-        int doublePrecision;
-    };
-    
-    inline _Precision FloatPrecision(int n) {
-        return _Precision(n, -1);
-    }
-
-    inline _Precision DoublePrecision(int n) {
-        return _Precision(-1, n);
-    }
-
-    inline _Precision Precision(int n) {
-        return _Precision(n, n);
-    }
 }
 
 #endif // EMITTERMANIP_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/eventhandler.h

@@ -1,11 +1,9 @@
+#pragma once
+
 #ifndef EVENTHANDLER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define EVENTHANDLER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-#include "yaml-cpp/anchor.h"
+#include "anchor.h"
 #include <string>
 
 namespace YAML
@@ -20,7 +18,7 @@ namespace YAML
 		virtual void OnDocumentStart(const Mark& mark) = 0;
 		virtual void OnDocumentEnd() = 0;
 		
-		virtual void OnNull(const Mark& mark, anchor_t anchor) = 0;
+		virtual void OnNull(const std::string& tag, anchor_t anchor) = 0;
 		virtual void OnAlias(const Mark& mark, anchor_t anchor) = 0;
 		virtual void OnScalar(const Mark& mark, const std::string& tag, anchor_t anchor, const std::string& value) = 0;
 

include/exceptions.h

@@ -0,0 +1,161 @@
+#pragma once
+
+#ifndef EXCEPTIONS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define EXCEPTIONS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+
+#include "mark.h"
+#include "traits.h"
+#include <exception>
+#include <string>
+#include <sstream>
+
+namespace YAML
+{
+	// error messages
+	namespace ErrorMsg
+	{
+		const std::string YAML_DIRECTIVE_ARGS    = "YAML directives must have exactly one argument";
+		const std::string YAML_VERSION           = "bad YAML version: ";
+		const std::string YAML_MAJOR_VERSION     = "YAML major version too large";
+		const std::string REPEATED_YAML_DIRECTIVE= "repeated YAML directive";
+		const std::string TAG_DIRECTIVE_ARGS     = "TAG directives must have exactly two arguments";
+		const std::string REPEATED_TAG_DIRECTIVE = "repeated TAG directive";
+		const std::string CHAR_IN_TAG_HANDLE     = "illegal character found while scanning tag handle";
+		const std::string TAG_WITH_NO_SUFFIX     = "tag handle with no suffix";
+		const std::string END_OF_VERBATIM_TAG    = "end of verbatim tag not found";
+		const std::string END_OF_MAP             = "end of map not found";
+		const std::string END_OF_MAP_FLOW        = "end of map flow not found";
+		const std::string END_OF_SEQ             = "end of sequence not found";
+		const std::string END_OF_SEQ_FLOW        = "end of sequence flow not found";
+		const std::string MULTIPLE_TAGS          = "cannot assign multiple tags to the same node";
+		const std::string MULTIPLE_ANCHORS       = "cannot assign multiple anchors to the same node";
+		const std::string MULTIPLE_ALIASES       = "cannot assign multiple aliases to the same node";
+		const std::string ALIAS_CONTENT          = "aliases can't have any content, *including* tags";
+		const std::string INVALID_HEX            = "bad character found while scanning hex number";
+		const std::string INVALID_UNICODE        = "invalid unicode: ";
+		const std::string INVALID_ESCAPE         = "unknown escape character: ";
+		const std::string UNKNOWN_TOKEN          = "unknown token";
+		const std::string DOC_IN_SCALAR          = "illegal document indicator in scalar";
+		const std::string EOF_IN_SCALAR          = "illegal EOF in scalar";
+		const std::string CHAR_IN_SCALAR         = "illegal character in scalar";
+		const std::string TAB_IN_INDENTATION     = "illegal tab when looking for indentation";
+		const std::string FLOW_END               = "illegal flow end";
+		const std::string BLOCK_ENTRY            = "illegal block entry";
+		const std::string MAP_KEY                = "illegal map key";
+		const std::string MAP_VALUE              = "illegal map value";
+		const std::string ALIAS_NOT_FOUND        = "alias not found after *";
+		const std::string ANCHOR_NOT_FOUND       = "anchor not found after &";
+		const std::string CHAR_IN_ALIAS          = "illegal character found while scanning alias";
+		const std::string CHAR_IN_ANCHOR         = "illegal character found while scanning anchor";
+		const std::string ZERO_INDENT_IN_BLOCK   = "cannot set zero indentation for a block scalar";
+		const std::string CHAR_IN_BLOCK          = "unexpected character in block scalar";
+		const std::string AMBIGUOUS_ANCHOR     = "cannot assign the same alias to multiple nodes";
+		const std::string UNKNOWN_ANCHOR       = "the referenced anchor is not defined";
+
+		const std::string INVALID_SCALAR         = "invalid scalar";
+		const std::string KEY_NOT_FOUND          = "key not found";
+		const std::string BAD_DEREFERENCE        = "bad dereference";
+		
+		const std::string UNMATCHED_GROUP_TAG    = "unmatched group tag";
+		const std::string UNEXPECTED_END_SEQ     = "unexpected end sequence token";
+		const std::string UNEXPECTED_END_MAP     = "unexpected end map token";
+		const std::string SINGLE_QUOTED_CHAR     = "invalid character in single-quoted string";
+		const std::string INVALID_ANCHOR         = "invalid anchor";
+		const std::string INVALID_ALIAS          = "invalid alias";
+		const std::string INVALID_TAG            = "invalid tag";
+		const std::string EXPECTED_KEY_TOKEN     = "expected key token";
+		const std::string EXPECTED_VALUE_TOKEN   = "expected value token";
+		const std::string UNEXPECTED_KEY_TOKEN   = "unexpected key token";
+		const std::string UNEXPECTED_VALUE_TOKEN = "unexpected value token";
+
+		template <typename T>
+		inline const std::string KEY_NOT_FOUND_WITH_KEY(const T&, typename disable_if<is_numeric<T> >::type * = 0) {
+			return KEY_NOT_FOUND;
+		}
+
+		inline const std::string KEY_NOT_FOUND_WITH_KEY(const std::string& key) {
+			return KEY_NOT_FOUND + ": " + key;
+		}
+		
+		template <typename T>
+		inline const std::string KEY_NOT_FOUND_WITH_KEY(const T& key, typename enable_if<is_numeric<T> >::type * = 0) {
+			std::stringstream stream;
+			stream << KEY_NOT_FOUND << ": " << key;
+			return stream.str();
+		}
+	}
+
+	class Exception: public std::exception {
+	public:
+		Exception(const Mark& mark_, const std::string& msg_)
+			: mark(mark_), msg(msg_) {
+				std::stringstream output;
+				output << "yaml-cpp: error at line " << mark.line+1 << ", column " << mark.column+1 << ": " << msg;
+				what_ = output.str();
+			}
+		virtual ~Exception() throw() {}
+		virtual const char *what() const throw() { return what_.c_str(); }
+
+		Mark mark;
+		std::string msg;
+		
+	private:
+		std::string what_;
+	};
+
+	class ParserException: public Exception {
+	public:
+		ParserException(const Mark& mark_, const std::string& msg_)
+			: Exception(mark_, msg_) {}
+	};
+
+	class RepresentationException: public Exception {
+	public:
+		RepresentationException(const Mark& mark_, const std::string& msg_)
+			: Exception(mark_, msg_) {}
+	};
+
+	// representation exceptions
+	class InvalidScalar: public RepresentationException {
+	public:
+		InvalidScalar(const Mark& mark_)
+			: RepresentationException(mark_, ErrorMsg::INVALID_SCALAR) {}
+	};
+
+	class KeyNotFound: public RepresentationException {
+	public:
+		template <typename T>
+		KeyNotFound(const Mark& mark_, const T& key_)
+			: RepresentationException(mark_, ErrorMsg::KEY_NOT_FOUND_WITH_KEY(key_)) {}
+	};
+	
+	template <typename T>
+	class TypedKeyNotFound: public KeyNotFound {
+	public:
+		TypedKeyNotFound(const Mark& mark_, const T& key_)
+			: KeyNotFound(mark_, key_), key(key_) {}
+		virtual ~TypedKeyNotFound() throw() {}
+
+		T key;
+	};
+
+	template <typename T>
+	inline TypedKeyNotFound <T> MakeTypedKeyNotFound(const Mark& mark, const T& key) {
+		return TypedKeyNotFound <T> (mark, key);
+	}
+
+	class BadDereference: public RepresentationException {
+	public:
+		BadDereference()
+		: RepresentationException(Mark::null(), ErrorMsg::BAD_DEREFERENCE) {}
+	};
+	
+	class EmitterException: public Exception {
+	public:
+		EmitterException(const std::string& msg_)
+		: Exception(Mark::null(), msg_) {}
+	};
+}
+
+#endif // EXCEPTIONS_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/graphbuilder.h

@@ -1,16 +1,11 @@
 #ifndef GRAPHBUILDER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define GRAPHBUILDER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-#include "yaml-cpp/mark.h"
 #include <string>
 
 namespace YAML
 {
-  class Parser;
+  struct Mark;
   
   // GraphBuilderInterface
   // . Abstraction of node creation
@@ -20,7 +15,7 @@ namespace YAML
   {
   public:
     // Create and return a new node with a null value.
-    virtual void *NewNull(const Mark& mark, void *pParentNode) = 0;
+    virtual void *NewNull(const std::string& tag, void *pParentNode) = 0;
     
     // Create and return a new node with the given tag and value.
     virtual void *NewScalar(const Mark& mark, const std::string& tag, void *pParentNode, const std::string& value) = 0;
@@ -74,8 +69,8 @@ namespace YAML
     
     GraphBuilderInterface& AsBuilderInterface() {return *this;}
     
-    virtual void *NewNull(const Mark& mark, void* pParentNode) {
-      return CheckType<Node>(m_impl.NewNull(mark, AsNode(pParentNode)));
+    virtual void *NewNull(const std::string& tag, void* pParentNode) {
+      return CheckType<Node>(m_impl.NewNull(tag, AsNode(pParentNode)));
     }
     
     virtual void *NewScalar(const Mark& mark, const std::string& tag, void *pParentNode, const std::string& value) {
@@ -117,17 +112,6 @@ namespace YAML
     static Sequence *AsSequence(void *pSeq) {return static_cast<Sequence*>(pSeq);}
     static Map *AsMap(void *pMap) {return static_cast<Map*>(pMap);}
   };
-  
-  void *BuildGraphOfNextDocument(Parser& parser, GraphBuilderInterface& graphBuilder);
-  
-  template <class Impl>
-  typename Impl::Node *BuildGraphOfNextDocument(Parser& parser, Impl& impl)
-  {
-    GraphBuilder<Impl> graphBuilder(impl);
-    return static_cast<typename Impl::Node *>(BuildGraphOfNextDocument(
-      parser, graphBuilder
-    ));
-  }
 }
 
 #endif // GRAPHBUILDER_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/iterator.h

@@ -0,0 +1,36 @@
+#pragma once
+
+#ifndef ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+
+namespace YAML
+{
+	class Node;
+	struct IterPriv;
+
+	class Iterator
+	{
+	public:
+		Iterator();
+		Iterator(IterPriv *pData);
+		Iterator(const Iterator& rhs);
+		~Iterator();
+
+		Iterator& operator = (const Iterator& rhs);
+		Iterator& operator ++ ();
+		Iterator operator ++ (int);
+		const Node& operator * () const;
+		const Node *operator -> () const;
+		const Node& first() const;
+		const Node& second() const;
+
+		friend bool operator == (const Iterator& it, const Iterator& jt);
+		friend bool operator != (const Iterator& it, const Iterator& jt);
+
+	private:
+		IterPriv *m_pData;
+	};
+}
+
+#endif // ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/mark.h

@@ -1,19 +1,15 @@
+#pragma once
+
 #ifndef MARK_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define MARK_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-#include "yaml-cpp/dll.h"
 
 namespace YAML
 {
-	struct YAML_CPP_API Mark {
+	struct Mark {
 		Mark(): pos(0), line(0), column(0) {}
 		
-		static const Mark null_mark() { return Mark(-1, -1, -1); }
+		static const Mark null() { return Mark(-1, -1, -1); }
 		
 		int pos;
 		int line, column;

include/node.h

@@ -0,0 +1,143 @@
+#pragma once
+
+#ifndef NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+
+#include "conversion.h"
+#include "exceptions.h"
+#include "iterator.h"
+#include "mark.h"
+#include "noncopyable.h"
+#include <iostream>
+#include <string>
+#include <vector>
+#include <map>
+#include <memory>
+
+namespace YAML
+{
+	class AliasManager;
+	class Content;
+	class Scanner;
+	class Emitter;
+	class EventHandler;
+	struct NodeProperties;
+
+	enum CONTENT_TYPE { CT_NONE, CT_SCALAR, CT_SEQUENCE, CT_MAP };
+
+	class Node: private noncopyable
+	{
+	public:
+		Node();
+		~Node();
+
+		void Clear();
+		std::auto_ptr<Node> Clone() const;
+		void EmitEvents(EventHandler& eventHandler) const;
+		void EmitEvents(AliasManager& am, EventHandler& eventHandler) const;
+
+		void Init(CONTENT_TYPE type, const Mark& mark, const std::string& tag);
+		void InitNull(const std::string& tag);
+		void InitAlias(const Mark& mark, const Node& identity);
+		
+		void SetData(const std::string& data);
+		void Append(std::auto_ptr<Node> pNode);
+		void Insert(std::auto_ptr<Node> pKey, std::auto_ptr<Node> pValue);
+
+		CONTENT_TYPE GetType() const;
+
+		// file location of start of this node
+		const Mark GetMark() const { return m_mark; }
+
+		// accessors
+		Iterator begin() const;
+		Iterator end() const;
+		std::size_t size() const;
+
+		// extraction of scalars
+		bool GetScalar(std::string& s) const;
+
+		// we can specialize this for other values
+		template <typename T>
+		bool Read(T& value) const;
+
+		template <typename T>
+		const T Read() const;
+		
+		template <typename T>
+		operator T() const;
+
+		template <typename T>
+		friend void operator >> (const Node& node, T& value);
+
+		// retrieval for maps and sequences
+		template <typename T>
+		const Node *FindValue(const T& key) const;
+
+		template <typename T>
+		const Node& operator [] (const T& key) const;
+		
+		// specific to maps
+		const Node *FindValue(const char *key) const;
+		const Node& operator [] (const char *key) const;
+
+		// for anchors/aliases
+		const Node *Identity() const { return m_pIdentity; }
+		bool IsAlias() const { return m_alias; }
+		bool IsReferenced() const { return m_referenced; }
+		
+		// for tags
+		const std::string GetTag() const { return IsAlias() ? m_pIdentity->GetTag() : m_tag; }
+
+		// emitting
+		friend Emitter& operator << (Emitter& out, const Node& node);
+
+		// ordering
+		int Compare(const Node& rhs) const;
+		friend bool operator < (const Node& n1, const Node& n2);
+
+	private:
+		// helper for sequences
+		template <typename, bool> friend struct _FindFromNodeAtIndex;
+		const Node *FindAtIndex(std::size_t i) const;
+		
+		// helper for maps
+		template <typename T>
+		const Node& GetValue(const T& key) const;
+
+		template <typename T>
+		const Node *FindValueForKey(const T& key) const;
+
+	private:
+		Mark m_mark;
+		std::string m_tag;
+		Content *m_pContent;
+		bool m_alias;
+		const Node *m_pIdentity;
+		mutable bool m_referenced;
+	};
+	
+	// comparisons with auto-conversion
+	template <typename T>
+	bool operator == (const T& value, const Node& node);
+	
+	template <typename T>
+	bool operator == (const Node& node, const T& value);
+	
+	template <typename T>
+	bool operator != (const T& value, const Node& node);
+	
+	template <typename T>
+	bool operator != (const Node& node, const T& value);
+	
+	bool operator == (const char *value, const Node& node);
+	bool operator == (const Node& node, const char *value);
+	bool operator != (const char *value, const Node& node);
+	bool operator != (const Node& node, const char *value);
+}
+
+#include "nodeimpl.h"
+#include "nodereadimpl.h"
+
+#endif // NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/nodeimpl.h

@@ -0,0 +1,118 @@
+#pragma once
+
+#ifndef NODEIMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define NODEIMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+
+#include "nodeutil.h"
+
+namespace YAML
+{
+	// implementation of templated things
+	template <typename T>
+	inline const T Node::Read() const {
+		T value;
+		*this >> value;
+		return value;
+	}
+	
+	template <typename T>
+	Node::operator T() const {
+		return Read<T>();
+	}
+
+	template <typename T>
+	inline void operator >> (const Node& node, T& value) {
+		if(!ConvertScalar(node, value))
+			throw InvalidScalar(node.m_mark);
+	}
+	
+	template <typename T>
+	inline const Node *Node::FindValue(const T& key) const {
+		switch(GetType()) {
+			case CT_MAP:
+				return FindValueForKey(key);
+			case CT_SEQUENCE:
+				return FindFromNodeAtIndex(*this, key);
+			default:
+				return 0;
+		}
+	}
+	
+	template <typename T>
+	inline const Node *Node::FindValueForKey(const T& key) const {
+		for(Iterator it=begin();it!=end();++it) {
+			T t;
+			if(it.first().Read(t)) {
+				if(key == t)
+					return &it.second();
+			}
+		}
+		
+		return 0;
+	}
+	
+	template <typename T>
+	inline const Node& Node::GetValue(const T& key) const {
+		if(!m_pContent)
+			throw BadDereference();
+		
+		const Node *pValue = FindValue(key);
+		if(!pValue)
+			throw MakeTypedKeyNotFound(m_mark, key);
+
+		return *pValue;
+	}
+	
+	template <typename T>
+	inline const Node& Node::operator [] (const T& key) const {
+		return GetValue(key);
+	}
+	
+	inline const Node *Node::FindValue(const char *key) const {
+		return FindValue(std::string(key));
+	}
+	
+	inline const Node& Node::operator [] (const char *key) const {
+		return GetValue(std::string(key));
+	}
+
+	template <typename T>
+	inline bool operator == (const T& value, const Node& node) {
+		return value == node.operator T();
+	}
+	
+	template <typename T>
+	inline bool operator == (const Node& node, const T& value) {
+		return value == node.operator T();
+	}
+	
+	template <typename T>
+	inline bool operator != (const T& value, const Node& node) {
+		return value != node.operator T();
+	}
+	
+	template <typename T>
+	inline bool operator != (const Node& node, const T& value) {
+		return value != node.operator T();
+	}
+
+	inline bool operator == (const char *value, const Node& node) {
+		return std::string(value) == node;
+	}
+	
+	inline bool operator == (const Node& node, const char *value) {
+		return std::string(value) == node;
+	}
+	
+	inline bool operator != (const char *value, const Node& node) {
+		return std::string(value) != node;
+	}
+	
+	inline bool operator != (const Node& node, const char *value) {
+		return std::string(value) != node;
+	}
+	
+}
+
+#endif // NODEIMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/nodeproperties.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#ifndef NODEPROPERTIES_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define NODEPROPERTIES_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+namespace YAML
+{
+	struct NodeProperties {
+		std::string tag;
+		std::string anchor;
+	};
+}
+
+#endif // NODEPROPERTIES_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/nodereadimpl.h

@@ -0,0 +1,78 @@
+#pragma once
+
+namespace YAML
+{
+	// implementation for Node::Read
+	// (the goal is to call ConvertScalar if we can, and fall back to operator >> if not)
+	// thanks to litb from stackoverflow.com
+	// http://stackoverflow.com/questions/1386183/how-to-call-a-templated-function-if-it-exists-and-something-else-otherwise/1386390#1386390
+
+	// Note: this doesn't work on gcc 3.2, but does on gcc 3.4 and above. I'm not sure about 3.3.
+	
+#if __GNUC__ && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ <= 3))
+	// trick doesn't work? Just fall back to ConvertScalar.
+	// This means that we can't use any user-defined types as keys in a map
+	template <typename T>
+	inline bool Node::Read(T& value) const {
+		return ConvertScalar(*this, value);
+	}
+#else
+	// usual case: the trick!
+	template<bool>
+	struct read_impl;
+	
+	// ConvertScalar available
+	template<>
+	struct read_impl<true> {
+		template<typename T>
+		static bool read(const Node& node, T& value) {
+			return ConvertScalar(node, value);
+		}
+	};
+
+	// ConvertScalar not available
+	template<>
+	struct read_impl<false> {
+		template<typename T>
+		static bool read(const Node& node, T& value) {
+			try {
+				node >> value;
+			} catch(const Exception&) {
+				return false;
+			}
+			return true;
+		}
+	};
+	
+	namespace fallback {
+		// sizeof > 1
+		struct flag { char c[2]; };
+		flag Convert(...);
+		
+		int operator,(flag, flag);
+		
+		template<typename T>
+		char operator,(flag, T const&);
+		
+		char operator,(int, flag);
+		int operator,(char, flag);
+	}
+
+	template <typename T>
+	inline bool Node::Read(T& value) const {
+		using namespace fallback;
+
+		return read_impl<sizeof (fallback::flag(), Convert(std::string(), value), fallback::flag()) != 1>::read(*this, value);
+	}
+#endif // done with trick
+	
+	// the main conversion function
+	template <typename T>
+	inline bool ConvertScalar(const Node& node, T& value) {
+		std::string scalar;
+		if(!node.GetScalar(scalar))
+			return false;
+		
+		return Convert(scalar, value);
+	}
+}

include/nodeutil.h

@@ -0,0 +1,60 @@
+#pragma once
+
+#ifndef NODEUTIL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define NODEUTIL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+
+namespace YAML
+{
+	template <typename T, typename U>
+	struct is_same_type {
+		enum { value = false };
+	};
+	
+	template <typename T>
+	struct is_same_type<T, T> {
+		enum { value = true };
+	};
+	
+	template <typename T, bool check>
+	struct is_index_type_with_check {
+		enum { value = false };
+	};
+	
+	template <> struct is_index_type_with_check<std::size_t, false> { enum { value = true }; };
+
+#define MAKE_INDEX_TYPE(Type) \
+	template <> struct is_index_type_with_check<Type, is_same_type<Type, std::size_t>::value> { enum { value = true }; }
+	
+	MAKE_INDEX_TYPE(int);
+	MAKE_INDEX_TYPE(unsigned);
+	MAKE_INDEX_TYPE(short);
+	MAKE_INDEX_TYPE(unsigned short);
+	MAKE_INDEX_TYPE(long);
+	MAKE_INDEX_TYPE(unsigned long);
+
+#undef MAKE_INDEX_TYPE
+	
+	template <typename T>
+	struct is_index_type: public is_index_type_with_check<T, false> {};
+	
+	// messing around with template stuff to get the right overload for operator [] for a sequence
+	template <typename T, bool b>
+	struct _FindFromNodeAtIndex {
+		const Node *pRet;
+		_FindFromNodeAtIndex(const Node&, const T&): pRet(0) {}
+	};
+
+	template <typename T>
+	struct _FindFromNodeAtIndex<T, true> {
+		const Node *pRet;
+		_FindFromNodeAtIndex(const Node& node, const T& key): pRet(node.FindAtIndex(static_cast<std::size_t>(key))) {}
+	};
+
+	template <typename T>
+	inline const Node *FindFromNodeAtIndex(const Node& node, const T& key) {
+		return _FindFromNodeAtIndex<T, is_index_type<T>::value>(node, key).pRet;
+	}
+}
+
+#endif // NODEUTIL_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/noncopyable.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#ifndef NONCOPYABLE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define NONCOPYABLE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+
+namespace YAML
+{
+	// this is basically boost::noncopyable
+	class noncopyable
+		{
+		protected:
+			noncopyable() {}
+			~noncopyable() {}
+			
+		private:
+			noncopyable(const noncopyable&);
+			const noncopyable& operator = (const noncopyable&);
+		};
+}
+
+#endif // NONCOPYABLE_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/null.h

@@ -1,24 +1,20 @@
+#pragma once
+
 #ifndef NULL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define NULL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-#include "yaml-cpp/dll.h"
 
 namespace YAML
 {
 	class Node;
 	
-	struct YAML_CPP_API _Null {};
+	struct _Null {};
 	inline bool operator == (const _Null&, const _Null&) { return true; }
 	inline bool operator != (const _Null&, const _Null&) { return false; }
 	
-	YAML_CPP_API bool IsNull(const Node& node); // old API only
+	bool IsNull(const Node& node);
 	
-	extern YAML_CPP_API _Null Null;
+	extern _Null Null;
 }
 
 #endif // NULL_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/ostream.h

@@ -0,0 +1,38 @@
+#pragma once
+
+#ifndef OSTREAM_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define OSTREAM_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+
+#include <string>
+
+namespace YAML
+{
+	class ostream
+	{
+	public:
+		ostream();
+		~ostream();
+		
+		void reserve(unsigned size);
+		void put(char ch);
+		const char *str() const { return m_buffer; }
+		
+		unsigned row() const { return m_row; }
+		unsigned col() const { return m_col; }
+		unsigned pos() const { return m_pos; }
+		
+	private:
+		char *m_buffer;
+		unsigned m_pos;
+		unsigned m_size;
+		
+		unsigned m_row, m_col;
+	};
+	
+	ostream& operator << (ostream& out, const char *str);
+	ostream& operator << (ostream& out, const std::string& str);
+	ostream& operator << (ostream& out, char ch);
+}
+
+#endif // OSTREAM_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/parser.h

@@ -1,24 +1,25 @@
+#pragma once
+
 #ifndef PARSER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define PARSER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
 
-
-#include "yaml-cpp/dll.h"
-#include "yaml-cpp/noncopyable.h"
+#include "graphbuilder.h"
+#include "noncopyable.h"
 #include <ios>
 #include <memory>
 
 namespace YAML
 {
 	struct Directives;
+	struct Mark;
 	struct Token;
 	class EventHandler;
+	class GraphBuilderInterface;
+	class Node;
 	class Scanner;
 
-	class YAML_CPP_API Parser: private noncopyable
+	class Parser: private noncopyable
 	{
 	public:
 		Parser();
@@ -29,7 +30,18 @@ namespace YAML
 
 		void Load(std::istream& in);
 		bool HandleNextDocument(EventHandler& eventHandler);
-
+		
+		void *BuildNextDocumentGraph(GraphBuilderInterface& graphBuilder);
+		template <class Builder>
+		typename Builder::Node *BuildNextDocumentGraph(Builder& graphBuilder)
+		{
+			GraphBuilder<Builder> wrapper(graphBuilder); // Must be lvalue to make C++ happy
+			return static_cast<typename Builder::Node *>(
+				BuildNextDocumentGraph(wrapper.AsBuilderInterface())
+			);
+		}
+		
+		bool GetNextDocument(Node& document);
 		void PrintTokens(std::ostream& out);
 
 	private:

include/stlemitter.h

@@ -0,0 +1,44 @@
+#pragma once
+
+#ifndef STLEMITTER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define STLEMITTER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+
+#include <vector>
+#include <list>
+#include <map>
+
+namespace YAML
+{
+	template <typename T>
+	inline Emitter& operator << (Emitter& emitter, const std::vector <T>& v) {
+		typedef typename std::vector <T> vec;
+		emitter << BeginSeq;
+		for(typename vec::const_iterator it=v.begin();it!=v.end();++it)
+			emitter << *it;
+		emitter << EndSeq;
+		return emitter;
+	}	
+
+	template <typename T>
+	inline Emitter& operator << (Emitter& emitter, const std::list <T>& v) {
+		typedef typename std::list <T> list;
+		emitter << BeginSeq;
+		for(typename list::const_iterator it=v.begin();it!=v.end();++it)
+			emitter << *it;
+		emitter << EndSeq;
+		return emitter;
+	}
+	
+	template <typename K, typename V>
+	inline Emitter& operator << (Emitter& emitter, const std::map <K, V>& m) {
+		typedef typename std::map <K, V> map;
+		emitter << BeginMap;
+		for(typename map::const_iterator it=m.begin();it!=m.end();++it)
+			emitter << Key << it->first << Value << it->second;
+		emitter << EndMap;
+		return emitter;
+	}
+}
+
+#endif // STLEMITTER_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/stlnode.h

@@ -0,0 +1,36 @@
+#pragma once
+
+#ifndef STLNODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define STLNODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+
+#include <vector>
+#include <map>
+
+namespace YAML
+{
+	template <typename T>
+	void operator >> (const Node& node, std::vector<T>& v)
+	{
+		v.clear();
+		v.resize(node.size());
+		for(unsigned i=0;i<node.size();++i)
+			node[i] >> v[i];
+	}
+	
+	
+	template <typename K, typename V>
+	void operator >> (const Node& node, std::map<K, V>& m)
+	{
+		m.clear();
+		for(Iterator it=node.begin();it!=node.end();++it) {
+			K k;
+			V v;
+			it.first() >> k;
+			it.second() >> v;
+			m[k] = v;
+		}
+	}
+}
+
+#endif // STLNODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/traits.h

@@ -1,10 +1,8 @@
+#pragma once
+
 #ifndef TRAITS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define TRAITS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
 
 namespace YAML
 {
@@ -19,13 +17,8 @@ namespace YAML
 	template <> struct is_numeric <unsigned long int> { enum { value = true }; };
 	template <> struct is_numeric <short int> { enum { value = true }; };
 	template <> struct is_numeric <unsigned short int> { enum { value = true }; };
-#if defined(_MSC_VER) && (_MSC_VER < 1310)
-	template <> struct is_numeric <__int64> { enum { value = true }; };
-	template <> struct is_numeric <unsigned __int64> { enum { value = true }; };
-#else
 	template <> struct is_numeric <long long> { enum { value = true }; };
 	template <> struct is_numeric <unsigned long long> { enum { value = true }; };
-#endif
 	template <> struct is_numeric <float> { enum { value = true }; };
 	template <> struct is_numeric <double> { enum { value = true }; };
 	template <> struct is_numeric <long double> { enum { value = true }; };

include/yaml-cpp/binary.h

@@ -1,62 +0,0 @@
-#ifndef BASE64_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define BASE64_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-#include <string>
-#include <vector>
-
-namespace YAML
-{
-    std::string EncodeBase64(const unsigned char *data, std::size_t size);
-    std::vector<unsigned char> DecodeBase64(const std::string& input);
-    
-    class Binary {
-    public:
-        Binary(): m_unownedData(0), m_unownedSize(0) {}
-        Binary(const unsigned char *data_, std::size_t size_): m_unownedData(data_), m_unownedSize(size_) {}
-        
-        bool owned() const { return !m_unownedData; }
-        std::size_t size() const { return owned() ? m_data.size() : m_unownedSize; }
-        const unsigned char *data() const { return owned() ? &m_data[0] : m_unownedData; }
-        
-        void swap(std::vector<unsigned char>& rhs) {
-            if(m_unownedData) {
-                m_data.swap(rhs);
-                rhs.clear();
-                rhs.resize(m_unownedSize);
-                std::copy(m_unownedData, m_unownedData + m_unownedSize, &rhs[0]);
-                m_unownedData = 0;
-                m_unownedSize = 0;
-            } else {
-                m_data.swap(rhs);
-            }
-        }
-        
-        bool operator == (const Binary& rhs) const {
-            const std::size_t s = size();
-            if(s != rhs.size())
-                return false;
-            const unsigned char *d1 = data();
-            const unsigned char *d2 = rhs.data();
-            for(std::size_t i=0;i<s;i++) {
-                if(*d1++ != *d2++)
-                    return false;
-            }
-            return true;
-        }
-        
-        bool operator != (const Binary& rhs) const {
-            return !(*this == rhs);
-        }
-        
-    private:
-        std::vector<unsigned char> m_data;
-        const unsigned char *m_unownedData;
-        std::size_t m_unownedSize;
-    };
-}
-
-#endif // BASE64_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/dll.h

@@ -1,28 +0,0 @@
-#ifndef DLL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define DLL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-// The following ifdef block is the standard way of creating macros which make exporting
-// from a DLL simpler. All files within this DLL are compiled with the yaml_cpp_EXPORTS
-// symbol defined on the command line. this symbol should not be defined on any project
-// that uses this DLL. This way any other project whose source files include this file see
-// YAML_CPP_API functions as being imported from a DLL, whereas this DLL sees symbols
-// defined with this macro as being exported.
-#undef YAML_CPP_API
-
-#ifdef YAML_CPP_DLL // Using or Building YAML-CPP DLL (definition defined manually)
-	#ifdef yaml_cpp_EXPORTS // Building YAML-CPP DLL (definition created by CMake or defined manually)
-	//	#pragma message( "Defining YAML_CPP_API for DLL export" )
-		#define YAML_CPP_API __declspec(dllexport)
-	#else // yaml_cpp_EXPORTS
-	//	#pragma message( "Defining YAML_CPP_API for DLL import" )
-		#define YAML_CPP_API __declspec(dllimport)
-	#endif // yaml_cpp_EXPORTS
-#else //YAML_CPP_DLL
-#define YAML_CPP_API
-#endif // YAML_CPP_DLL
-
-#endif // DLL_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/emitter.h

@@ -1,209 +0,0 @@
-#ifndef EMITTER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define EMITTER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-#include "yaml-cpp/dll.h"
-#include "yaml-cpp/binary.h"
-#include "yaml-cpp/emitterdef.h"
-#include "yaml-cpp/emittermanip.h"
-#include "yaml-cpp/noncopyable.h"
-#include "yaml-cpp/null.h"
-#include "yaml-cpp/ostream_wrapper.h"
-#include <memory>
-#include <string>
-#include <sstream>
-
-namespace YAML
-{
-	class EmitterState;
-	
-	class YAML_CPP_API Emitter: private noncopyable
-	{
-	public:
-		Emitter();
-        explicit Emitter(std::ostream& stream);
-		~Emitter();
-		
-		// output
-		const char *c_str() const;
-        std::size_t size() const;
-		
-		// state checking
-		bool good() const;
-		const std::string GetLastError() const;
-		
-		// global setters
-		bool SetOutputCharset(EMITTER_MANIP value);
-		bool SetStringFormat(EMITTER_MANIP value);
-		bool SetBoolFormat(EMITTER_MANIP value);
-		bool SetIntBase(EMITTER_MANIP value);
-		bool SetSeqFormat(EMITTER_MANIP value);
-		bool SetMapFormat(EMITTER_MANIP value);
-		bool SetIndent(unsigned n);
-		bool SetPreCommentIndent(unsigned n);
-		bool SetPostCommentIndent(unsigned n);
-        bool SetFloatPrecision(unsigned n);
-        bool SetDoublePrecision(unsigned n);
-		
-		// local setters
-		Emitter& SetLocalValue(EMITTER_MANIP value);
-		Emitter& SetLocalIndent(const _Indent& indent);
-        Emitter& SetLocalPrecision(const _Precision& precision);
-		
-		// overloads of write
-		Emitter& Write(const std::string& str);
-		Emitter& Write(bool b);
-		Emitter& Write(char ch);
-		Emitter& Write(const _Alias& alias);
-		Emitter& Write(const _Anchor& anchor);
-		Emitter& Write(const _Tag& tag);
-		Emitter& Write(const _Comment& comment);
-		Emitter& Write(const _Null& n);
-		Emitter& Write(const Binary& binary);
-		
-		template <typename T>
-		Emitter& WriteIntegralType(T value);
-		
-		template <typename T>
-		Emitter& WriteStreamable(T value);
-
-	private:
-        template<typename T> void SetStreamablePrecision(std::stringstream&) {}
-        unsigned GetFloatPrecision() const;
-        unsigned GetDoublePrecision() const;
-        
-        void PrepareIntegralStream(std::stringstream& stream) const;
-        void StartedScalar();
-	
-	private:
-		void EmitBeginDoc();
-		void EmitEndDoc();
-		void EmitBeginSeq();
-		void EmitEndSeq();
-		void EmitBeginMap();
-		void EmitEndMap();
-		void EmitNewline();
-		void EmitKindTag();
-		void EmitTag(bool verbatim, const _Tag& tag);
-		
-        void PrepareNode(EmitterNodeType::value child);
-        void PrepareTopNode(EmitterNodeType::value child);
-        void FlowSeqPrepareNode(EmitterNodeType::value child);
-        void BlockSeqPrepareNode(EmitterNodeType::value child);
-
-        void FlowMapPrepareNode(EmitterNodeType::value child);
-
-        void FlowMapPrepareLongKey(EmitterNodeType::value child);
-        void FlowMapPrepareLongKeyValue(EmitterNodeType::value child);
-        void FlowMapPrepareSimpleKey(EmitterNodeType::value child);
-        void FlowMapPrepareSimpleKeyValue(EmitterNodeType::value child);
-
-        void BlockMapPrepareNode(EmitterNodeType::value child);
-
-        void BlockMapPrepareLongKey(EmitterNodeType::value child);
-        void BlockMapPrepareLongKeyValue(EmitterNodeType::value child);
-        void BlockMapPrepareSimpleKey(EmitterNodeType::value child);
-        void BlockMapPrepareSimpleKeyValue(EmitterNodeType::value child);
-        
-        void SpaceOrIndentTo(bool requireSpace, unsigned indent);
-        
-		const char *ComputeFullBoolName(bool b) const;
-		bool CanEmitNewline() const;
-		
-	private:
-		std::auto_ptr<EmitterState> m_pState;
-		ostream_wrapper m_stream;
-	};
-	
-	template <typename T>
-	inline Emitter& Emitter::WriteIntegralType(T value)
-	{
-		if(!good())
-			return *this;
-		
-        PrepareNode(EmitterNodeType::Scalar);
-
-        std::stringstream stream;
-        PrepareIntegralStream(stream);
-        stream << value;
-        m_stream << stream.str();
-        
-        StartedScalar();
-
-		return *this;
-	}
-
-	template <typename T>
-	inline Emitter& Emitter::WriteStreamable(T value)
-	{
-		if(!good())
-			return *this;
-		
-        PrepareNode(EmitterNodeType::Scalar);
-
-		std::stringstream stream;
-        SetStreamablePrecision<T>(stream);
-		stream << value;
-        m_stream << stream.str();
-        
-        StartedScalar();
-
-		return *this;
-	}
-	
-    template<>
-    inline void Emitter::SetStreamablePrecision<float>(std::stringstream& stream)
-    {
-		stream.precision(GetFloatPrecision());
-    }
-
-    template<>
-    inline void Emitter::SetStreamablePrecision<double>(std::stringstream& stream)
-    {
-		stream.precision(GetDoublePrecision());
-    }
-
-	// overloads of insertion
-	inline Emitter& operator << (Emitter& emitter, const std::string& v) { return emitter.Write(v); }
-	inline Emitter& operator << (Emitter& emitter, bool v) { return emitter.Write(v); }
-	inline Emitter& operator << (Emitter& emitter, char v) { return emitter.Write(v); }
-	inline Emitter& operator << (Emitter& emitter, unsigned char v) { return emitter.Write(static_cast<char>(v)); }
-	inline Emitter& operator << (Emitter& emitter, const _Alias& v) { return emitter.Write(v); }
-	inline Emitter& operator << (Emitter& emitter, const _Anchor& v) { return emitter.Write(v); }
-	inline Emitter& operator << (Emitter& emitter, const _Tag& v) { return emitter.Write(v); }
-	inline Emitter& operator << (Emitter& emitter, const _Comment& v) { return emitter.Write(v); }
-	inline Emitter& operator << (Emitter& emitter, const _Null& v) { return emitter.Write(v); }
-	inline Emitter& operator << (Emitter& emitter, const Binary& b) { return emitter.Write(b); }
-
-	inline Emitter& operator << (Emitter& emitter, const char *v) { return emitter.Write(std::string(v)); }
-
-	inline Emitter& operator << (Emitter& emitter, int v) { return emitter.WriteIntegralType(v); }
-	inline Emitter& operator << (Emitter& emitter, unsigned int v) { return emitter.WriteIntegralType(v); }
-	inline Emitter& operator << (Emitter& emitter, short v) { return emitter.WriteIntegralType(v); }
-	inline Emitter& operator << (Emitter& emitter, unsigned short v) { return emitter.WriteIntegralType(v); }
-	inline Emitter& operator << (Emitter& emitter, long v) { return emitter.WriteIntegralType(v); }
-	inline Emitter& operator << (Emitter& emitter, unsigned long v) { return emitter.WriteIntegralType(v); }
-	inline Emitter& operator << (Emitter& emitter, long long v) { return emitter.WriteIntegralType(v); }
-	inline Emitter& operator << (Emitter& emitter, unsigned long long v) { return emitter.WriteIntegralType(v); }
-
-	inline Emitter& operator << (Emitter& emitter, float v) { return emitter.WriteStreamable(v); }
-	inline Emitter& operator << (Emitter& emitter, double v) { return emitter.WriteStreamable(v); }
-
-	inline Emitter& operator << (Emitter& emitter, EMITTER_MANIP value) {
-		return emitter.SetLocalValue(value);
-	}
-	
-	inline Emitter& operator << (Emitter& emitter, _Indent indent) {
-		return emitter.SetLocalIndent(indent);
-	}
-    
-    inline Emitter& operator << (Emitter& emitter, _Precision precision) {
-        return emitter.SetLocalPrecision(precision);
-    }
-}
-
-#endif // EMITTER_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/emitterdef.h

@@ -1,13 +0,0 @@
-#ifndef EMITTERDEF_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define EMITTERDEF_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-namespace YAML
-{
-    struct EmitterNodeType { enum value { None, Property, Scalar, FlowSeq, BlockSeq, FlowMap, BlockMap }; };
-}
-
-#endif // EMITTERDEF_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/exceptions.h

@@ -1,208 +0,0 @@
-#ifndef EXCEPTIONS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define EXCEPTIONS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-#include "yaml-cpp/mark.h"
-#include "yaml-cpp/traits.h"
-#include <stdexcept>
-#include <string>
-#include <sstream>
-
-namespace YAML
-{
-	// error messages
-	namespace ErrorMsg
-	{
-		const char * const YAML_DIRECTIVE_ARGS    = "YAML directives must have exactly one argument";
-		const char * const YAML_VERSION           = "bad YAML version: ";
-		const char * const YAML_MAJOR_VERSION     = "YAML major version too large";
-		const char * const REPEATED_YAML_DIRECTIVE= "repeated YAML directive";
-		const char * const TAG_DIRECTIVE_ARGS     = "TAG directives must have exactly two arguments";
-		const char * const REPEATED_TAG_DIRECTIVE = "repeated TAG directive";
-		const char * const CHAR_IN_TAG_HANDLE     = "illegal character found while scanning tag handle";
-		const char * const TAG_WITH_NO_SUFFIX     = "tag handle with no suffix";
-		const char * const END_OF_VERBATIM_TAG    = "end of verbatim tag not found";
-		const char * const END_OF_MAP             = "end of map not found";
-		const char * const END_OF_MAP_FLOW        = "end of map flow not found";
-		const char * const END_OF_SEQ             = "end of sequence not found";
-		const char * const END_OF_SEQ_FLOW        = "end of sequence flow not found";
-		const char * const MULTIPLE_TAGS          = "cannot assign multiple tags to the same node";
-		const char * const MULTIPLE_ANCHORS       = "cannot assign multiple anchors to the same node";
-		const char * const MULTIPLE_ALIASES       = "cannot assign multiple aliases to the same node";
-		const char * const ALIAS_CONTENT          = "aliases can't have any content, *including* tags";
-		const char * const INVALID_HEX            = "bad character found while scanning hex number";
-		const char * const INVALID_UNICODE        = "invalid unicode: ";
-		const char * const INVALID_ESCAPE         = "unknown escape character: ";
-		const char * const UNKNOWN_TOKEN          = "unknown token";
-		const char * const DOC_IN_SCALAR          = "illegal document indicator in scalar";
-		const char * const EOF_IN_SCALAR          = "illegal EOF in scalar";
-		const char * const CHAR_IN_SCALAR         = "illegal character in scalar";
-		const char * const TAB_IN_INDENTATION     = "illegal tab when looking for indentation";
-		const char * const FLOW_END               = "illegal flow end";
-		const char * const BLOCK_ENTRY            = "illegal block entry";
-		const char * const MAP_KEY                = "illegal map key";
-		const char * const MAP_VALUE              = "illegal map value";
-		const char * const ALIAS_NOT_FOUND        = "alias not found after *";
-		const char * const ANCHOR_NOT_FOUND       = "anchor not found after &";
-		const char * const CHAR_IN_ALIAS          = "illegal character found while scanning alias";
-		const char * const CHAR_IN_ANCHOR         = "illegal character found while scanning anchor";
-		const char * const ZERO_INDENT_IN_BLOCK   = "cannot set zero indentation for a block scalar";
-		const char * const CHAR_IN_BLOCK          = "unexpected character in block scalar";
-		const char * const AMBIGUOUS_ANCHOR       = "cannot assign the same alias to multiple nodes";
-		const char * const UNKNOWN_ANCHOR         = "the referenced anchor is not defined";
-
-        const char * const INVALID_NODE           = "invalid node; this may result from using a map iterator as a sequence iterator, or vice-versa";
-		const char * const INVALID_SCALAR         = "invalid scalar";
-		const char * const KEY_NOT_FOUND          = "key not found";
-        const char * const BAD_CONVERSION         = "bad conversion";
-		const char * const BAD_DEREFERENCE        = "bad dereference";
-        const char * const BAD_SUBSCRIPT          = "operator[] call on a scalar";
-        const char * const BAD_PUSHBACK           = "appending to a non-sequence";
-        const char * const BAD_INSERT             = "inserting in a non-convertible-to-map";
-		
-		const char * const UNMATCHED_GROUP_TAG    = "unmatched group tag";
-		const char * const UNEXPECTED_END_SEQ     = "unexpected end sequence token";
-		const char * const UNEXPECTED_END_MAP     = "unexpected end map token";
-		const char * const SINGLE_QUOTED_CHAR     = "invalid character in single-quoted string";
-		const char * const INVALID_ANCHOR         = "invalid anchor";
-		const char * const INVALID_ALIAS          = "invalid alias";
-		const char * const INVALID_TAG            = "invalid tag";
-        const char * const BAD_FILE               = "bad file";
-
-		template <typename T>
-		inline const std::string KEY_NOT_FOUND_WITH_KEY(const T&, typename disable_if<is_numeric<T> >::type * = 0) {
-			return KEY_NOT_FOUND;
-		}
-
-		inline const std::string KEY_NOT_FOUND_WITH_KEY(const std::string& key) {
-			std::stringstream stream;
-			stream << KEY_NOT_FOUND << ": " << key;
-			return stream.str();
-		}
-		
-		template <typename T>
-		inline const std::string KEY_NOT_FOUND_WITH_KEY(const T& key, typename enable_if<is_numeric<T> >::type * = 0) {
-			std::stringstream stream;
-			stream << KEY_NOT_FOUND << ": " << key;
-			return stream.str();
-		}
-	}
-
-	class Exception: public std::runtime_error {
-	public:
-		Exception(const Mark& mark_, const std::string& msg_)
-		: std::runtime_error(build_what(mark_, msg_)), mark(mark_), msg(msg_) {}
-		virtual ~Exception() throw() {}
-
-		Mark mark;
-		std::string msg;
-
-	private:
-		static const std::string build_what(const Mark& mark, const std::string& msg) {
-			std::stringstream output;
-			output << "yaml-cpp: error at line " << mark.line+1 << ", column " << mark.column+1 << ": " << msg;
-			return output.str();
-		}
-	};
-
-	class ParserException: public Exception {
-	public:
-		ParserException(const Mark& mark_, const std::string& msg_)
-			: Exception(mark_, msg_) {}
-	};
-
-	class RepresentationException: public Exception {
-	public:
-		RepresentationException(const Mark& mark_, const std::string& msg_)
-			: Exception(mark_, msg_) {}
-	};
-
-	// representation exceptions
-	class InvalidScalar: public RepresentationException {
-	public:
-		InvalidScalar(const Mark& mark_)
-			: RepresentationException(mark_, ErrorMsg::INVALID_SCALAR) {}
-	};
-
-	class KeyNotFound: public RepresentationException {
-	public:
-		template <typename T>
-		KeyNotFound(const Mark& mark_, const T& key_)
-			: RepresentationException(mark_, ErrorMsg::KEY_NOT_FOUND_WITH_KEY(key_)) {}
-	};
-	
-	template <typename T>
-	class TypedKeyNotFound: public KeyNotFound {
-	public:
-		TypedKeyNotFound(const Mark& mark_, const T& key_)
-			: KeyNotFound(mark_, key_), key(key_) {}
-		virtual ~TypedKeyNotFound() throw() {}
-
-		T key;
-	};
-
-	template <typename T>
-	inline TypedKeyNotFound <T> MakeTypedKeyNotFound(const Mark& mark, const T& key) {
-		return TypedKeyNotFound <T> (mark, key);
-	}
-
-	class InvalidNode: public RepresentationException {
-	public:
-		InvalidNode()
-        : RepresentationException(Mark::null_mark(), ErrorMsg::INVALID_NODE) {}
-	};
-
-    class BadConversion: public RepresentationException {
-	public:
-		BadConversion()
-        : RepresentationException(Mark::null_mark(), ErrorMsg::BAD_CONVERSION) {}
-	};
-
-    template<typename T>
-	class TypedBadConversion: public BadConversion {
-	public:
-		TypedBadConversion()
-        : BadConversion() {}
-	};
-
-	class BadDereference: public RepresentationException {
-	public:
-		BadDereference()
-		: RepresentationException(Mark::null_mark(), ErrorMsg::BAD_DEREFERENCE) {}
-	};
-
-	class BadSubscript: public RepresentationException {
-	public:
-		BadSubscript()
-		: RepresentationException(Mark::null_mark(), ErrorMsg::BAD_SUBSCRIPT) {}
-	};
-
-	class BadPushback: public RepresentationException {
-	public:
-		BadPushback()
-		: RepresentationException(Mark::null_mark(), ErrorMsg::BAD_PUSHBACK) {}
-	};
-	
-	class BadInsert: public RepresentationException {
-	public:
-		BadInsert()
-		: RepresentationException(Mark::null_mark(), ErrorMsg::BAD_INSERT) {}
-	};
-
-	class EmitterException: public Exception {
-	public:
-		EmitterException(const std::string& msg_)
-		: Exception(Mark::null_mark(), msg_) {}
-	};
-    
-    class BadFile: public Exception {
-    public:
-        BadFile(): Exception(Mark::null_mark(), ErrorMsg::BAD_FILE) {}
-    };
-}
-
-#endif // EXCEPTIONS_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/convert.h

@@ -1,280 +0,0 @@
-#ifndef NODE_CONVERT_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define NODE_CONVERT_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-#include "yaml-cpp/binary.h"
-#include "yaml-cpp/node/node.h"
-#include "yaml-cpp/node/iterator.h"
-#include "yaml-cpp/null.h"
-#include <limits>
-#include <list>
-#include <map>
-#include <sstream>
-#include <vector>
-
-namespace YAML
-{
-    namespace conversion {
-        inline bool IsInfinity(const std::string& input) {
-            return input == ".inf" || input == ".Inf" || input == ".INF" || input == "+.inf" || input == "+.Inf" || input == "+.INF";
-        }
-        
-        inline bool IsNegativeInfinity(const std::string& input) {
-            return input == "-.inf" || input == "-.Inf" || input == "-.INF";
-        }
-        
-        inline bool IsNaN(const std::string& input) {
-            return input == ".nan" || input == ".NaN" || input == ".NAN";
-        }
-    }
-    
-	// std::string
-	template<>
-	struct convert<std::string> {
-		static Node encode(const std::string& rhs) {
-			return Node(rhs);
-		}
-		
-		static bool decode(const Node& node, std::string& rhs) {
-			if(!node.IsScalar())
-				return false;
-			rhs = node.Scalar();
-			return true;
-		}
-	};
-	
-	// C-strings can only be encoded
-	template<>
-	struct convert<const char *> {
-		static Node encode(const char *&rhs) {
-			return Node(rhs);
-		}
-	};
-
-	template<std::size_t N>
-	struct convert<const char[N]> {
-		static Node encode(const char (&rhs)[N]) {
-			return Node(rhs);
-		}
-	};
-
-    template<>
-	struct convert<_Null> {
-		static Node encode(const _Null& /* rhs */) {
-			return Node();
-		}
-		
-		static bool decode(const Node& node, _Null& /* rhs */) {
-			return node.IsNull();
-		}
-	};
-	
-#define YAML_DEFINE_CONVERT_STREAMABLE(type, negative_op)\
-	template<>\
-	struct convert<type> {\
-		static Node encode(const type& rhs) {\
-			std::stringstream stream;\
-            stream.precision(std::numeric_limits<type>::digits10 + 1);\
-			stream << rhs;\
-			return Node(stream.str());\
-		}\
-		\
-		static bool decode(const Node& node, type& rhs) {\
-			if(node.Type() != NodeType::Scalar)\
-				return false;\
-            const std::string& input = node.Scalar();\
-			std::stringstream stream(input);\
-            stream.unsetf(std::ios::dec);\
-			if((stream >> rhs) && (stream >> std::ws).eof())\
-                return true;\
-            if(std::numeric_limits<type>::has_infinity) {\
-                if(conversion::IsInfinity(input)) {\
-                    rhs = std::numeric_limits<type>::infinity();\
-                    return true;\
-                } else if(conversion::IsNegativeInfinity(input)) {\
-                    rhs = negative_op std::numeric_limits<type>::infinity();\
-                    return true;\
-                }\
-            }\
-            \
-            if(std::numeric_limits<type>::has_quiet_NaN && conversion::IsNaN(input)) {\
-                rhs = std::numeric_limits<type>::quiet_NaN();\
-                return true;\
-            }\
-            \
-            return false;\
-		}\
-	}
-	
-#define YAML_DEFINE_CONVERT_STREAMABLE_SIGNED(type)\
-    YAML_DEFINE_CONVERT_STREAMABLE(type, -)
-
-#define YAML_DEFINE_CONVERT_STREAMABLE_UNSIGNED(type)\
-    YAML_DEFINE_CONVERT_STREAMABLE(type, +)
-
-    YAML_DEFINE_CONVERT_STREAMABLE_SIGNED(int);
-	YAML_DEFINE_CONVERT_STREAMABLE_SIGNED(short);
-	YAML_DEFINE_CONVERT_STREAMABLE_SIGNED(long);
-	YAML_DEFINE_CONVERT_STREAMABLE_SIGNED(long long);
-	YAML_DEFINE_CONVERT_STREAMABLE_UNSIGNED(unsigned);
-	YAML_DEFINE_CONVERT_STREAMABLE_UNSIGNED(unsigned short);
-	YAML_DEFINE_CONVERT_STREAMABLE_UNSIGNED(unsigned long);
-	YAML_DEFINE_CONVERT_STREAMABLE_UNSIGNED(unsigned long long);
-	
-	YAML_DEFINE_CONVERT_STREAMABLE_SIGNED(char);
-	YAML_DEFINE_CONVERT_STREAMABLE_UNSIGNED(unsigned char);
-	
-	YAML_DEFINE_CONVERT_STREAMABLE_SIGNED(float);
-	YAML_DEFINE_CONVERT_STREAMABLE_SIGNED(double);
-	YAML_DEFINE_CONVERT_STREAMABLE_SIGNED(long double);
-	
-#undef YAML_DEFINE_CONVERT_STREAMABLE_SIGNED
-#undef YAML_DEFINE_CONVERT_STREAMABLE_UNSIGNED
-#undef YAML_DEFINE_CONVERT_STREAMABLE
-	
-	// bool
-	template<>
-	struct convert<bool> {
-		static Node encode(bool rhs) {
-			return rhs ? Node("true") : Node("false");
-		}
-		
-		static bool decode(const Node& node, bool& rhs);
-	};
-
-	// std::map
-	template<typename K, typename V>
-	struct convert<std::map<K, V> > {
-		static Node encode(const std::map<K, V>& rhs) {
-			Node node(NodeType::Map);
-			for(typename std::map<K, V>::const_iterator it=rhs.begin();it!=rhs.end();++it)
-                node.force_insert(it->first, it->second);
-			return node;
-		}
-		
-		static bool decode(const Node& node, std::map<K, V>& rhs) {
-			if(!node.IsMap())
-				return false;
-
-			rhs.clear();
-			for(const_iterator it=node.begin();it!=node.end();++it)
-#if defined(__GNUC__) && __GNUC__ < 4
-//workaround for GCC 3:
-				rhs[it->first.template as<K>()] = it->second.template as<V>();
-#else
-				rhs[it->first.as<K>()] = it->second.as<V>();
-#endif
-			return true;
-		}
-	};
-	
-	// std::vector
-	template<typename T>
-	struct convert<std::vector<T> > {
-		static Node encode(const std::vector<T>& rhs) {
-			Node node(NodeType::Sequence);
-			for(typename std::vector<T>::const_iterator it=rhs.begin();it!=rhs.end();++it)
-				node.push_back(*it);
-			return node;
-		}
-		
-		static bool decode(const Node& node, std::vector<T>& rhs) {
-			if(!node.IsSequence())
-				return false;
-			
-			rhs.clear();
-			for(const_iterator it=node.begin();it!=node.end();++it)
-#if defined(__GNUC__) && __GNUC__ < 4
-//workaround for GCC 3:
-				rhs.push_back(it->template as<T>());
-#else
-				rhs.push_back(it->as<T>());
-#endif
-			return true;
-		}
-	};
-	
-	// std::list
-	template<typename T>
-	struct convert<std::list<T> > {
-		static Node encode(const std::list<T>& rhs) {
-			Node node(NodeType::Sequence);
-			for(typename std::list<T>::const_iterator it=rhs.begin();it!=rhs.end();++it)
-				node.push_back(*it);
-			return node;
-		}
-		
-		static bool decode(const Node& node, std::list<T>& rhs) {
-			if(!node.IsSequence())
-				return false;
-			
-			rhs.clear();
-			for(const_iterator it=node.begin();it!=node.end();++it)
-#if defined(__GNUC__) && __GNUC__ < 4
-//workaround for GCC 3:
-				rhs.push_back(it->template as<T>());
-#else
-				rhs.push_back(it->as<T>());
-#endif
-			return true;
-		}
-	};
-    
-	// std::pair
-	template<typename T, typename U>
-	struct convert<std::pair<T, U> > {
-		static Node encode(const std::pair<T, U>& rhs) {
-			Node node(NodeType::Sequence);
-            node.push_back(rhs.first);
-            node.push_back(rhs.second);
-			return node;
-		}
-		
-		static bool decode(const Node& node, std::pair<T, U>& rhs) {
-			if(!node.IsSequence())
-				return false;
-            if (node.size() != 2)
-                return false;
-
-#if defined(__GNUC__) && __GNUC__ < 4
-//workaround for GCC 3:
-				rhs.first = node[0].template as<T>();
-#else
-				rhs.first = node[0].as<T>();
-#endif
-#if defined(__GNUC__) && __GNUC__ < 4
-//workaround for GCC 3:
-				rhs.second = node[1].template as<U>();
-#else
-				rhs.second = node[1].as<U>();
-#endif
-			return true;
-		}
-	};
-
-    // binary
-    template<>
-	struct convert<Binary> {
-		static Node encode(const Binary& rhs) {
-            return Node(EncodeBase64(rhs.data(), rhs.size()));
-		}
-		
-		static bool decode(const Node& node, Binary& rhs) {
-			if(!node.IsScalar())
-				return false;
-            
-            std::vector<unsigned char> data = DecodeBase64(node.Scalar());
-            if(data.empty() && !node.Scalar().empty())
-                return false;
-            
-            rhs.swap(data);
-            return true;
-		}
-	};
-}
-
-#endif // NODE_CONVERT_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/detail/bool_type.h

@@ -1,26 +0,0 @@
-#ifndef NODE_DETAIL_BOOL_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define NODE_DETAIL_BOOL_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-namespace YAML
-{
-	namespace detail
-	{
-		struct unspecified_bool {
-			struct NOT_ALLOWED;
-			static void true_value(NOT_ALLOWED*) {}
-		};
-		typedef void (*unspecified_bool_type)(unspecified_bool::NOT_ALLOWED*);
-	}
-}
-
-#define YAML_CPP_OPERATOR_BOOL()\
-operator YAML::detail::unspecified_bool_type() const\
-{\
-	return this->operator!() ? 0 : &YAML::detail::unspecified_bool::true_value;\
-}
-
-#endif // NODE_DETAIL_BOOL_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/detail/impl.h

@@ -1,168 +0,0 @@
-#ifndef NODE_DETAIL_IMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define NODE_DETAIL_IMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-#include "yaml-cpp/node/detail/node.h"
-#include "yaml-cpp/node/detail/node_data.h"
-#include <boost/type_traits.hpp>
-
-namespace YAML
-{
-	namespace detail
-	{
-		template<typename Key, typename Enable = void>
-		struct get_idx {
-			static node *get(const std::vector<node *>& /* sequence */, const Key& /* key */, shared_memory_holder /* pMemory */) {
-				return 0;
-			}
-		};
-
-		template<typename Key>
-		struct get_idx<Key, typename boost::enable_if_c<boost::is_unsigned<Key>::value && !boost::is_same<Key, bool>::value>::type> {
-			static node *get(const std::vector<node *>& sequence, const Key& key, shared_memory_holder /* pMemory */) {
-				return key < sequence.size() ? sequence[key] : 0;
-			}
-
-			static node *get(std::vector<node *>& sequence, const Key& key, shared_memory_holder pMemory) {
-				if(key > sequence.size())
-					return 0;
-				if(key == sequence.size())
-					sequence.push_back(&pMemory->create_node());
-				return sequence[key];
-			}
-		};
-		
-		template<typename Key>
-		struct get_idx<Key, typename boost::enable_if<boost::is_signed<Key> >::type> {
-			static node *get(const std::vector<node *>& sequence, const Key& key, shared_memory_holder pMemory) {
-				return key >= 0 ? get_idx<std::size_t>::get(sequence, static_cast<std::size_t>(key), pMemory) : 0;
-			}
-			static node *get(std::vector<node *>& sequence, const Key& key, shared_memory_holder pMemory) {
-				return key >= 0 ? get_idx<std::size_t>::get(sequence, static_cast<std::size_t>(key), pMemory) : 0;
-			}
-		};
-
-		// indexing
-		template<typename Key>
-		inline node& node_data::get(const Key& key, shared_memory_holder pMemory) const
-		{
-			switch(m_type) {
-				case NodeType::Map:
-					break;
-				case NodeType::Undefined:
-				case NodeType::Null:
-					return pMemory->create_node();
-				case NodeType::Sequence:
-					if(node *pNode = get_idx<Key>::get(m_sequence, key, pMemory))
-						return *pNode;
-					return pMemory->create_node();
-				case NodeType::Scalar:
-                    throw BadSubscript();
-			}
-
-			for(node_map::const_iterator it=m_map.begin();it!=m_map.end();++it) {
-				if(equals(*it->first, key, pMemory))
-					return *it->second;
-			}
-			
-			return pMemory->create_node();
-		}
-		
-		template<typename Key>
-		inline node& node_data::get(const Key& key, shared_memory_holder pMemory)
-		{
-			switch(m_type) {
-				case NodeType::Map:
-					break;
-				case NodeType::Undefined:
-				case NodeType::Null:
-				case NodeType::Sequence:
-					if(node *pNode = get_idx<Key>::get(m_sequence, key, pMemory)) {
-						m_type = NodeType::Sequence;
-						return *pNode;
-					}
-					
-					convert_to_map(pMemory);
-					break;
-				case NodeType::Scalar:
-                    throw BadSubscript();
-			}
-			
-			for(node_map::const_iterator it=m_map.begin();it!=m_map.end();++it) {
-				if(equals(*it->first, key, pMemory))
-					return *it->second;
-			}
-			
-			node& k = convert_to_node(key, pMemory);
-			node& v = pMemory->create_node();
-			insert_map_pair(k, v);
-			return v;
-		}
-		
-		template<typename Key>
-		inline bool node_data::remove(const Key& key, shared_memory_holder pMemory)
-		{
-			if(m_type != NodeType::Map)
-				return false;
-			
-			for(node_map::iterator it=m_map.begin();it!=m_map.end();++it) {
-				if(equals(*it->first, key, pMemory)) {
-					m_map.erase(it);
-					return true;
-				}
-			}
-			
-			return false;
-		}
-        
-        // map
-        template<typename Key, typename Value>
-        inline void node_data::force_insert(const Key& key, const Value& value, shared_memory_holder pMemory)
-        {
-			switch(m_type) {
-				case NodeType::Map:
-					break;
-				case NodeType::Undefined:
-				case NodeType::Null:
-				case NodeType::Sequence:
-					convert_to_map(pMemory);
-					break;
-				case NodeType::Scalar:
-                    throw BadInsert();
-			}
-			
-			node& k = convert_to_node(key, pMemory);
-			node& v = convert_to_node(value, pMemory);
-			insert_map_pair(k, v);
-        }
-
-		template<typename T>
-		inline bool node_data::equals(node& node, const T& rhs, shared_memory_holder pMemory)
-		{
-			T lhs;
-			if(convert<T>::decode(Node(node, pMemory), lhs))
-				return lhs == rhs;
-			return false;
-		}
-		
-		inline bool node_data::equals(node& node, const char *rhs, shared_memory_holder pMemory)
-		{
-            return equals<std::string>(node, rhs, pMemory);
-		}
-
-        template<typename T>
-		inline node& node_data::convert_to_node(const T& rhs, shared_memory_holder pMemory)
-		{
-			Node value = convert<T>::encode(rhs);
-			value.EnsureNodeExists();
-			pMemory->merge(*value.m_pMemory);
-			return *value.m_pNode;
-		}
-	}
-}
-
-#endif // NODE_DETAIL_IMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/detail/iterator.h

@@ -1,64 +0,0 @@
-#ifndef VALUE_DETAIL_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define VALUE_DETAIL_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-#include "yaml-cpp/dll.h"
-#include "yaml-cpp/node/ptr.h"
-#include "yaml-cpp/node/detail/node_iterator.h"
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/utility.hpp>
-
-namespace YAML
-{
-	namespace detail
-	{
-		struct iterator_value;
-
-		template<typename V>
-		class iterator_base: public boost::iterator_adaptor<
-		iterator_base<V>,
-		node_iterator,
-		V,
-		std::forward_iterator_tag,
-		V>
-		{
-		private:
-			template<typename> friend class iterator_base;
-			struct enabler {};
-			typedef typename iterator_base::base_type base_type;
-            
-        public:
-			typedef typename iterator_base::value_type value_type;
-			
-		public:
-			iterator_base() {}
-			explicit iterator_base(base_type rhs, shared_memory_holder pMemory): iterator_base::iterator_adaptor_(rhs), m_pMemory(pMemory) {}
-			
-			template<class W>
-			iterator_base(const iterator_base<W>& rhs, typename boost::enable_if<boost::is_convertible<W*, V*>, enabler>::type = enabler()): iterator_base::iterator_adaptor_(rhs.base()), m_pMemory(rhs.m_pMemory) {}
-		
-		private:
-			friend class boost::iterator_core_access;
-
-			void increment() { this->base_reference() = boost::next(this->base()); }
-			
-			value_type dereference() const {
-				const typename base_type::value_type& v = *this->base();
-				if(v.pNode)
-					return value_type(Node(*v, m_pMemory));
-				if(v.first && v.second)
-					return value_type(Node(*v.first, m_pMemory), Node(*v.second, m_pMemory));
-				return value_type();
-			}
-		
-		private:
-			shared_memory_holder m_pMemory;
-		};
-	}
-}
-
-#endif // VALUE_DETAIL_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/detail/iterator_fwd.h

@@ -1,27 +0,0 @@
-#ifndef VALUE_DETAIL_ITERATOR_FWD_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define VALUE_DETAIL_ITERATOR_FWD_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-#include "yaml-cpp/dll.h"
-#include <list>
-#include <utility>
-#include <vector>
-
-namespace YAML
-{
-	class node;
-	
-	namespace detail {
-		struct iterator_value;
-		template<typename V> class iterator_base;
-	}
-
-	typedef detail::iterator_base<detail::iterator_value> iterator;
-	typedef detail::iterator_base<const detail::iterator_value> const_iterator;
-}
-
-#endif // VALUE_DETAIL_ITERATOR_FWD_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/detail/memory.h

@@ -1,39 +0,0 @@
-#ifndef VALUE_DETAIL_MEMORY_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define VALUE_DETAIL_MEMORY_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-#include "yaml-cpp/node/ptr.h"
-#include <set>
-#include <boost/shared_ptr.hpp>
-
-namespace YAML
-{
-	namespace detail
-	{
-		class memory {
-		public:
-			node& create_node();
-			void merge(const memory& rhs);
-			
-		private:
-			typedef std::set<shared_node> Nodes;
-			Nodes m_nodes;
-		};
-
-		class memory_holder {
-		public:
-			memory_holder(): m_pMemory(new memory) {}
-			
-			node& create_node() { return m_pMemory->create_node(); }
-			void merge(memory_holder& rhs);
-			
-		private:
-			boost::shared_ptr<memory> m_pMemory;
-		};
-	}
-}
-
-#endif // VALUE_DETAIL_MEMORY_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/detail/node.h

@@ -1,130 +0,0 @@
-#ifndef NODE_DETAIL_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define NODE_DETAIL_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-#include "yaml-cpp/dll.h"
-#include "yaml-cpp/node/type.h"
-#include "yaml-cpp/node/ptr.h"
-#include "yaml-cpp/node/detail/node_ref.h"
-#include <set>
-#include <boost/utility.hpp>
-
-namespace YAML
-{
-	namespace detail
-	{
-		class node: private boost::noncopyable
-		{
-		public:
-			node(): m_pRef(new node_ref) {}
-
-			bool is(const node& rhs) const { return m_pRef == rhs.m_pRef; }
-			const node_ref *ref() const { return m_pRef.get(); }
-			
-			bool is_defined() const { return m_pRef->is_defined(); }
-			NodeType::value type() const { return m_pRef->type(); }
-			
-			const std::string& scalar() const { return m_pRef->scalar(); }
-			const std::string& tag() const { return m_pRef->tag(); }
-			
-			void mark_defined() {
-				if(is_defined())
-					return;
-				
-				m_pRef->mark_defined();
-				for(nodes::iterator it=m_dependencies.begin();it!=m_dependencies.end();++it)
-					(*it)->mark_defined();
-				m_dependencies.clear();
-			}
-			
-			void add_dependency(node& rhs) {
-				if(is_defined())
-					rhs.mark_defined();
-				else
-					m_dependencies.insert(&rhs);
-			}
-			
-			void set_ref(const node& rhs) {
-				if(rhs.is_defined())
-					mark_defined();
-				m_pRef = rhs.m_pRef;
-			}
-			void set_data(const node& rhs) {
-				if(rhs.is_defined())
-					mark_defined();
-				m_pRef->set_data(*rhs.m_pRef);
-			}
-				
-			void set_type(NodeType::value type) {
-				if(type != NodeType::Undefined)
-					mark_defined();
-				m_pRef->set_type(type);
-			}
-			void set_null() {
-				mark_defined();
-				m_pRef->set_null();
-			}
-			void set_scalar(const std::string& scalar) {
-				mark_defined();
-				m_pRef->set_scalar(scalar);
-			}
-			void set_tag(const std::string& tag) {
-				mark_defined();
-				m_pRef->set_tag(tag);
-			}
-
-			// size/iterator
-			std::size_t size() const { return m_pRef->size(); }
-			
-			const_node_iterator begin() const { return static_cast<const node_ref&>(*m_pRef).begin(); }
-			node_iterator begin() { return m_pRef->begin(); }
-			
-			const_node_iterator end() const { return static_cast<const node_ref&>(*m_pRef).end(); }
-			node_iterator end() { return m_pRef->end(); }
-
-			// sequence
-			void push_back(node& node, shared_memory_holder pMemory) {
-				m_pRef->push_back(node, pMemory);
-				node.add_dependency(*this);
-			}
-			void insert(node& key, node& value, shared_memory_holder pMemory) {
-				m_pRef->insert(key, value, pMemory);
-				key.add_dependency(*this);
-				value.add_dependency(*this);
-			}
-
-			// indexing
-			template<typename Key> node& get(const Key& key, shared_memory_holder pMemory) const { return static_cast<const node_ref&>(*m_pRef).get(key, pMemory); }
-			template<typename Key> node& get(const Key& key, shared_memory_holder pMemory) {
-				node& value = m_pRef->get(key, pMemory);
-				value.add_dependency(*this);
-				return value;
-			}
-			template<typename Key> bool remove(const Key& key, shared_memory_holder pMemory) { return m_pRef->remove(key, pMemory); }
-			
-			node& get(node& key, shared_memory_holder pMemory) const { return static_cast<const node_ref&>(*m_pRef).get(key, pMemory); }
-			node& get(node& key, shared_memory_holder pMemory) {
-				node& value = m_pRef->get(key, pMemory);
-				key.add_dependency(*this);
-				value.add_dependency(*this);
-				return value;
-			}
-			bool remove(node& key, shared_memory_holder pMemory) { return m_pRef->remove(key, pMemory); }
-
-            // map
-            template<typename Key, typename Value>
-            void force_insert(const Key& key, const Value& value, shared_memory_holder pMemory){ m_pRef->force_insert(key, value, pMemory); }
-
-		private:
-			shared_node_ref m_pRef;
-			typedef std::set<node *> nodes;
-			nodes m_dependencies;
-		};
-	}
-}
-
-#endif // NODE_DETAIL_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/detail/node_data.h

@@ -1,110 +0,0 @@
-#ifndef VALUE_DETAIL_NODE_DATA_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define VALUE_DETAIL_NODE_DATA_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-#include "yaml-cpp/dll.h"
-#include "yaml-cpp/node/iterator.h"
-#include "yaml-cpp/node/ptr.h"
-#include "yaml-cpp/node/type.h"
-#include <boost/utility.hpp>
-#include <list>
-#include <utility>
-#include <vector>
-
-namespace YAML
-{
-	namespace detail
-	{
-		class node_data: private boost::noncopyable
-		{
-		public:
-			node_data();
-			
-			void mark_defined();
-			void set_type(NodeType::value type);
-			void set_tag(const std::string& tag);
-			void set_null();
-			void set_scalar(const std::string& scalar);
-			
-			bool is_defined() const { return m_isDefined; }
-			NodeType::value type() const { return m_isDefined ? m_type : NodeType::Undefined; }
-			const std::string& scalar() const { return m_scalar; }
-			const std::string& tag() const { return m_tag; }
-			
-			// size/iterator
-			std::size_t size() const;
-			
-			const_node_iterator begin() const;
-			node_iterator begin();
-			
-			const_node_iterator end() const;
-			node_iterator end();
-
-			// sequence
-			void push_back(node& node, shared_memory_holder pMemory);
-			void insert(node& key, node& value, shared_memory_holder pMemory);
-
-			// indexing
-			template<typename Key> node& get(const Key& key, shared_memory_holder pMemory) const;
-			template<typename Key> node& get(const Key& key, shared_memory_holder pMemory);
-			template<typename Key> bool remove(const Key& key, shared_memory_holder pMemory);
-			
-			node& get(node& key, shared_memory_holder pMemory) const;
-			node& get(node& key, shared_memory_holder pMemory);
-			bool remove(node& key, shared_memory_holder pMemory);
-            
-            // map
-            template<typename Key, typename Value>
-            void force_insert(const Key& key, const Value& value, shared_memory_holder pMemory);
-			
-		public:
-			static std::string empty_scalar;
-			
-		private:
-			void compute_seq_size() const;
-			void compute_map_size() const;
-
-			void reset_sequence();
-			void reset_map();
-			
-			void insert_map_pair(node& key, node& value);
-			void convert_to_map(shared_memory_holder pMemory);
-			void convert_sequence_to_map(shared_memory_holder pMemory);
-			
-			template<typename T>
-			static bool equals(node& node, const T& rhs, shared_memory_holder pMemory);
-			static bool equals(node& node, const char *rhs, shared_memory_holder pMemory);
-			
-			template<typename T>
-			static node& convert_to_node(const T& rhs, shared_memory_holder pMemory);
-
-		private:
-			bool m_isDefined;
-			NodeType::value m_type;
-			std::string m_tag;
-			
-			// scalar
-			std::string m_scalar;
-			
-			// sequence
-			typedef std::vector<node *> node_seq;
-			node_seq m_sequence;
-			
-			mutable std::size_t m_seqSize;
-			
-			// map
-			typedef std::map<node *, node *> node_map;
-			node_map m_map;
-			
-			typedef std::pair<node *, node *> kv_pair;
-			typedef std::list<kv_pair> kv_pairs;
-			mutable kv_pairs m_undefinedPairs;
-		};
-	}
-}
-
-#endif // VALUE_DETAIL_NODE_DATA_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/detail/node_iterator.h

@@ -1,139 +0,0 @@
-#ifndef VALUE_DETAIL_NODE_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define VALUE_DETAIL_NODE_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-#include "yaml-cpp/dll.h"
-#include "yaml-cpp/node/ptr.h"
-#include <boost/iterator/iterator_facade.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <map>
-#include <utility>
-#include <vector>
-
-namespace YAML
-{
-	namespace detail
-	{
-		struct iterator_type { enum value { None, Sequence, Map }; };
-		
-		template<typename V>
-		struct node_iterator_value: public std::pair<V*, V*> {
-			typedef std::pair<V*, V*> kv;
-			
-			node_iterator_value(): kv(), pNode(0) {}
-			explicit node_iterator_value(V& rhs): kv(), pNode(&rhs) {}
-			explicit node_iterator_value(V& key, V& value): kv(&key, &value), pNode(0) {}
-			
-			V& operator *() const { return *pNode; }
-			V& operator ->() const { return *pNode; }
-			
-			V *pNode;
-		};
-		
-		typedef std::vector<node *> node_seq;
-		typedef std::map<node *, node *> node_map;
-		
-		template<typename V>
-		struct node_iterator_type {
-			typedef node_seq::iterator seq;
-			typedef node_map::iterator map;
-		};
-		
-		template<typename V>
-		struct node_iterator_type<const V> {
-			typedef node_seq::const_iterator seq;
-			typedef node_map::const_iterator map;
-		};
-		
-
-		template<typename V>
-		class node_iterator_base: public boost::iterator_facade<
-		node_iterator_base<V>,
-		node_iterator_value<V>,
-		std::forward_iterator_tag,
-		node_iterator_value<V> >
-		{
-		private:
-			struct enabler {};
-			
-		public:
-			typedef typename node_iterator_type<V>::seq SeqIter;
-			typedef typename node_iterator_type<V>::map MapIter;
-			typedef node_iterator_value<V> value_type;
-			
-			node_iterator_base(): m_type(iterator_type::None) {}
-			explicit node_iterator_base(SeqIter seqIt): m_type(iterator_type::Sequence), m_seqIt(seqIt) {}
-			explicit node_iterator_base(MapIter mapIt, MapIter mapEnd): m_type(iterator_type::Map), m_mapIt(mapIt), m_mapEnd(mapEnd) {
-				m_mapIt = increment_until_defined(m_mapIt);
-			}
-			
-			template<typename W>
-			node_iterator_base(const node_iterator_base<W>& rhs, typename boost::enable_if<boost::is_convertible<W*, V*>, enabler>::type = enabler())
-			: m_type(rhs.m_type), m_seqIt(rhs.m_seqIt), m_mapIt(rhs.m_mapIt), m_mapEnd(rhs.m_mapEnd) {}
-			
-		private:
-			friend class boost::iterator_core_access;
-			template<typename> friend class node_iterator_base;
-			
-			template<typename W>
-			bool equal(const node_iterator_base<W>& rhs) const {
-				if(m_type != rhs.m_type)
-					return false;
-				
-				switch(m_type) {
-					case iterator_type::None: return true;
-					case iterator_type::Sequence: return m_seqIt == rhs.m_seqIt;
-					case iterator_type::Map: return m_mapIt == rhs.m_mapIt;
-				}
-				return true;
-			}
-			
-			void increment() {
-				switch(m_type) {
-					case iterator_type::None: break;
-					case iterator_type::Sequence:
-						++m_seqIt;
-						break;
-					case iterator_type::Map:
-						++m_mapIt;
-						m_mapIt = increment_until_defined(m_mapIt);
-						break;
-				}
-			}
-
-			value_type dereference() const {
-				switch(m_type) {
-					case iterator_type::None: return value_type();
-					case iterator_type::Sequence: return value_type(**m_seqIt);
-					case iterator_type::Map: return value_type(*m_mapIt->first, *m_mapIt->second);
-				}
-				return value_type();
-			}
-			
-			MapIter increment_until_defined(MapIter it) {
-				while(it != m_mapEnd && !is_defined(it))
-					++it;
-				return it;
-			}
-			
-			bool is_defined(MapIter it) const {
-				return it->first->is_defined() && it->second->is_defined();
-			}
-
-		private:
-			typename iterator_type::value m_type;
-
-			SeqIter m_seqIt;
-			MapIter m_mapIt, m_mapEnd;
-		};
-
-		typedef node_iterator_base<node> node_iterator;
-		typedef node_iterator_base<const node> const_node_iterator;
-	}
-}
-
-#endif // VALUE_DETAIL_NODE_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/detail/node_ref.h

@@ -1,69 +0,0 @@
-#ifndef VALUE_DETAIL_NODE_REF_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define VALUE_DETAIL_NODE_REF_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-#include "yaml-cpp/dll.h"
-#include "yaml-cpp/node/type.h"
-#include "yaml-cpp/node/ptr.h"
-#include "yaml-cpp/node/detail/node_data.h"
-#include <boost/utility.hpp>
-
-namespace YAML
-{
-	namespace detail
-	{
-		class node_ref: private boost::noncopyable
-		{
-		public:
-			node_ref(): m_pData(new node_data) {}
-			
-			bool is_defined() const { return m_pData->is_defined(); }
-			NodeType::value type() const { return m_pData->type(); }
-			const std::string& scalar() const { return m_pData->scalar(); }
-			const std::string& tag() const { return m_pData->tag(); }
-			
-			void mark_defined() { m_pData->mark_defined(); }
-			void set_data(const node_ref& rhs) { m_pData = rhs.m_pData; }
-			
-			void set_type(NodeType::value type) { m_pData->set_type(type); }
-			void set_tag(const std::string& tag) { m_pData->set_tag(tag); }
-			void set_null() { m_pData->set_null(); }
-			void set_scalar(const std::string& scalar) { m_pData->set_scalar(scalar); }
-			
-			// size/iterator
-			std::size_t size() const { return m_pData->size(); }
-			
-			const_node_iterator begin() const { return static_cast<const node_data&>(*m_pData).begin(); }
-			node_iterator begin() {return m_pData->begin(); }
-			
-			const_node_iterator end() const { return static_cast<const node_data&>(*m_pData).end(); }
-			node_iterator end() {return m_pData->end(); }
-
-			// sequence
-			void push_back(node& node, shared_memory_holder pMemory) { m_pData->push_back(node, pMemory); }
-			void insert(node& key, node& value, shared_memory_holder pMemory) { m_pData->insert(key, value, pMemory); }
-			
-			// indexing
-			template<typename Key> node& get(const Key& key, shared_memory_holder pMemory) const { return static_cast<const node_data&>(*m_pData).get(key, pMemory); }
-			template<typename Key> node& get(const Key& key, shared_memory_holder pMemory) { return m_pData->get(key, pMemory); }
-			template<typename Key> bool remove(const Key& key, shared_memory_holder pMemory) { return m_pData->remove(key, pMemory); }
-			
-			node& get(node& key, shared_memory_holder pMemory) const { return static_cast<const node_data&>(*m_pData).get(key, pMemory); }
-			node& get(node& key, shared_memory_holder pMemory) { return m_pData->get(key, pMemory); }
-			bool remove(node& key, shared_memory_holder pMemory) { return m_pData->remove(key, pMemory); }
-            
-            // map
-            template<typename Key, typename Value>
-            void force_insert(const Key& key, const Value& value, shared_memory_holder pMemory) { m_pData->force_insert(key, value, pMemory); }
-
-		private:
-			shared_node_data m_pData;
-		};
-	}
-}
-
-#endif // VALUE_DETAIL_NODE_REF_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/emit.h

@@ -1,23 +0,0 @@
-#ifndef NODE_EMIT_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define NODE_EMIT_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-#include <string>
-#include <iosfwd>
-
-namespace YAML
-{
-	class Emitter;
-	class Node;
-	
-	Emitter& operator << (Emitter& out, const Node& node);
-	std::ostream& operator << (std::ostream& out, const Node& node);
-	
-	std::string Dump(const Node& node);
-}
-
-#endif // NODE_EMIT_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-

include/yaml-cpp/node/impl.h

@@ -1,451 +0,0 @@
-#ifndef NODE_IMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define NODE_IMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-#include "yaml-cpp/node/node.h"
-#include "yaml-cpp/node/iterator.h"
-#include "yaml-cpp/node/detail/memory.h"
-#include "yaml-cpp/node/detail/node.h"
-#include "yaml-cpp/exceptions.h"
-#include <string>
-
-namespace YAML
-{
-	inline Node::Node(): m_isValid(true), m_pNode(NULL)
-	{
-	}
-	
-	inline Node::Node(NodeType::value type): m_isValid(true), m_pMemory(new detail::memory_holder), m_pNode(&m_pMemory->create_node())
-	{
-		m_pNode->set_type(type);
-	}
-	
-	template<typename T>
-	inline Node::Node(const T& rhs): m_isValid(true), m_pMemory(new detail::memory_holder), m_pNode(&m_pMemory->create_node())
-	{
-		Assign(rhs);
-	}
-	
-    inline Node::Node(const detail::iterator_value& rhs): m_isValid(rhs.m_isValid), m_pMemory(rhs.m_pMemory), m_pNode(rhs.m_pNode)
-    {
-    }
-
-	inline Node::Node(const Node& rhs): m_isValid(rhs.m_isValid), m_pMemory(rhs.m_pMemory), m_pNode(rhs.m_pNode)
-	{
-	}
-	
-    inline Node::Node(Zombie): m_isValid(false), m_pNode(NULL)
-    {
-    }
-
-    inline Node::Node(detail::node& node, detail::shared_memory_holder pMemory): m_isValid(true), m_pMemory(pMemory), m_pNode(&node)
-	{
-	}
-
-	inline Node::~Node()
-	{
-	}
-
-	inline void Node::EnsureNodeExists() const
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		if(!m_pNode) {
-			m_pMemory.reset(new detail::memory_holder);
-			m_pNode = &m_pMemory->create_node();
-			m_pNode->set_null();
-		}
-	}
-	
-	inline bool Node::IsDefined() const
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		return m_pNode ? m_pNode->is_defined() : true;
-	}
-
-	inline NodeType::value Node::Type() const
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		return m_pNode ? m_pNode->type() : NodeType::Null;
-	}
-	
-	// access
-    
-    // template helpers
-    template<typename T, typename S>
-    struct as_if {
-        explicit as_if(const Node& node_): node(node_) {}
-        const Node& node;
-        
-        const T operator()(const S& fallback) const {
-            if(!node.m_pNode)
-                return fallback;
-            
-            T t;
-            if(convert<T>::decode(node, t))
-                return t;
-            return fallback;
-        }
-    };
-    
-    template<typename S>
-    struct as_if<std::string, S> {
-        explicit as_if(const Node& node_): node(node_) {}
-        const Node& node;
-        
-        const std::string operator()(const S& fallback) const {
-            if(node.Type() != NodeType::Scalar)
-                return fallback;
-            return node.Scalar();
-        }
-    };
-    
-    template<typename T>
-    struct as_if<T, void> {
-        explicit as_if(const Node& node_): node(node_) {}
-        const Node& node;
-        
-        const T operator()() const {
-            if(!node.m_pNode)
-                throw TypedBadConversion<T>();
-			
-            T t;
-            if(convert<T>::decode(node, t))
-                return t;
-            throw TypedBadConversion<T>();
-        }
-    };
-    
-    template<>
-    struct as_if<std::string, void> {
-        explicit as_if(const Node& node_): node(node_) {}
-        const Node& node;
-        
-        const std::string operator()() const {
-            if(node.Type() != NodeType::Scalar)
-                throw TypedBadConversion<std::string>();
-            return node.Scalar();
-        }
-    };
-
-    // access functions
-	template<typename T>
-	inline const T Node::as() const
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-        return as_if<T, void>(*this)();
-	}
-
-    template<typename T, typename S>
-    inline const T Node::as(const S& fallback) const
-    {
-        if(!m_isValid)
-            throw InvalidNode();
-        return as_if<T, S>(*this)(fallback);
-    }
-    
-	inline const std::string& Node::Scalar() const
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		return m_pNode ? m_pNode->scalar() : detail::node_data::empty_scalar;
-	}
-
-	inline const std::string& Node::Tag() const
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		return m_pNode ? m_pNode->tag() : detail::node_data::empty_scalar;
-	}
-
-	inline void Node::SetTag(const std::string& tag)
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		EnsureNodeExists();
-		m_pNode->set_tag(tag);
-	}
-
-	// assignment
-	inline bool Node::is(const Node& rhs) const
-	{
-        if(!m_isValid || !rhs.m_isValid)
-            throw InvalidNode();
-        if(!m_pNode || !rhs.m_pNode)
-            return false;
-		return m_pNode->is(*rhs.m_pNode);
-	}
-
-	template<typename T>
-	inline Node& Node::operator=(const T& rhs)
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		Assign(rhs);
-		return *this;
-	}
-	
-    inline void Node::reset(const YAML::Node& rhs)
-    {
-        if(!m_isValid || !rhs.m_isValid)
-            throw InvalidNode();
-        m_pMemory = rhs.m_pMemory;
-        m_pNode = rhs.m_pNode;
-    }
-
-	template<typename T>
-	inline void Node::Assign(const T& rhs)
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		AssignData(convert<T>::encode(rhs));
-	}
-
-	template<>
-	inline void Node::Assign(const std::string& rhs)
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		EnsureNodeExists();
-		m_pNode->set_scalar(rhs);
-	}
-
-	inline void Node::Assign(const char *rhs)
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		EnsureNodeExists();
-		m_pNode->set_scalar(rhs);
-	}
-
-	inline void Node::Assign(char *rhs)
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		EnsureNodeExists();
-		m_pNode->set_scalar(rhs);
-	}
-	
-	inline Node& Node::operator=(const Node& rhs)
-	{
-        if(!m_isValid || !rhs.m_isValid)
-            throw InvalidNode();
-		if(is(rhs))
-			return *this;
-		AssignNode(rhs);
-		return *this;
-	}
-
-	inline void Node::AssignData(const Node& rhs)
-	{
-        if(!m_isValid || !rhs.m_isValid)
-            throw InvalidNode();
-		EnsureNodeExists();
-		rhs.EnsureNodeExists();
-		
-		m_pNode->set_data(*rhs.m_pNode);
-		m_pMemory->merge(*rhs.m_pMemory);
-	}
-
-	inline void Node::AssignNode(const Node& rhs)
-	{
-        if(!m_isValid || !rhs.m_isValid)
-            throw InvalidNode();
-		rhs.EnsureNodeExists();
-
-		if(!m_pNode) {
-			m_pNode = rhs.m_pNode;
-			m_pMemory = rhs.m_pMemory;
-			return;
-		}
-
-		m_pNode->set_ref(*rhs.m_pNode);
-		m_pMemory->merge(*rhs.m_pMemory);
-		m_pNode = rhs.m_pNode;
-	}
-    
-	// size/iterator
-	inline std::size_t Node::size() const
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		return m_pNode ? m_pNode->size() : 0;
-	}
-
-	inline const_iterator Node::begin() const
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		return m_pNode ? const_iterator(m_pNode->begin(), m_pMemory) : const_iterator();
-	}
-	
-	inline iterator Node::begin()
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		return m_pNode ? iterator(m_pNode->begin(), m_pMemory) : iterator();
-	}
-
-	inline const_iterator Node::end() const
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		return m_pNode ? const_iterator(m_pNode->end(), m_pMemory) : const_iterator();
-	}
-
-	inline iterator Node::end()
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		return m_pNode ? iterator(m_pNode->end(), m_pMemory) : iterator();
-	}
-	
-	// sequence
-	template<typename T>
-	inline void Node::push_back(const T& rhs)
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		push_back(Node(rhs));
-	}
-	
-	inline void Node::push_back(const Node& rhs)
-	{
-        if(!m_isValid || !rhs.m_isValid)
-            throw InvalidNode();
-		EnsureNodeExists();
-		rhs.EnsureNodeExists();
-		
-		m_pNode->push_back(*rhs.m_pNode, m_pMemory);
-		m_pMemory->merge(*rhs.m_pMemory);
-	}
-
-    // helpers for indexing
-    namespace detail {
-        template<typename T>
-        struct to_value_t {
-            explicit to_value_t(const T& t_): t(t_) {}
-            const T& t;
-            typedef const T& return_type;
-            
-            const T& operator()() const { return t; }
-        };
-        
-        template<>
-        struct to_value_t<const char*> {
-            explicit to_value_t(const char *t_): t(t_) {}
-            const char *t;
-            typedef std::string return_type;
-            
-            const std::string operator()() const { return t; }
-        };
-        
-        template<>
-        struct to_value_t<char*> {
-            explicit to_value_t(char *t_): t(t_) {}
-            const char *t;
-            typedef std::string return_type;
-            
-            const std::string operator()() const { return t; }
-        };
-        
-        template<std::size_t N>
-        struct to_value_t<char [N]> {
-            explicit to_value_t(const char *t_): t(t_) {}
-            const char *t;
-            typedef std::string return_type;
-            
-            const std::string operator()() const { return t; }
-        };
-
-        // converts C-strings to std::strings so they can be copied
-        template<typename T>
-        inline typename to_value_t<T>::return_type to_value(const T& t) {
-            return to_value_t<T>(t)();
-        }
-    }
-
-	// indexing
-	template<typename Key>
-	inline const Node Node::operator[](const Key& key) const
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		EnsureNodeExists();
-		detail::node& value = static_cast<const detail::node&>(*m_pNode).get(detail::to_value(key), m_pMemory);
-		return Node(value, m_pMemory);
-	}
-	
-	template<typename Key>
-	inline Node Node::operator[](const Key& key)
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		EnsureNodeExists();
-		detail::node& value = m_pNode->get(detail::to_value(key), m_pMemory);
-		return Node(value, m_pMemory);
-	}
-	
-	template<typename Key>
-	inline bool Node::remove(const Key& key)
-	{
-        if(!m_isValid)
-            throw InvalidNode();
-		EnsureNodeExists();
-		return m_pNode->remove(detail::to_value(key), m_pMemory);
-	}
-	
-	inline const Node Node::operator[](const Node& key) const
-	{
-        if(!m_isValid || !key.m_isValid)
-            throw InvalidNode();
-		EnsureNodeExists();
-		key.EnsureNodeExists();
-		detail::node& value = static_cast<const detail::node&>(*m_pNode).get(*key.m_pNode, m_pMemory);
-		return Node(value, m_pMemory);
-	}
-	
-	inline Node Node::operator[](const Node& key)
-	{
-        if(!m_isValid || !key.m_isValid)
-            throw InvalidNode();
-		EnsureNodeExists();
-		key.EnsureNodeExists();
-		detail::node& value = m_pNode->get(*key.m_pNode, m_pMemory);
-		return Node(value, m_pMemory);
-	}
-	
-	inline bool Node::remove(const Node& key)
-	{
-        if(!m_isValid || !key.m_isValid)
-            throw InvalidNode();
-		EnsureNodeExists();
-		key.EnsureNodeExists();
-		return m_pNode->remove(*key.m_pNode, m_pMemory);
-	}
-    
-    // map
-    template<typename Key, typename Value>
-    inline void Node::force_insert(const Key& key, const Value& value)
-    {
-        if(!m_isValid)
-            throw InvalidNode();
-        EnsureNodeExists();
-		m_pNode->force_insert(detail::to_value(key), detail::to_value(value), m_pMemory);
-    }
-
-	// free functions
-	inline bool operator==(const Node& lhs, const Node& rhs)
-	{
-		return lhs.is(rhs);
-	}
-}
-
-#endif // NODE_IMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/iterator.h

@@ -1,28 +0,0 @@
-#ifndef VALUE_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define VALUE_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-#include "yaml-cpp/dll.h"
-#include "yaml-cpp/node/node.h"
-#include "yaml-cpp/node/detail/iterator_fwd.h"
-#include "yaml-cpp/node/detail/iterator.h"
-#include <list>
-#include <utility>
-#include <vector>
-
-namespace YAML
-{
-	namespace detail {
-		struct iterator_value: public Node, std::pair<Node, Node> {
-			iterator_value() {}
-			explicit iterator_value(const Node& rhs): Node(rhs), std::pair<Node, Node>(Node(Node::ZombieNode), Node(Node::ZombieNode)) {}
-			explicit iterator_value(const Node& key, const Node& value): Node(Node::ZombieNode), std::pair<Node, Node>(key, value) {}
-		};
-	}
-}
-
-#endif // VALUE_ITERATOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/node.h

@@ -1,116 +0,0 @@
-#ifndef NODE_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define NODE_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-#include "yaml-cpp/dll.h"
-#include "yaml-cpp/node/ptr.h"
-#include "yaml-cpp/node/type.h"
-#include "yaml-cpp/node/detail/iterator_fwd.h"
-#include "yaml-cpp/node/detail/bool_type.h"
-#include <stdexcept>
-
-namespace YAML
-{
-	class Node
-	{
-	public:
-		friend class NodeBuilder;
-		friend class NodeEvents;
-        friend struct detail::iterator_value;
-		friend class detail::node_data;
-		template<typename> friend class detail::iterator_base;
-        template<typename T, typename S> friend struct as_if;
-        
-        typedef YAML::iterator iterator;
-        typedef YAML::const_iterator const_iterator;
-		
-		Node();
-		explicit Node(NodeType::value type);
-		template<typename T> explicit Node(const T& rhs);
-        explicit Node(const detail::iterator_value& rhs);
-		Node(const Node& rhs);
-		~Node();
-		
-		NodeType::value Type() const;
-		bool IsDefined() const;
-		bool IsNull() const { return Type() == NodeType::Null; }
-		bool IsScalar() const { return Type() == NodeType::Scalar; }
-		bool IsSequence() const { return Type() == NodeType::Sequence; }
-		bool IsMap() const { return Type() == NodeType::Map; }
-		
-		// bool conversions
-		YAML_CPP_OPERATOR_BOOL();
-		bool operator!() const { return !IsDefined(); }
-		
-		// access
-		template<typename T> const T as() const;
-		template<typename T, typename S> const T as(const S& fallback) const;
-		const std::string& Scalar() const;
-		const std::string& Tag() const;
-		void SetTag(const std::string& tag);
-
-		// assignment
-		bool is(const Node& rhs) const;
-		template<typename T> Node& operator=(const T& rhs);
-		Node& operator=(const Node& rhs);
-        void reset(const Node& rhs = Node());
-        
-		// size/iterator
-		std::size_t size() const;
-
-		const_iterator begin() const;
-		iterator begin();
-		
-		const_iterator end() const;
-		iterator end();
-		
-		// sequence
-		template<typename T> void push_back(const T& rhs);
-		void push_back(const Node& rhs);
-		
-		// indexing
-		template<typename Key> const Node operator[](const Key& key) const;
-		template<typename Key> Node operator[](const Key& key);
-		template<typename Key> bool remove(const Key& key);
-
-		const Node operator[](const Node& key) const;
-		Node operator[](const Node& key);
-		bool remove(const Node& key);
-        
-        // map
-        template<typename Key, typename Value>
-        void force_insert(const Key& key, const Value& value);
-
-	private:
-        enum Zombie { ZombieNode };
-        explicit Node(Zombie);
-		explicit Node(detail::node& node, detail::shared_memory_holder pMemory);
-		
-		void EnsureNodeExists() const;
-		
-		template<typename T> void Assign(const T& rhs);
-		void Assign(const char *rhs);
-		void Assign(char *rhs);
-
-		void AssignData(const Node& rhs);
-		void AssignNode(const Node& rhs);
-		
-	private:
-        bool m_isValid;
-		mutable detail::shared_memory_holder m_pMemory;
-		mutable detail::node *m_pNode;
-	};
-
-	bool operator==(const Node& lhs, const Node& rhs);
-    
-    Node Clone(const Node& node);
-	
-	template<typename T>
-	struct convert;
-}
-
-#endif // NODE_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/parse.h

@@ -1,28 +0,0 @@
-#ifndef VALUE_PARSE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define VALUE_PARSE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-#include <iosfwd>
-#include <string>
-#include <vector>
-
-namespace YAML
-{
-	class Node;
-	
-	Node Load(const std::string& input);
-	Node Load(const char *input);
-	Node Load(std::istream& input);
-    Node LoadFile(const std::string& filename);
-
-	std::vector<Node> LoadAll(const std::string& input);
-	std::vector<Node> LoadAll(const char *input);
-	std::vector<Node> LoadAll(std::istream& input);
-    std::vector<Node> LoadAllFromFile(const std::string& filename);
-}
-
-#endif // VALUE_PARSE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-

include/yaml-cpp/node/ptr.h

@@ -1,29 +0,0 @@
-#ifndef VALUE_PTR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define VALUE_PTR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-#include "yaml-cpp/dll.h"
-#include <boost/shared_ptr.hpp>
-
-namespace YAML
-{
-	namespace detail {
-		class node;
-		class node_ref;
-		class node_data;
-		class memory;
-		class memory_holder;
-
-		typedef boost::shared_ptr<node> shared_node;
-		typedef boost::shared_ptr<node_ref> shared_node_ref;
-		typedef boost::shared_ptr<node_data> shared_node_data;
-		typedef boost::shared_ptr<memory_holder> shared_memory_holder;
-		typedef boost::shared_ptr<memory> shared_memory;
-	}
-}
-
-#endif // VALUE_PTR_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/node/type.h

@@ -1,14 +0,0 @@
-#ifndef VALUE_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define VALUE_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-namespace YAML
-{
-	struct NodeType { enum value { Undefined, Null, Scalar, Sequence, Map }; };	
-}
-
-#endif // VALUE_TYPE_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/noncopyable.h

@@ -1,25 +0,0 @@
-#ifndef NONCOPYABLE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define NONCOPYABLE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-#include "yaml-cpp/dll.h"
-
-namespace YAML
-{
-	// this is basically boost::noncopyable
-	class YAML_CPP_API noncopyable
-	{
-	protected:
-		noncopyable() {}
-		~noncopyable() {}
-			
-	private:
-		noncopyable(const noncopyable&);
-		const noncopyable& operator = (const noncopyable&);
-	};
-}
-
-#endif // NONCOPYABLE_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/ostream_wrapper.h

@@ -1,69 +0,0 @@
-#ifndef OSTREAM_WRAPPER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define OSTREAM_WRAPPER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-#include <string>
-#include <vector>
-
-namespace YAML
-{
-	class ostream_wrapper
-	{
-	public:
-		ostream_wrapper();
-        explicit ostream_wrapper(std::ostream& stream);
-		~ostream_wrapper();
-		
-        void write(const std::string& str);
-        void write(const char *str, std::size_t size);
-        
-        void set_comment() { m_comment = true; }
-
-		const char *str() const {
-            if(m_pStream) {
-                return 0;
-            } else {
-                m_buffer[m_pos] = '\0';
-                return &m_buffer[0];
-            }
-        }
-		
-		std::size_t row() const { return m_row; }
-		std::size_t col() const { return m_col; }
-		std::size_t pos() const { return m_pos; }
-        bool comment() const { return m_comment; }
-        
-    private:
-        void update_pos(char ch);
-		
-	private:
-        mutable std::vector<char> m_buffer;
-        std::ostream *m_pStream;
-
-		std::size_t m_pos;
-		std::size_t m_row, m_col;
-        bool m_comment;
-	};
-	
-    template<std::size_t N>
-	inline ostream_wrapper& operator << (ostream_wrapper& stream, const char (&str)[N]) {
-        stream.write(str, N-1);
-        return stream;
-    }
-    
-	inline ostream_wrapper& operator << (ostream_wrapper& stream, const std::string& str) {
-        stream.write(str);
-        return stream;
-    }
-    
-	inline ostream_wrapper& operator << (ostream_wrapper& stream, char ch) {
-        stream.write(&ch, 1);
-        return stream;
-    }
-}
-
-#endif // OSTREAM_WRAPPER_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/stlemitter.h

@@ -1,51 +0,0 @@
-#ifndef STLEMITTER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define STLEMITTER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-
-#include <vector>
-#include <list>
-#include <set>
-#include <map>
-
-namespace YAML
-{
-	template<typename Seq>
-	inline Emitter& EmitSeq(Emitter& emitter, const Seq& seq) {
-		emitter << BeginSeq;
-		for(typename Seq::const_iterator it=seq.begin();it!=seq.end();++it)
-			emitter << *it;
-		emitter << EndSeq;
-		return emitter;
-	}
-	
-	template<typename T>
-	inline Emitter& operator << (Emitter& emitter, const std::vector<T>& v) {
-		return EmitSeq(emitter, v);
-	}	
-
-	template<typename T>
-	inline Emitter& operator << (Emitter& emitter, const std::list<T>& v) {
-		return EmitSeq(emitter, v);
-	}
-
-	template<typename T>
-	inline Emitter& operator << (Emitter& emitter, const std::set<T>& v) {
-		return EmitSeq(emitter, v);
-	}
-	
-	template <typename K, typename V>
-	inline Emitter& operator << (Emitter& emitter, const std::map<K, V>& m) {
-		typedef typename std::map <K, V> map;
-		emitter << BeginMap;
-		for(typename map::const_iterator it=m.begin();it!=m.end();++it)
-			emitter << Key << it->first << Value << it->second;
-		emitter << EndMap;
-		return emitter;
-	}
-}
-
-#endif // STLEMITTER_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml-cpp/yaml.h

@@ -1,21 +0,0 @@
-#ifndef YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-#include "yaml-cpp/parser.h"
-#include "yaml-cpp/emitter.h"
-#include "yaml-cpp/stlemitter.h"
-#include "yaml-cpp/exceptions.h"
-
-#include "yaml-cpp/node/node.h"
-#include "yaml-cpp/node/impl.h"
-#include "yaml-cpp/node/convert.h"
-#include "yaml-cpp/node/iterator.h"
-#include "yaml-cpp/node/detail/impl.h"
-#include "yaml-cpp/node/parse.h"
-#include "yaml-cpp/node/emit.h"
-
-#endif // YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66

include/yaml.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#ifndef YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+
+#include "parser.h"
+#include "node.h"
+#include "stlnode.h"
+#include "iterator.h"
+#include "emitter.h"
+#include "stlemitter.h"
+#include "exceptions.h"
+
+#endif // YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66

license.txt

@@ -1,19 +1,19 @@
-Copyright (c) 2008 Jesse Beder.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+Copyright (c) 2008 Jesse Beder.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.

parse.vcproj

@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="parse"
+	ProjectGUID="{CD007B57-7812-4930-A5E2-6E5E56338814}"
+	RootNamespace="parse"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/D_SCL_SECURE_NO_WARNINGS"
+				Optimization="0"
+				AdditionalIncludeDirectories="include"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				DisableSpecificWarnings="4127;4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="yamlcppd.lib"
+				AdditionalLibraryDirectories="lib"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/D_SCL_SECURE_NO_WARNINGS"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="include"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4127;4355"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="yamlcpp.lib"
+				AdditionalLibraryDirectories="lib"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\util\parse.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

src/aliascontent.cpp

@@ -0,0 +1,83 @@
+#include "aliascontent.h"
+
+namespace YAML
+{
+	AliasContent::AliasContent(Content* pNodeContent): m_pRef(pNodeContent)
+	{
+	}
+
+	bool AliasContent::GetBegin(std::vector <Node *>::const_iterator& i) const
+	{
+		return m_pRef->GetBegin(i);
+	}
+
+	bool AliasContent::GetBegin(std::map <Node *, Node *, ltnode>::const_iterator& i) const
+	{
+		return m_pRef->GetBegin(i);
+	}
+
+	bool AliasContent::GetEnd(std::vector <Node *>::const_iterator& i) const
+	{
+		return m_pRef->GetEnd(i);
+	}
+
+	bool AliasContent::GetEnd(std::map <Node *, Node *, ltnode>::const_iterator& i) const
+	{
+		return m_pRef->GetEnd(i);
+	}
+
+	Node* AliasContent::GetNode(std::size_t n) const
+	{
+		return m_pRef->GetNode(n);
+	}
+
+	std::size_t AliasContent::GetSize() const
+	{
+		return m_pRef->GetSize();
+	}
+
+	bool AliasContent::IsScalar() const
+	{
+		return m_pRef->IsScalar();
+	}
+
+	bool AliasContent::IsMap() const
+	{
+		return m_pRef->IsMap();
+	}
+
+	bool AliasContent::IsSequence() const
+	{
+		return m_pRef->IsSequence();
+	}
+
+	bool AliasContent::GetScalar(std::string& scalar) const
+	{
+		return m_pRef->GetScalar(scalar);
+	}
+
+	void AliasContent::EmitEvents(AliasManager& am, EventHandler& eventHandler, const Mark& mark, const std::string& tag, anchor_t anchor) const
+	{
+		m_pRef->EmitEvents(am, eventHandler, mark, tag, anchor);
+	}
+
+	int AliasContent::Compare(Content *pContent)
+	{
+		return m_pRef->Compare(pContent);
+	}
+
+	int AliasContent::Compare(Scalar *pScalar)
+	{
+		return m_pRef->Compare(pScalar);
+	}
+
+	int AliasContent::Compare(Sequence *pSequence)
+	{
+		return m_pRef->Compare(pSequence);
+	}
+
+	int AliasContent::Compare(Map *pMap)
+	{
+		return m_pRef->Compare(pMap);
+	}
+}

src/aliascontent.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#ifndef ALIASCONTENT_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define ALIASCONTENT_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+
+#include "content.h"
+
+namespace YAML
+{
+	class AliasContent : public Content
+	{
+	public:
+		AliasContent(Content *pNodeContent);
+
+		virtual bool GetBegin(std::vector <Node *>::const_iterator&) const;
+		virtual bool GetBegin(std::map <Node *, Node *, ltnode>::const_iterator&) const;
+		virtual bool GetEnd(std::vector <Node *>::const_iterator&) const;
+		virtual bool GetEnd(std::map <Node *, Node *, ltnode>::const_iterator&) const;
+		virtual Node* GetNode(std::size_t) const;
+		virtual std::size_t GetSize() const;
+		virtual bool IsScalar() const;
+		virtual bool IsMap() const;
+		virtual bool IsSequence() const;
+
+		virtual bool GetScalar(std::string& s) const;
+		virtual void EmitEvents(AliasManager& am, EventHandler& eventHandler, const Mark& mark, const std::string& tag, anchor_t anchor) const;
+
+		virtual int Compare(Content *);
+		virtual int Compare(Scalar *);
+		virtual int Compare(Sequence *);
+		virtual int Compare(Map *);
+
+	private:
+		Content* m_pRef;
+	};
+}
+
+#endif // ALIASCONTENT_H_62B23520_7C8E_11DE_8A39_0800200C9A66

src/aliasmanager.cpp

@@ -0,0 +1,45 @@
+#include "aliasmanager.h"
+#include "node.h"
+#include <cassert>
+#include <sstream>
+
+namespace YAML
+{
+	AliasManager::AliasManager(): m_curAnchor(0)
+	{
+	}
+
+	void AliasManager::RegisterReference(const Node& node)
+	{
+		const Node *pIdentity = node.Identity();
+		m_newIdentityByOldIdentity.insert(std::make_pair(pIdentity, &node));
+		m_anchorByIdentity.insert(std::make_pair(&node, _CreateNewAnchor()));
+	}
+	
+	const Node *AliasManager::LookupReference(const Node& node) const
+	{
+		const Node *pIdentity = node.Identity();
+		return _LookupReference(*pIdentity);
+	}
+	
+	anchor_t AliasManager::LookupAnchor(const Node& node) const
+	{
+		AnchorByIdentity::const_iterator it = m_anchorByIdentity.find(&node);
+		if(it == m_anchorByIdentity.end())
+			assert(false); // TODO: throw
+		return it->second;
+	}
+
+	const Node *AliasManager::_LookupReference(const Node& oldIdentity) const
+	{
+		NodeByNode::const_iterator it = m_newIdentityByOldIdentity.find(&oldIdentity);
+		if(it == m_newIdentityByOldIdentity.end())
+			return 0;
+		return it->second;
+	}
+	
+	anchor_t AliasManager::_CreateNewAnchor()
+	{
+		return ++m_curAnchor;
+	}
+}

src/binary.cpp

@@ -1,93 +0,0 @@
-#include "yaml-cpp/binary.h"
-
-namespace YAML
-{
-    static const char encoding[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-    std::string EncodeBase64(const unsigned char *data, std::size_t size)
-    {
-        const char PAD = '=';
-        
-        std::string ret;
-        ret.resize(4 * size / 3 + 3);
-        char *out = &ret[0];
-        
-        std::size_t chunks = size / 3;
-        std::size_t remainder = size % 3;
-        
-        for(std::size_t i=0;i<chunks;i++, data += 3) {
-            *out++ = encoding[data[0] >> 2];
-            *out++ = encoding[((data[0] & 0x3) << 4) | (data[1] >> 4)];
-            *out++ = encoding[((data[1] & 0xf) << 2) | (data[2] >> 6)];
-            *out++ = encoding[data[2] & 0x3f];
-        }
-        
-        switch(remainder) {
-            case 0:
-                break;
-            case 1:
-                *out++ = encoding[data[0] >> 2];
-                *out++ = encoding[((data[0] & 0x3) << 4)];
-                *out++ = PAD;
-                *out++ = PAD;
-                break;
-            case 2:
-                *out++ = encoding[data[0] >> 2];
-                *out++ = encoding[((data[0] & 0x3) << 4) | (data[1] >> 4)];
-                *out++ = encoding[((data[1] & 0xf) << 2)];
-                *out++ = PAD;
-                break;
-        }
-        
-        ret.resize(out - &ret[0]);
-        return ret;
-    }
-    
-    static const unsigned char decoding[] = {
-        255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-        255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-        255,255,255,255,255,255,255,255,255,255,255, 62,255,255,255, 63,
-         52, 53, 54, 55, 56, 57, 58, 59, 60, 61,255,255,255,  0,255,255,
-        255,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
-         15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,255,255,255,255,255,
-        255, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-         41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,255,255,255,255,255,
-        255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-        255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-        255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-        255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-        255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-        255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-        255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-        255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-    };
-
-    std::vector<unsigned char> DecodeBase64(const std::string& input)
-    {
-        typedef std::vector<unsigned char> ret_type;
-        if(input.empty())
-            return ret_type();
-        
-        ret_type ret(3 * input.size() / 4 + 1);
-        unsigned char *out = &ret[0];
-        
-        unsigned value = 0;
-        for(std::size_t i=0;i<input.size();i++) {
-            unsigned char d = decoding[static_cast<unsigned>(input[i])];
-            if(d == 255)
-                return ret_type();
-
-            value = (value << 6) | d;
-            if(i % 4 == 3) {
-                *out++ = value >> 16;
-                if(i > 0 && input[i - 1] != '=')
-                    *out++ = value >> 8;
-                if(input[i] != '=')
-                    *out++ = value;
-            }
-        }
-        
-        ret.resize(out - &ret[0]);
-        return ret;
-    }
-}

src/collectionstack.h

@@ -1,10 +1,8 @@
+#pragma once
+
 #ifndef COLLECTIONSTACK_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define COLLECTIONSTACK_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
 
 #include <stack>
 #include <cassert>

src/content.cpp

@@ -0,0 +1,21 @@
+#include "content.h"
+#include "node.h"
+#include <cassert>
+
+namespace YAML
+{
+	void Content::SetData(const std::string&)
+	{
+		assert(false); // TODO: throw
+	}
+
+	void Content::Append(std::auto_ptr<Node>)
+	{
+		assert(false); // TODO: throw
+	}
+
+	void Content::Insert(std::auto_ptr<Node>, std::auto_ptr<Node>)
+	{
+		assert(false); // TODO: throw
+	}
+}

src/content.h

@@ -0,0 +1,60 @@
+#pragma once
+
+#ifndef CONTENT_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define CONTENT_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+
+#include "anchor.h"
+#include "exceptions.h"
+#include "ltnode.h"
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace YAML
+{
+	struct Mark;
+	struct NodeProperties;
+	class AliasManager;
+	class EventHandler;
+	class Map;
+	class Node;
+	class Scalar;
+	class Scanner;
+	class Sequence;
+
+	class Content
+	{
+	public:
+		Content() {}
+		virtual ~Content() {}
+
+		virtual bool GetBegin(std::vector <Node *>::const_iterator&) const { return false; }
+		virtual bool GetBegin(std::map <Node *, Node *, ltnode>::const_iterator&) const { return false; }
+		virtual bool GetEnd(std::vector <Node *>::const_iterator&) const { return false; }
+		virtual bool GetEnd(std::map <Node *, Node *, ltnode>::const_iterator&) const { return false; }
+		virtual Node *GetNode(std::size_t) const { return 0; }
+		virtual std::size_t GetSize() const { return 0; }
+		virtual bool IsScalar() const { return false; }
+		virtual bool IsMap() const { return false; }
+		virtual bool IsSequence() const { return false; }
+		
+		virtual void SetData(const std::string& data);
+		virtual void Append(std::auto_ptr<Node> pNode);
+		virtual void Insert(std::auto_ptr<Node> pKey, std::auto_ptr<Node> pValue);
+		virtual void EmitEvents(AliasManager& am, EventHandler& eventHandler, const Mark& mark, const std::string& tag, anchor_t anchor) const = 0;
+
+		// extraction
+		virtual bool GetScalar(std::string&) const { return false; }
+
+		// ordering
+		virtual int Compare(Content *) { return 0; }
+		virtual int Compare(Scalar *) { return 0; }
+		virtual int Compare(Sequence *) { return 0; }
+		virtual int Compare(Map *) { return 0; }
+
+	protected:
+	};
+}
+
+#endif // CONTENT_H_62B23520_7C8E_11DE_8A39_0800200C9A66

src/contrib/graphbuilder.cpp

@@ -1,16 +0,0 @@
-#include "yaml-cpp/parser.h"
-#include "yaml-cpp/contrib/graphbuilder.h"
-#include "graphbuilderadapter.h"
-
-namespace YAML
-{
-  void *BuildGraphOfNextDocument(Parser& parser, GraphBuilderInterface& graphBuilder)
-  {
-    GraphBuilderAdapter eventHandler(graphBuilder);
-    if (parser.HandleNextDocument(eventHandler)) {
-      return eventHandler.RootNode();
-    } else {
-      return NULL;
-    }
-  }
-}

src/conversion.cpp

@@ -1,31 +1,33 @@
-#include "yaml-cpp/node/convert.h"
-#include "yaml-cpp/node/impl.h"
+#include "conversion.h"
 #include <algorithm>
 
+////////////////////////////////////////////////////////////////
+// Specializations for converting a string to specific types
+
 namespace
 {
 	// we're not gonna mess with the mess that is all the isupper/etc. functions
 	bool IsLower(char ch) { return 'a' <= ch && ch <= 'z'; }
 	bool IsUpper(char ch) { return 'A' <= ch && ch <= 'Z'; }
 	char ToLower(char ch) { return IsUpper(ch) ? ch + 'a' - 'A' : ch; }
-	
+
 	std::string tolower(const std::string& str)
 	{
 		std::string s(str);
 		std::transform(s.begin(), s.end(), s.begin(), ToLower);
 		return s;
 	}
-	
+
 	template <typename T>
 	bool IsEntirely(const std::string& str, T func)
 	{
 		for(std::size_t i=0;i<str.size();i++)
 			if(!func(str[i]))
 				return false;
-		
+
 		return true;
 	}
-	
+
 	// IsFlexibleCase
 	// . Returns true if 'str' is:
 	//   . UPPERCASE
@@ -35,10 +37,10 @@ namespace
 	{
 		if(str.empty())
 			return true;
-		
+
 		if(IsEntirely(str, IsLower))
 			return true;
-		
+
 		bool firstcaps = IsUpper(str[0]);
 		std::string rest = str.substr(1);
 		return firstcaps && (IsEntirely(rest, IsLower) || IsEntirely(rest, IsUpper));
@@ -47,10 +49,8 @@ namespace
 
 namespace YAML
 {
-	bool convert<bool>::decode(const Node& node, bool& rhs) {
-		if(!node.IsScalar())
-			return false;
-		
+	bool Convert(const std::string& input, bool& b)
+	{
 		// we can't use iostream bool extraction operators as they don't
 		// recognize all possible values in the table below (taken from
 		// http://yaml.org/type/bool.html)
@@ -62,22 +62,28 @@ namespace YAML
 			{ "true", "false" },
 			{ "on", "off" },
 		};
-		
-		if(!IsFlexibleCase(node.Scalar()))
+
+		if(!IsFlexibleCase(input))
 			return false;
-		
+
 		for(unsigned i=0;i<sizeof(names)/sizeof(names[0]);i++) {
-			if(names[i].truename == tolower(node.Scalar())) {
-				rhs = true;
+			if(names[i].truename == tolower(input)) {
+				b = true;
 				return true;
 			}
-			
-			if(names[i].falsename == tolower(node.Scalar())) {
-				rhs = false;
+
+			if(names[i].falsename == tolower(input)) {
+				b = false;
 				return true;
 			}
 		}
-		
+
 		return false;
 	}
+	
+	bool Convert(const std::string& input, _Null& /*output*/)
+	{
+		return input.empty() || input == "~" || input == "null" || input == "Null" || input == "NULL";
+	}
 }
+

src/directives.h

@@ -1,10 +1,8 @@
+#pragma once
+
 #ifndef DIRECTIVES_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define DIRECTIVES_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
 
 #include <string>
 #include <map>

src/emit.cpp

@@ -1,29 +0,0 @@
-#include "yaml-cpp/node/emit.h"
-#include "yaml-cpp/emitfromevents.h"
-#include "yaml-cpp/emitter.h"
-#include "nodeevents.h"
-
-namespace YAML
-{
-	Emitter& operator << (Emitter& out, const Node& node)
-	{
-		EmitFromEvents emitFromEvents(out);
-		NodeEvents events(node);
-		events.Emit(emitFromEvents);
-		return out;
-	}
-	
-	std::ostream& operator << (std::ostream& out, const Node& node)
-	{
-		Emitter emitter(out);
-		emitter << node;
-		return out;
-	}
-
-	std::string Dump(const Node& node)
-	{
-		Emitter emitter;
-		emitter << node;
-		return emitter.c_str();
-	}
-}

src/emitfromevents.cpp

@@ -1,6 +1,6 @@
-#include "yaml-cpp/emitfromevents.h"
-#include "yaml-cpp/emitter.h"
-#include "yaml-cpp/null.h"
+#include "emitfromevents.h"
+#include "emitter.h"
+#include "null.h"
 #include <cassert>
 #include <sstream>
 
@@ -26,11 +26,12 @@ namespace YAML
 	{
 	}
 	
-	void EmitFromEvents::OnNull(const Mark&, anchor_t anchor)
+	void EmitFromEvents::OnNull(const std::string& tag, anchor_t anchor)
 	{
 		BeginNode();
-		EmitProps("", anchor);
-		m_emitter << Null;
+		EmitProps(tag, anchor);
+		if(tag.empty())
+			m_emitter << Null;
 	}
 	
 	void EmitFromEvents::OnAlias(const Mark&, anchor_t anchor)
@@ -97,7 +98,7 @@ namespace YAML
 	
 	void EmitFromEvents::EmitProps(const std::string& tag, anchor_t anchor)
 	{
-		if(!tag.empty() && tag != "?")
+		if(!tag.empty())
 			m_emitter << VerbatimTag(tag);
 		if(anchor)
 			m_emitter << Anchor(ToString(anchor));

src/emitterstate.cpp

@@ -1,11 +1,13 @@
 #include "emitterstate.h"
-#include "yaml-cpp/exceptions.h"
-#include <limits>
+#include "exceptions.h"
 
 namespace YAML
 {
-	EmitterState::EmitterState(): m_isGood(true), m_curIndent(0), m_hasAnchor(false), m_hasTag(false), m_hasNonContent(false), m_docCount(0)
+	EmitterState::EmitterState(): m_isGood(true), m_curIndent(0), m_requiresSeparation(false)
 	{
+		// start up
+		m_stateStack.push(ES_WAITING_FOR_DOC);
+		
 		// set default global manipulators
 		m_charset.set(EmitNonAscii);
 		m_strFmt.set(Auto);
@@ -19,12 +21,22 @@ namespace YAML
 		m_seqFmt.set(Block);
 		m_mapFmt.set(Block);
 		m_mapKeyFmt.set(Auto);
-        m_floatPrecision.set(std::numeric_limits<float>::digits10 + 1);
-        m_doublePrecision.set(std::numeric_limits<double>::digits10 + 1);
 	}
 	
 	EmitterState::~EmitterState()
 	{
+		while(!m_groups.empty())
+			_PopGroup();
+	}
+	
+	std::auto_ptr <EmitterState::Group> EmitterState::_PopGroup()
+	{
+		if(m_groups.empty())
+			return std::auto_ptr <Group> (0);
+		
+		std::auto_ptr <Group> pGroup(m_groups.top());
+		m_groups.pop();
+		return pGroup;
 	}
 
 	// SetLocalValue
@@ -32,202 +44,98 @@ namespace YAML
 	// . Only the ones that make sense will be accepted
 	void EmitterState::SetLocalValue(EMITTER_MANIP value)
 	{
-		SetOutputCharset(value, FmtScope::Local);
-		SetStringFormat(value, FmtScope::Local);
-		SetBoolFormat(value, FmtScope::Local);
-		SetBoolCaseFormat(value, FmtScope::Local);
-		SetBoolLengthFormat(value, FmtScope::Local);
-		SetIntFormat(value, FmtScope::Local);
-		SetFlowType(GroupType::Seq, value, FmtScope::Local);
-		SetFlowType(GroupType::Map, value, FmtScope::Local);
-		SetMapKeyFormat(value, FmtScope::Local);
+		SetOutputCharset(value, LOCAL);
+		SetStringFormat(value, LOCAL);
+		SetBoolFormat(value, LOCAL);
+		SetBoolCaseFormat(value, LOCAL);
+		SetBoolLengthFormat(value, LOCAL);
+		SetIntFormat(value, LOCAL);
+		SetFlowType(GT_SEQ, value, LOCAL);
+		SetFlowType(GT_MAP, value, LOCAL);
+		SetMapKeyFormat(value, LOCAL);
 	}
 	
-    void EmitterState::SetAnchor()
-    {
-        m_hasAnchor = true;
-    }
-        
-    void EmitterState::SetTag()
-    {
-        m_hasTag = true;
-    }
-
-    void EmitterState::SetNonContent()
-    {
-        m_hasNonContent = true;
-    }
-
-    void EmitterState::SetLongKey()
-    {
-        assert(!m_groups.empty());        
-        if(m_groups.empty())
-            return;
-        
-        assert(m_groups.top().type == GroupType::Map);
-        m_groups.top().longKey = true;
-    }
-    
-    void EmitterState::ForceFlow()
-    {
-        assert(!m_groups.empty());
-        if(m_groups.empty())
-            return;
-        
-        m_groups.top().flowType = FlowType::Flow;
-    }
-
-    void EmitterState::StartedNode()
-    {
-        if(m_groups.empty()) {
-            m_docCount++;
-        } else {
-            m_groups.top().childCount++;
-            if(m_groups.top().childCount % 2 == 0)
-                m_groups.top().longKey = false;
-        }
-        
-        m_hasAnchor = false;
-        m_hasTag = false;
-        m_hasNonContent = false;
-    }
-
-    EmitterNodeType::value EmitterState::NextGroupType(GroupType::value type) const
-    {
-        if(type == GroupType::Seq) {
-            if(GetFlowType(type) == Block)
-                return EmitterNodeType::BlockSeq;
-            else
-                return EmitterNodeType::FlowSeq;
-        } else {
-            if(GetFlowType(type) == Block)
-                return EmitterNodeType::BlockMap;
-            else
-                return EmitterNodeType::FlowMap;
-        }
-        
-        // can't happen
-        assert(false);
-        return EmitterNodeType::None;
-    }
-    
-    void EmitterState::StartedDoc()
-    {
-        m_hasAnchor = false;
-        m_hasTag = false;
-        m_hasNonContent = false;
-    }
-    
-    void EmitterState::EndedDoc()
-    {
-        m_hasAnchor = false;
-        m_hasTag = false;
-        m_hasNonContent = false;
-    }
-
-    void EmitterState::StartedScalar()
-    {
-        StartedNode();
-        ClearModifiedSettings();
-    }
-
-	void EmitterState::StartedGroup(GroupType::value type)
+	void EmitterState::BeginGroup(GROUP_TYPE type)
 	{
-        StartedNode();
-
-		const int lastGroupIndent = (m_groups.empty() ? 0 : m_groups.top().indent);
-		m_curIndent += lastGroupIndent;
+		unsigned lastIndent = (m_groups.empty() ? 0 : m_groups.top()->indent);
+		m_curIndent += lastIndent;
 		
-		std::auto_ptr<Group> pGroup(new Group(type));
+		std::auto_ptr <Group> pGroup(new Group(type));
 		
 		// transfer settings (which last until this group is done)
 		pGroup->modifiedSettings = m_modifiedSettings;
 
 		// set up group
-        if(GetFlowType(type) == Block)
-            pGroup->flowType = FlowType::Block;
-        else
-            pGroup->flowType = FlowType::Flow;
+		pGroup->flow = GetFlowType(type);
 		pGroup->indent = GetIndent();
+		pGroup->usingLongKey = (GetMapKeyFormat() == LongKey ? true : false);
 
-		m_groups.push(pGroup);
+		m_groups.push(pGroup.release());
 	}
 	
-	void EmitterState::EndedGroup(GroupType::value type)
+	void EmitterState::EndGroup(GROUP_TYPE type)
 	{
-		if(m_groups.empty()) {
-            if(type == GroupType::Seq)
-                return SetError(ErrorMsg::UNEXPECTED_END_SEQ);
-            else
-                return SetError(ErrorMsg::UNEXPECTED_END_MAP);
-        }
+		if(m_groups.empty())
+			return SetError(ErrorMsg::UNMATCHED_GROUP_TAG);
 		
 		// get rid of the current group
 		{
-			std::auto_ptr<Group> pFinishedGroup = m_groups.pop();
+			std::auto_ptr <Group> pFinishedGroup = _PopGroup();
 			if(pFinishedGroup->type != type)
 				return SetError(ErrorMsg::UNMATCHED_GROUP_TAG);
 		}
 
 		// reset old settings
-		unsigned lastIndent = (m_groups.empty() ? 0 : m_groups.top().indent);
+		unsigned lastIndent = (m_groups.empty() ? 0 : m_groups.top()->indent);
 		assert(m_curIndent >= lastIndent);
 		m_curIndent -= lastIndent;
 		
 		// some global settings that we changed may have been overridden
 		// by a local setting we just popped, so we need to restore them
 		m_globalModifiedSettings.restore();
-
-        ClearModifiedSettings();
 	}
-
-    EmitterNodeType::value EmitterState::CurGroupNodeType() const
-    {
-        if(m_groups.empty())
-            return EmitterNodeType::None;
-        
-        return m_groups.top().NodeType();
-    }
-
-    GroupType::value EmitterState::CurGroupType() const
+		
+	GROUP_TYPE EmitterState::GetCurGroupType() const
 	{
-        return m_groups.empty() ? GroupType::None : m_groups.top().type;
+		if(m_groups.empty())
+			return GT_NONE;
+		
+		return m_groups.top()->type;
 	}
 	
-    FlowType::value EmitterState::CurGroupFlowType() const
+	FLOW_TYPE EmitterState::GetCurGroupFlowType() const
 	{
-        return m_groups.empty() ? FlowType::None : m_groups.top().flowType;
+		if(m_groups.empty())
+			return FT_NONE;
+		
+		return (m_groups.top()->flow == Flow ? FT_FLOW : FT_BLOCK);
+	}
+	
+	bool EmitterState::CurrentlyInLongKey()
+	{
+		if(m_groups.empty())
+			return false;
+		return m_groups.top()->usingLongKey;
+	}
+	
+	void EmitterState::StartLongKey()
+	{
+		if(!m_groups.empty())
+			m_groups.top()->usingLongKey = true;
+	}
+	
+	void EmitterState::StartSimpleKey()
+	{
+		if(!m_groups.empty())
+			m_groups.top()->usingLongKey = false;
 	}
-
-    int EmitterState::CurGroupIndent() const
-    {
-        return m_groups.empty() ? 0 : m_groups.top().indent;
-    }
-
-    std::size_t EmitterState::CurGroupChildCount() const
-    {
-        return m_groups.empty() ? m_docCount : m_groups.top().childCount;
-    }
-
-    bool EmitterState::CurGroupLongKey() const
-    {
-        return m_groups.empty() ? false : m_groups.top().longKey;
-    }
-
-    int EmitterState::LastIndent() const
-    {
-        if(m_groups.size() <= 1)
-            return 0;
-        
-        return m_curIndent - m_groups.top(-1).indent;
-    }
 
 	void EmitterState::ClearModifiedSettings()
 	{
 		m_modifiedSettings.clear();
 	}
 
-	bool EmitterState::SetOutputCharset(EMITTER_MANIP value, FmtScope::value scope)
+	bool EmitterState::SetOutputCharset(EMITTER_MANIP value, FMT_SCOPE scope)
 	{
 		switch(value) {
 			case EmitNonAscii:
@@ -239,7 +147,7 @@ namespace YAML
 		}
 	}
 	
-	bool EmitterState::SetStringFormat(EMITTER_MANIP value, FmtScope::value scope)
+	bool EmitterState::SetStringFormat(EMITTER_MANIP value, FMT_SCOPE scope)
 	{
 		switch(value) {
 			case Auto:
@@ -253,7 +161,7 @@ namespace YAML
 		}
 	}
 	
-	bool EmitterState::SetBoolFormat(EMITTER_MANIP value, FmtScope::value scope)
+	bool EmitterState::SetBoolFormat(EMITTER_MANIP value, FMT_SCOPE scope)
 	{
 		switch(value) {
 			case OnOffBool:
@@ -266,7 +174,7 @@ namespace YAML
 		}
 	}
 
-	bool EmitterState::SetBoolLengthFormat(EMITTER_MANIP value, FmtScope::value scope)
+	bool EmitterState::SetBoolLengthFormat(EMITTER_MANIP value, FMT_SCOPE scope)
 	{
 		switch(value) {
 			case LongBool:
@@ -278,7 +186,7 @@ namespace YAML
 		}
 	}
 
-	bool EmitterState::SetBoolCaseFormat(EMITTER_MANIP value, FmtScope::value scope)
+	bool EmitterState::SetBoolCaseFormat(EMITTER_MANIP value, FMT_SCOPE scope)
 	{
 		switch(value) {
 			case UpperCase:
@@ -291,7 +199,7 @@ namespace YAML
 		}
 	}
 
-	bool EmitterState::SetIntFormat(EMITTER_MANIP value, FmtScope::value scope)
+	bool EmitterState::SetIntFormat(EMITTER_MANIP value, FMT_SCOPE scope)
 	{
 		switch(value) {
 			case Dec:
@@ -304,16 +212,16 @@ namespace YAML
 		}
 	}
 
-	bool EmitterState::SetIndent(unsigned value, FmtScope::value scope)
+	bool EmitterState::SetIndent(unsigned value, FMT_SCOPE scope)
 	{
-		if(value <= 1)
+		if(value == 0)
 			return false;
 		
 		_Set(m_indent, value, scope);
 		return true;
 	}
 
-	bool EmitterState::SetPreCommentIndent(unsigned value, FmtScope::value scope)
+	bool EmitterState::SetPreCommentIndent(unsigned value, FMT_SCOPE scope)
 	{
 		if(value == 0)
 			return false;
@@ -322,7 +230,7 @@ namespace YAML
 		return true;
 	}
 	
-	bool EmitterState::SetPostCommentIndent(unsigned value, FmtScope::value scope)
+	bool EmitterState::SetPostCommentIndent(unsigned value, FMT_SCOPE scope)
 	{
 		if(value == 0)
 			return false;
@@ -331,29 +239,30 @@ namespace YAML
 		return true;
 	}
 
-	bool EmitterState::SetFlowType(GroupType::value groupType, EMITTER_MANIP value, FmtScope::value scope)
+	bool EmitterState::SetFlowType(GROUP_TYPE groupType, EMITTER_MANIP value, FMT_SCOPE scope)
 	{
 		switch(value) {
 			case Block:
 			case Flow:
-				_Set(groupType == GroupType::Seq ? m_seqFmt : m_mapFmt, value, scope);
+				_Set(groupType == GT_SEQ ? m_seqFmt : m_mapFmt, value, scope);
 				return true;
 			default:
 				return false;
 		}
 	}
 
-	EMITTER_MANIP EmitterState::GetFlowType(GroupType::value groupType) const
+	EMITTER_MANIP EmitterState::GetFlowType(GROUP_TYPE groupType) const
 	{
 		// force flow style if we're currently in a flow
-		if(CurGroupFlowType() == FlowType::Flow)
+		FLOW_TYPE flowType = GetCurGroupFlowType();
+		if(flowType == FT_FLOW)
 			return Flow;
 		
-		// otherwise, go with what's asked of us
-		return (groupType == GroupType::Seq ? m_seqFmt.get() : m_mapFmt.get());
+		// otherwise, go with what's asked of use
+		return (groupType == GT_SEQ ? m_seqFmt.get() : m_mapFmt.get());
 	}
 	
-	bool EmitterState::SetMapKeyFormat(EMITTER_MANIP value, FmtScope::value scope)
+	bool EmitterState::SetMapKeyFormat(EMITTER_MANIP value, FMT_SCOPE scope)
 	{
 		switch(value) {
 			case Auto:
@@ -364,21 +273,5 @@ namespace YAML
 				return false;
 		}
 	}
-
-    bool EmitterState::SetFloatPrecision(int value, FmtScope::value scope)
-    {
-        if(value < 0 || value > std::numeric_limits<float>::digits10 + 1)
-            return false;
-        _Set(m_floatPrecision, value, scope);
-        return true;
-    }
-    
-    bool EmitterState::SetDoublePrecision(int value, FmtScope::value scope)
-    {
-        if(value < 0 || value > std::numeric_limits<double>::digits10 + 1)
-            return false;
-        _Set(m_doublePrecision, value, scope);
-        return true;
-    }
 }
 

src/emitterstate.h

@@ -1,27 +1,75 @@
+#pragma once
+
 #ifndef EMITTERSTATE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define EMITTERSTATE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
 
-
-#include "ptr_stack.h"
 #include "setting.h"
-#include "yaml-cpp/emitterdef.h"
-#include "yaml-cpp/emittermanip.h"
+#include "emittermanip.h"
 #include <cassert>
 #include <vector>
 #include <stack>
 #include <memory>
-#include <stdexcept>
 
 namespace YAML
 {
-	struct FmtScope { enum value { Local, Global }; };
-	struct GroupType { enum value { None, Seq, Map }; };
-	struct FlowType { enum value { None, Flow, Block }; };
-
+	enum FMT_SCOPE {
+		LOCAL,
+		GLOBAL
+	};
+	
+	enum GROUP_TYPE {
+		GT_NONE,
+		GT_SEQ,
+		GT_MAP
+	};
+	
+	enum FLOW_TYPE {
+		FT_NONE,
+		FT_FLOW,
+		FT_BLOCK
+	};
+	
+	enum NODE_STATE {
+		NS_START,
+		NS_READY_FOR_ATOM,
+		NS_END
+	};
+	
+	enum EMITTER_STATE {
+		ES_WAITING_FOR_DOC,
+		ES_WRITING_DOC,
+		ES_DONE_WITH_DOC,
+		
+		// block seq
+		ES_WAITING_FOR_BLOCK_SEQ_ENTRY,
+		ES_WRITING_BLOCK_SEQ_ENTRY,
+		ES_DONE_WITH_BLOCK_SEQ_ENTRY,
+		
+		// flow seq
+		ES_WAITING_FOR_FLOW_SEQ_ENTRY,
+		ES_WRITING_FLOW_SEQ_ENTRY,
+		ES_DONE_WITH_FLOW_SEQ_ENTRY,
+		
+		// block map
+		ES_WAITING_FOR_BLOCK_MAP_ENTRY,
+		ES_WAITING_FOR_BLOCK_MAP_KEY,
+		ES_WRITING_BLOCK_MAP_KEY,
+		ES_DONE_WITH_BLOCK_MAP_KEY,
+		ES_WAITING_FOR_BLOCK_MAP_VALUE,
+		ES_WRITING_BLOCK_MAP_VALUE,
+		ES_DONE_WITH_BLOCK_MAP_VALUE,
+		
+		// flow map
+		ES_WAITING_FOR_FLOW_MAP_ENTRY,
+		ES_WAITING_FOR_FLOW_MAP_KEY,
+		ES_WRITING_FLOW_MAP_KEY,
+		ES_DONE_WITH_FLOW_MAP_KEY,
+		ES_WAITING_FOR_FLOW_MAP_VALUE,
+		ES_WRITING_FLOW_MAP_VALUE,
+		ES_DONE_WITH_FLOW_MAP_VALUE
+	};
+	
 	class EmitterState
 	{
 	public:
@@ -33,81 +81,68 @@ namespace YAML
 		const std::string GetLastError() const { return m_lastError; }
 		void SetError(const std::string& error) { m_isGood = false; m_lastError = error; }
 		
-		// node handling
-        void SetAnchor();
-        void SetTag();
-        void SetNonContent();
-        void SetLongKey();
-        void ForceFlow();
-        void StartedDoc();
-        void EndedDoc();
-        void StartedScalar();
-		void StartedGroup(GroupType::value type);
-		void EndedGroup(GroupType::value type);
+		// main state of the machine
+		EMITTER_STATE GetCurState() const { return m_stateStack.top(); }
+		void SwitchState(EMITTER_STATE state) { PopState(); PushState(state); }
+		void PushState(EMITTER_STATE state) { m_stateStack.push(state); }
+		void PopState() { m_stateStack.pop(); }
+		
+		void SetLocalValue(EMITTER_MANIP value);
+		
+		// group handling
+		void BeginGroup(GROUP_TYPE type);
+		void EndGroup(GROUP_TYPE type);
+		
+		GROUP_TYPE GetCurGroupType() const;
+		FLOW_TYPE GetCurGroupFlowType() const;
+		int GetCurIndent() const { return m_curIndent; }
+		
+		bool CurrentlyInLongKey();
+		void StartLongKey();
+		void StartSimpleKey();
 
-        EmitterNodeType::value NextGroupType(GroupType::value type) const;
-        EmitterNodeType::value CurGroupNodeType() const;
-
-		GroupType::value CurGroupType() const;
-        FlowType::value CurGroupFlowType() const;
-        int CurGroupIndent() const;
-        std::size_t CurGroupChildCount() const;
-        bool CurGroupLongKey() const;
-
-        int LastIndent() const;
-		int CurIndent() const { return m_curIndent; }
-        bool HasAnchor() const { return m_hasAnchor; }
-        bool HasTag() const { return m_hasTag; }
-        bool HasBegunNode() const { return m_hasAnchor || m_hasTag || m_hasNonContent; }
-        bool HasBegunContent() const { return m_hasAnchor || m_hasTag; }
+		bool RequiresSeparation() const { return m_requiresSeparation; }
+		void RequireSeparation() { m_requiresSeparation = true; }
+		void UnsetSeparation() { m_requiresSeparation = false; }
 
 		void ClearModifiedSettings();
 
 		// formatters
-		void SetLocalValue(EMITTER_MANIP value);
-
-		bool SetOutputCharset(EMITTER_MANIP value, FmtScope::value scope);
+		bool SetOutputCharset(EMITTER_MANIP value, FMT_SCOPE scope);
 		EMITTER_MANIP GetOutputCharset() const { return m_charset.get(); }
 
-		bool SetStringFormat(EMITTER_MANIP value, FmtScope::value scope);
+		bool SetStringFormat(EMITTER_MANIP value, FMT_SCOPE scope);
 		EMITTER_MANIP GetStringFormat() const { return m_strFmt.get(); }
 		
-		bool SetBoolFormat(EMITTER_MANIP value, FmtScope::value scope);
+		bool SetBoolFormat(EMITTER_MANIP value, FMT_SCOPE scope);
 		EMITTER_MANIP GetBoolFormat() const { return m_boolFmt.get(); }
 
-		bool SetBoolLengthFormat(EMITTER_MANIP value, FmtScope::value scope);
+		bool SetBoolLengthFormat(EMITTER_MANIP value, FMT_SCOPE scope);
 		EMITTER_MANIP GetBoolLengthFormat() const { return m_boolLengthFmt.get(); }
 
-		bool SetBoolCaseFormat(EMITTER_MANIP value, FmtScope::value scope);
+		bool SetBoolCaseFormat(EMITTER_MANIP value, FMT_SCOPE scope);
 		EMITTER_MANIP GetBoolCaseFormat() const { return m_boolCaseFmt.get(); }
 
-		bool SetIntFormat(EMITTER_MANIP value, FmtScope::value scope);
+		bool SetIntFormat(EMITTER_MANIP value, FMT_SCOPE scope);
 		EMITTER_MANIP GetIntFormat() const { return m_intFmt.get(); }
 
-		bool SetIndent(unsigned value, FmtScope::value scope);
+		bool SetIndent(unsigned value, FMT_SCOPE scope);
 		int GetIndent() const { return m_indent.get(); }
 		
-		bool SetPreCommentIndent(unsigned value, FmtScope::value scope);
+		bool SetPreCommentIndent(unsigned value, FMT_SCOPE scope);
 		int GetPreCommentIndent() const { return m_preCommentIndent.get(); }
-		bool SetPostCommentIndent(unsigned value, FmtScope::value scope);
+		bool SetPostCommentIndent(unsigned value, FMT_SCOPE scope);
 		int GetPostCommentIndent() const { return m_postCommentIndent.get(); }
 		
-		bool SetFlowType(GroupType::value groupType, EMITTER_MANIP value, FmtScope::value scope);
-		EMITTER_MANIP GetFlowType(GroupType::value groupType) const;
+		bool SetFlowType(GROUP_TYPE groupType, EMITTER_MANIP value, FMT_SCOPE scope);
+		EMITTER_MANIP GetFlowType(GROUP_TYPE groupType) const;
 		
-		bool SetMapKeyFormat(EMITTER_MANIP value, FmtScope::value scope);
+		bool SetMapKeyFormat(EMITTER_MANIP value, FMT_SCOPE scope);
 		EMITTER_MANIP GetMapKeyFormat() const { return m_mapKeyFmt.get(); }
-        
-        bool SetFloatPrecision(int value, FmtScope::value scope);
-        unsigned GetFloatPrecision() const { return m_floatPrecision.get(); }
-        bool SetDoublePrecision(int value, FmtScope::value scope);
-        unsigned GetDoublePrecision() const { return m_doublePrecision.get(); }
 		
 	private:
 		template <typename T>
-		void _Set(Setting<T>& fmt, T value, FmtScope::value scope);
-        
-        void StartedNode();
+		void _Set(Setting<T>& fmt, T value, FMT_SCOPE scope);
 		
 	private:
 		// basic state ok?
@@ -115,68 +150,48 @@ namespace YAML
 		std::string m_lastError;
 		
 		// other state
-		Setting<EMITTER_MANIP> m_charset;
-		Setting<EMITTER_MANIP> m_strFmt;
-		Setting<EMITTER_MANIP> m_boolFmt;
-		Setting<EMITTER_MANIP> m_boolLengthFmt;
-		Setting<EMITTER_MANIP> m_boolCaseFmt;
-		Setting<EMITTER_MANIP> m_intFmt;
-		Setting<unsigned> m_indent;
-		Setting<unsigned> m_preCommentIndent, m_postCommentIndent;
-		Setting<EMITTER_MANIP> m_seqFmt;
-		Setting<EMITTER_MANIP> m_mapFmt;
-		Setting<EMITTER_MANIP> m_mapKeyFmt;
-        Setting<int> m_floatPrecision;
-        Setting<int> m_doublePrecision;
+		std::stack <EMITTER_STATE> m_stateStack;
+		
+		Setting <EMITTER_MANIP> m_charset;
+		Setting <EMITTER_MANIP> m_strFmt;
+		Setting <EMITTER_MANIP> m_boolFmt;
+		Setting <EMITTER_MANIP> m_boolLengthFmt;
+		Setting <EMITTER_MANIP> m_boolCaseFmt;
+		Setting <EMITTER_MANIP> m_intFmt;
+		Setting <unsigned> m_indent;
+		Setting <unsigned> m_preCommentIndent, m_postCommentIndent;
+		Setting <EMITTER_MANIP> m_seqFmt;
+		Setting <EMITTER_MANIP> m_mapFmt;
+		Setting <EMITTER_MANIP> m_mapKeyFmt;
 		
 		SettingChanges m_modifiedSettings;
 		SettingChanges m_globalModifiedSettings;
 		
 		struct Group {
-			explicit Group(GroupType::value type_): type(type_), indent(0), childCount(0), longKey(false) {}
+			Group(GROUP_TYPE type_): type(type_), usingLongKey(false), indent(0) {}
 			
-            GroupType::value type;
-            FlowType::value flowType;
+			GROUP_TYPE type;
+			EMITTER_MANIP flow;
+			bool usingLongKey;
 			int indent;
-            std::size_t childCount;
-            bool longKey;
 			
 			SettingChanges modifiedSettings;
-            
-            EmitterNodeType::value NodeType() const {
-                if(type == GroupType::Seq) {
-                    if(flowType == FlowType::Flow)
-                        return EmitterNodeType::FlowSeq;
-                    else
-                        return EmitterNodeType::BlockSeq;
-                } else {
-                    if(flowType == FlowType::Flow)
-                        return EmitterNodeType::FlowMap;
-                    else
-                        return EmitterNodeType::BlockMap;
-                }
-
-                // can't get here
-                assert(false);
-                return EmitterNodeType::None;
-            }
 		};
-
-		ptr_stack<Group> m_groups;
+		
+		std::auto_ptr <Group> _PopGroup();
+		
+		std::stack <Group *> m_groups;
 		unsigned m_curIndent;
-        bool m_hasAnchor;
-        bool m_hasTag;
-        bool m_hasNonContent;
-        std::size_t m_docCount;
+		bool m_requiresSeparation;
 	};
 
 	template <typename T>
-	void EmitterState::_Set(Setting<T>& fmt, T value, FmtScope::value scope) {
+	void EmitterState::_Set(Setting<T>& fmt, T value, FMT_SCOPE scope) {
 		switch(scope) {
-			case FmtScope::Local:
+			case LOCAL:
 				m_modifiedSettings.push(fmt.set(value));
 				break;
-			case FmtScope::Global:
+			case GLOBAL:
 				fmt.set(value);
 				m_globalModifiedSettings.push(fmt.set(value));  // this pushes an identity set, so when we restore,
 				                                                // it restores to the value here, and not the previous one

src/emitterutils.cpp

@@ -1,8 +1,7 @@
 #include "emitterutils.h"
 #include "exp.h"
 #include "indentation.h"
-#include "yaml-cpp/binary.h"
-#include "yaml-cpp/exceptions.h"
+#include "exceptions.h"
 #include "stringsource.h"
 #include <sstream>
 #include <iomanip>
@@ -107,7 +106,7 @@ namespace YAML
 				return true;
 			}
 			
-			void WriteCodePoint(ostream_wrapper& out, int codePoint) {
+			void WriteCodePoint(ostream& out, int codePoint) {
 				if (codePoint < 0 || codePoint > 0x10FFFF) {
 					codePoint = REPLACEMENT_CHARACTER;
 				}
@@ -128,12 +127,9 @@ namespace YAML
 				}
 			}
 			
-			bool IsValidPlainScalar(const std::string& str, FlowType::value flowType, bool allowOnlyAscii) {
-				if(str.empty())
-					return false;
-				
+			bool IsValidPlainScalar(const std::string& str, bool inFlow, bool allowOnlyAscii) {
 				// first check the start
-				const RegEx& start = (flowType == FlowType::Flow ? Exp::PlainScalarInFlow() : Exp::PlainScalar());
+				const RegEx& start = (inFlow ? Exp::PlainScalarInFlow() : Exp::PlainScalar());
 				if(!start.Matches(str))
 					return false;
 				
@@ -142,7 +138,7 @@ namespace YAML
 					return false;
 
 				// then check until something is disallowed
-				const RegEx& disallowed = (flowType == FlowType::Flow ? Exp::EndScalarInFlow() : Exp::EndScalar())
+				const RegEx& disallowed = (inFlow ? Exp::EndScalarInFlow() : Exp::EndScalar())
 				                          || (Exp::BlankOrBreak() + Exp::Comment())
 				                          || Exp::NotPrintable()
 				                          || Exp::Utf8_ByteOrderMark()
@@ -152,7 +148,7 @@ namespace YAML
 				while(buffer) {
 					if(disallowed.Matches(buffer))
 						return false;
-					if(allowOnlyAscii && (0x80 <= static_cast<unsigned char>(buffer[0]))) 
+					if(allowOnlyAscii && (0x7F < static_cast<unsigned char>(buffer[0]))) 
 						return false;
 					++buffer;
 				}
@@ -160,53 +156,30 @@ namespace YAML
 				return true;
 			}
 
-			bool IsValidSingleQuotedScalar(const std::string& str, bool escapeNonAscii)
-            {
-                // TODO: check for non-printable characters?
-                for(std::size_t i=0;i<str.size();i++) {
-                    if(escapeNonAscii && (0x80 <= static_cast<unsigned char>(str[i])))
-                       return false;
-                    if(str[i] == '\n')
-                        return false;
-                }
-                return true;
-			}
-            
-            bool IsValidLiteralScalar(const std::string& str, FlowType::value flowType, bool escapeNonAscii)
-            {
-                if(flowType == FlowType::Flow)
-                    return false;
-
-                // TODO: check for non-printable characters?
-                for(std::size_t i=0;i<str.size();i++) {
-                    if(escapeNonAscii && (0x80 <= static_cast<unsigned char>(str[i])))
-                        return false;
-                }
-                return true;
-            }
-			
-            void WriteDoubleQuoteEscapeSequence(ostream_wrapper& out, int codePoint) {
+			void WriteDoubleQuoteEscapeSequence(ostream& out, int codePoint) {
 				static const char hexDigits[] = "0123456789abcdef";
 
-                out << "\\";
+				char escSeq[] = "\\U00000000";
 				int digits = 8;
-				if(codePoint < 0xFF) {
-                    out << "x";
+				if (codePoint < 0xFF) {
+					escSeq[1] = 'x';
 					digits = 2;
-				} else if(codePoint < 0xFFFF) {
-                    out << "u";
+				} else if (codePoint < 0xFFFF) {
+					escSeq[1] = 'u';
 					digits = 4;
-				} else {
-                    out << "U";
-                    digits = 8;
-                }
+				}
 
 				// Write digits into the escape sequence
-				for (; digits > 0; --digits)
-					out << hexDigits[(codePoint >> (4 * (digits - 1))) & 0xF];
+				int i = 2;
+				for (; digits > 0; --digits, ++i) {
+					escSeq[i] = hexDigits[(codePoint >> (4 * (digits - 1))) & 0xF];
+				}
+
+				escSeq[i] = 0; // terminate with NUL character
+				out << escSeq;
 			}
 
-			bool WriteAliasName(ostream_wrapper& out, const std::string& str) {
+			bool WriteAliasName(ostream& out, const std::string& str) {
 				int codePoint;
 				for(std::string::const_iterator i = str.begin();
 					GetNextCodePointAndAdvance(codePoint, i, str.end());
@@ -221,31 +194,16 @@ namespace YAML
 			}
 		}
 		
-        StringFormat::value ComputeStringFormat(const std::string& str, EMITTER_MANIP strFormat, FlowType::value flowType, bool escapeNonAscii)
-        {
-            switch(strFormat) {
-                case Auto:
-                    if(IsValidPlainScalar(str, flowType, escapeNonAscii))
-                        return StringFormat::Plain;
-                    return StringFormat::DoubleQuoted;
-                case SingleQuoted:
-                    if(IsValidSingleQuotedScalar(str, escapeNonAscii))
-                        return StringFormat::SingleQuoted;
-                    return StringFormat::DoubleQuoted;
-                case DoubleQuoted:
-                    return StringFormat::DoubleQuoted;
-                case Literal:
-                    if(IsValidLiteralScalar(str, flowType, escapeNonAscii))
-                        return StringFormat::Literal;
-                    return StringFormat::DoubleQuoted;
-                default:
-                    break;
-            }
-
-            return StringFormat::DoubleQuoted;
-        }
-
-		bool WriteSingleQuotedString(ostream_wrapper& out, const std::string& str)
+		bool WriteString(ostream& out, const std::string& str, bool inFlow, bool escapeNonAscii)
+		{
+			if(IsValidPlainScalar(str, inFlow, escapeNonAscii)) {
+				out << str;
+				return true;
+			} else
+				return WriteDoubleQuotedString(out, str, escapeNonAscii);
+		}
+		
+		bool WriteSingleQuotedString(ostream& out, const std::string& str)
 		{
 			out << "'";
 			int codePoint;
@@ -265,7 +223,7 @@ namespace YAML
 			return true;
 		}
 		
-		bool WriteDoubleQuotedString(ostream_wrapper& out, const std::string& str, bool escapeNonAscii)
+		bool WriteDoubleQuotedString(ostream& out, const std::string& str, bool escapeNonAscii)
 		{
 			out << "\"";
 			int codePoint;
@@ -273,29 +231,24 @@ namespace YAML
 				GetNextCodePointAndAdvance(codePoint, i, str.end());
 				) 
 			{
-                switch(codePoint) {
-                    case '\"': out << "\\\""; break;
-                    case '\\': out << "\\\\"; break;
-                    case '\n': out << "\\n"; break;
-                    case '\t': out << "\\t"; break;
-                    case '\r': out << "\\r"; break;
-                    case '\b': out << "\\b"; break;
-                    default:
-                        if(codePoint < 0x20 || (codePoint >= 0x80 && codePoint <= 0xA0)) // Control characters and non-breaking space
-                            WriteDoubleQuoteEscapeSequence(out, codePoint);
-                        else if (codePoint == 0xFEFF) // Byte order marks (ZWNS) should be escaped (YAML 1.2, sec. 5.2)	
-                            WriteDoubleQuoteEscapeSequence(out, codePoint);
-                        else if (escapeNonAscii && codePoint > 0x7E)
-                            WriteDoubleQuoteEscapeSequence(out, codePoint);
-                        else
-                            WriteCodePoint(out, codePoint);
-                }
+				if (codePoint == '\"')
+					out << "\\\"";
+				else if (codePoint == '\\')
+					out << "\\\\";
+				else if (codePoint < 0x20 || (codePoint >= 0x80 && codePoint <= 0xA0)) // Control characters and non-breaking space
+					WriteDoubleQuoteEscapeSequence(out, codePoint);
+				else if (codePoint == 0xFEFF) // Byte order marks (ZWNS) should be escaped (YAML 1.2, sec. 5.2)	
+					WriteDoubleQuoteEscapeSequence(out, codePoint);
+				else if (escapeNonAscii && codePoint > 0x7E)
+					WriteDoubleQuoteEscapeSequence(out, codePoint);
+				else
+					WriteCodePoint(out, codePoint);
 			}
 			out << "\"";
 			return true;
 		}
 
-		bool WriteLiteralString(ostream_wrapper& out, const std::string& str, int indent)
+		bool WriteLiteralString(ostream& out, const std::string& str, int indent)
 		{
 			out << "|\n";
 			out << IndentTo(indent);
@@ -312,59 +265,36 @@ namespace YAML
 			return true;
 		}
 		
-		bool WriteChar(ostream_wrapper& out, char ch)
+		bool WriteComment(ostream& out, const std::string& str, int postCommentIndent)
 		{
-			if(('a' <= ch && ch <= 'z') || ('A' <= ch && ch <= 'Z'))
-				out << ch;
-			else if((0x20 <= ch && ch <= 0x7e) || ch == ' ')
-				out << "\"" << ch << "\"";
-			else if(ch == '\t')
-				out << "\"\\t\"";
-			else if(ch == '\n')
-				out << "\"\\n\"";
-			else if(ch == '\b')
-				out << "\"\\b\"";
-			else {
-				out << "\"";
-				WriteDoubleQuoteEscapeSequence(out, ch);
-				out << "\"";
-			}
-			return true;
-		}
-
-		bool WriteComment(ostream_wrapper& out, const std::string& str, int postCommentIndent)
-		{
-			const unsigned curIndent = out.col();
+			unsigned curIndent = out.col();
 			out << "#" << Indentation(postCommentIndent);
-            out.set_comment();
 			int codePoint;
 			for(std::string::const_iterator i = str.begin();
 				GetNextCodePointAndAdvance(codePoint, i, str.end());
 				)
 			{
-				if(codePoint == '\n') {
+				if(codePoint == '\n')
 					out << "\n" << IndentTo(curIndent) << "#" << Indentation(postCommentIndent);
-                    out.set_comment();
-				} else {
+				else
 					WriteCodePoint(out, codePoint);
-                }
 			}
 			return true;
 		}
 
-		bool WriteAlias(ostream_wrapper& out, const std::string& str)
+		bool WriteAlias(ostream& out, const std::string& str)
 		{
 			out << "*";
 			return WriteAliasName(out, str);
 		}
 		
-		bool WriteAnchor(ostream_wrapper& out, const std::string& str)
+		bool WriteAnchor(ostream& out, const std::string& str)
 		{
 			out << "&";
 			return WriteAliasName(out, str);
 		}
 
-		bool WriteTag(ostream_wrapper& out, const std::string& str, bool verbatim)
+		bool WriteTag(ostream& out, const std::string& str, bool verbatim)
 		{
 			out << (verbatim ? "!<" : "!");
 			StringCharSource buffer(str.c_str(), str.size());
@@ -383,42 +313,6 @@ namespace YAML
 				out << ">";
 			return true;
 		}
-
-		bool WriteTagWithPrefix(ostream_wrapper& out, const std::string& prefix, const std::string& tag)
-		{
-			out << "!";
-			StringCharSource prefixBuffer(prefix.c_str(), prefix.size());
-			while(prefixBuffer) {
-				int n = Exp::URI().Match(prefixBuffer);
-				if(n <= 0)
-					return false;
-				
-				while(--n >= 0) {
-					out << prefixBuffer[0];
-					++prefixBuffer;
-				}
-			}
-
-			out << "!";
-			StringCharSource tagBuffer(tag.c_str(), tag.size());
-			while(tagBuffer) {
-				int n = Exp::Tag().Match(tagBuffer);
-				if(n <= 0)
-					return false;
-				
-				while(--n >= 0) {
-					out << tagBuffer[0];
-					++tagBuffer;
-				}
-			}
-			return true;
-		}
-
-		bool WriteBinary(ostream_wrapper& out, const Binary& binary)
-		{
-            WriteDoubleQuotedString(out, EncodeBase64(binary.data(), binary.size()), false);
-            return true;
-		}
 	}
 }
 

src/emitterutils.h

@@ -1,35 +1,24 @@
+#pragma once
+
 #ifndef EMITTERUTILS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define EMITTERUTILS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
 
-
-#include "emitterstate.h"
-#include "yaml-cpp/ostream_wrapper.h"
+#include "ostream.h"
 #include <string>
 
 namespace YAML
 {
-    class Binary;
-    
-    struct StringFormat { enum value { Plain, SingleQuoted, DoubleQuoted, Literal }; };
-
 	namespace Utils
 	{
-        StringFormat::value ComputeStringFormat(const std::string& str, EMITTER_MANIP strFormat, FlowType::value flowType, bool escapeNonAscii);
-        
-		bool WriteSingleQuotedString(ostream_wrapper& out, const std::string& str);
-		bool WriteDoubleQuotedString(ostream_wrapper& out, const std::string& str, bool escapeNonAscii);
-		bool WriteLiteralString(ostream_wrapper& out, const std::string& str, int indent);
-		bool WriteChar(ostream_wrapper& out, char ch);
-		bool WriteComment(ostream_wrapper& out, const std::string& str, int postCommentIndent);
-		bool WriteAlias(ostream_wrapper& out, const std::string& str);
-		bool WriteAnchor(ostream_wrapper& out, const std::string& str);
-		bool WriteTag(ostream_wrapper& out, const std::string& str, bool verbatim);
-		bool WriteTagWithPrefix(ostream_wrapper& out, const std::string& prefix, const std::string& tag);
-		bool WriteBinary(ostream_wrapper& out, const Binary& binary);
+		bool WriteString(ostream& out, const std::string& str, bool inFlow, bool escapeNonAscii);
+		bool WriteSingleQuotedString(ostream& out, const std::string& str);
+		bool WriteDoubleQuotedString(ostream& out, const std::string& str, bool escapeNonAscii);
+		bool WriteLiteralString(ostream& out, const std::string& str, int indent);
+		bool WriteComment(ostream& out, const std::string& str, int postCommentIndent);
+		bool WriteAlias(ostream& out, const std::string& str);
+		bool WriteAnchor(ostream& out, const std::string& str);
+		bool WriteTag(ostream& out, const std::string& str, bool verbatim);
 	}
 }
 

src/exp.cpp

@@ -1,5 +1,5 @@
 #include "exp.h"
-#include "yaml-cpp/exceptions.h"
+#include "exceptions.h"
 #include <sstream>
 
 namespace YAML
@@ -107,7 +107,7 @@ namespace YAML
 			}
 
 			std::stringstream msg;
-			throw ParserException(in.mark(), std::string(ErrorMsg::INVALID_ESCAPE) + ch);
+			throw ParserException(in.mark(), ErrorMsg::INVALID_ESCAPE + ch);
 		}
 	}
 }

src/exp.h

@@ -1,10 +1,8 @@
+#pragma once
+
 #ifndef EXP_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define EXP_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
 
 #include "regex.h"
 #include <string>
@@ -91,7 +89,7 @@ namespace YAML
 			return e;
 		}
 		inline const RegEx& Key() {
-			static const RegEx e = RegEx('?') + BlankOrBreak();
+			static const RegEx e = RegEx('?');
 			return e;
 		}
 		inline const RegEx& KeyInFlow() {
@@ -114,10 +112,6 @@ namespace YAML
 			static const RegEx e = RegEx('#');
 			return e;
 		}
-		inline const RegEx& Anchor() {
-			static const RegEx e = !(RegEx("[]{},", REGEX_OR) || BlankOrBreak());
-			return e;
-		}
 		inline const RegEx& AnchorEnd() {
 			static const RegEx e = RegEx("?:,]}%@`", REGEX_OR) || BlankOrBreak();
 			return e;
@@ -137,7 +131,7 @@ namespace YAML
 		// . In the block context - ? : must be not be followed with a space.
 		// . In the flow context ? is illegal and : and - must not be followed with a space.
 		inline const RegEx& PlainScalar() {
-			static const RegEx e = !(BlankOrBreak() || RegEx(",[]{}#&*!|>\'\"%@`", REGEX_OR) || (RegEx("-?:", REGEX_OR) + (BlankOrBreak() || RegEx())));
+			static const RegEx e = !(BlankOrBreak() || RegEx(",[]{}#&*!|>\'\"%@`", REGEX_OR) || (RegEx("-?:", REGEX_OR) + Blank()));
 			return e;
 		}
 		inline const RegEx& PlainScalarInFlow() {
@@ -149,7 +143,7 @@ namespace YAML
 			return e;
 		}
 		inline const RegEx& EndScalarInFlow() {
-			static const RegEx e = (RegEx(':') + (BlankOrBreak() || RegEx() || RegEx(",]}", REGEX_OR))) || RegEx(",?[]{}", REGEX_OR);
+			static const RegEx e = (RegEx(':') + (BlankOrBreak() || RegEx(",]}", REGEX_OR))) || RegEx(",?[]{}", REGEX_OR);
 			return e;
 		}
 

src/graphbuilderadapter.cpp

@@ -4,10 +4,10 @@ namespace YAML
 {
   int GraphBuilderAdapter::ContainerFrame::sequenceMarker;
   
-  void GraphBuilderAdapter::OnNull(const Mark& mark, anchor_t anchor)
+  void GraphBuilderAdapter::OnNull(const std::string& tag, anchor_t anchor)
   {
     void *pParent = GetCurrentParent();
-    void *pNode = m_builder.NewNull(mark, pParent);
+    void *pNode = m_builder.NewNull(tag, pParent);
     RegisterAnchor(anchor, pNode);
     
     DispositionNode(pNode);

src/graphbuilderadapter.h

@@ -1,16 +1,11 @@
 #ifndef GRAPHBUILDERADAPTER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define GRAPHBUILDERADAPTER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-#include <cstdlib>
 #include <map>
 #include <stack>
-#include "yaml-cpp/eventhandler.h"
-#include "yaml-cpp/contrib/anchordict.h"
-#include "yaml-cpp/contrib/graphbuilder.h"
+#include "anchordict.h"
+#include "eventhandler.h"
+#include "graphbuilder.h"
 
 namespace YAML
 {
@@ -25,7 +20,7 @@ namespace YAML
     virtual void OnDocumentStart(const Mark& mark) {(void)mark;}
     virtual void OnDocumentEnd() {}
     
-    virtual void OnNull(const Mark& mark, anchor_t anchor);
+    virtual void OnNull(const std::string& tag, anchor_t anchor);
     virtual void OnAlias(const Mark& mark, anchor_t anchor);
     virtual void OnScalar(const Mark& mark, const std::string& tag, anchor_t anchor, const std::string& value);
     

src/indentation.h

@@ -1,12 +1,10 @@
+#pragma once
+
 #ifndef INDENTATION_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define INDENTATION_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
 
-
-#include "yaml-cpp/ostream_wrapper.h"
+#include "ostream.h"
 #include <iostream>
 
 namespace YAML
@@ -16,7 +14,7 @@ namespace YAML
 		unsigned n;
 	};
 	
-	inline ostream_wrapper& operator << (ostream_wrapper& out, const Indentation& indent) {
+	inline ostream& operator << (ostream& out, const Indentation& indent) {
 		for(unsigned i=0;i<indent.n;i++)
 			out << ' ';
 		return out;
@@ -27,7 +25,7 @@ namespace YAML
 		unsigned n;
 	};
 	
-	inline ostream_wrapper& operator << (ostream_wrapper& out, const IndentTo& indent) {
+	inline ostream& operator << (ostream& out, const IndentTo& indent) {
 		while(out.col() < indent.n)
 			out << ' ';
 		return out;

src/iterator.cpp

@@ -0,0 +1,107 @@
+#include "node.h"
+#include "exceptions.h"
+#include "iterpriv.h"
+
+namespace YAML
+{
+	Iterator::Iterator(): m_pData(0)
+	{
+		m_pData = new IterPriv;
+	}
+
+	Iterator::Iterator(IterPriv *pData): m_pData(pData)
+	{
+	}
+
+	Iterator::Iterator(const Iterator& rhs): m_pData(0)
+	{
+		m_pData = new IterPriv(*rhs.m_pData);
+	}
+
+	Iterator& Iterator::operator = (const Iterator& rhs)
+	{
+		if(this == &rhs)
+			return *this;
+
+		delete m_pData;
+		m_pData = new IterPriv(*rhs.m_pData);
+		return *this;
+	}
+
+	Iterator::~Iterator()
+	{
+		delete m_pData;
+	}
+
+	Iterator& Iterator::operator ++ ()
+	{
+		if(m_pData->type == IterPriv::IT_SEQ)
+			++m_pData->seqIter;
+		else if(m_pData->type == IterPriv::IT_MAP)
+			++m_pData->mapIter;
+
+		return *this;
+	}
+
+	Iterator Iterator::operator ++ (int)
+	{
+		Iterator temp = *this;
+
+		if(m_pData->type == IterPriv::IT_SEQ)
+			++m_pData->seqIter;
+		else if(m_pData->type == IterPriv::IT_MAP)
+			++m_pData->mapIter;
+
+		return temp;
+	}
+
+	const Node& Iterator::operator * () const
+	{
+		if(m_pData->type == IterPriv::IT_SEQ)
+			return **m_pData->seqIter;
+
+		throw BadDereference();
+	}
+
+	const Node *Iterator::operator -> () const
+	{
+		if(m_pData->type == IterPriv::IT_SEQ)
+			return *m_pData->seqIter;
+
+		throw BadDereference();
+	}
+
+	const Node& Iterator::first() const
+	{
+		if(m_pData->type == IterPriv::IT_MAP)
+			return *m_pData->mapIter->first;
+
+		throw BadDereference();
+	}
+
+	const Node& Iterator::second() const
+	{
+		if(m_pData->type == IterPriv::IT_MAP)
+			return *m_pData->mapIter->second;
+
+		throw BadDereference();
+	}
+
+	bool operator == (const Iterator& it, const Iterator& jt)
+	{
+		if(it.m_pData->type != jt.m_pData->type)
+			return false;
+
+		if(it.m_pData->type == IterPriv::IT_SEQ)
+			return it.m_pData->seqIter == jt.m_pData->seqIter;
+		else if(it.m_pData->type == IterPriv::IT_MAP)
+			return it.m_pData->mapIter == jt.m_pData->mapIter;
+
+		return true;
+	}
+
+	bool operator != (const Iterator& it, const Iterator& jt)
+	{
+		return !(it == jt);
+	}
+}

src/iterpriv.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#ifndef ITERPRIV_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define ITERPRIV_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+
+#include "ltnode.h"
+#include <vector>
+#include <map>
+
+namespace YAML
+{
+	class Node;
+
+	// IterPriv
+	// . The implementation for iterators - essentially a union of sequence and map iterators.
+	struct IterPriv
+	{
+		IterPriv(): type(IT_NONE) {}
+		IterPriv(std::vector <Node *>::const_iterator it): type(IT_SEQ), seqIter(it) {}
+		IterPriv(std::map <Node *, Node *, ltnode>::const_iterator it): type(IT_MAP), mapIter(it) {}
+
+		enum ITER_TYPE { IT_NONE, IT_SEQ, IT_MAP };
+		ITER_TYPE type;
+
+		std::vector <Node *>::const_iterator seqIter;
+		std::map <Node *, Node *, ltnode>::const_iterator mapIter;
+	};
+}
+
+#endif // ITERPRIV_H_62B23520_7C8E_11DE_8A39_0800200C9A66

src/ltnode.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#ifndef LTNODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define LTNODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+
+namespace YAML
+{
+	class Node;
+
+	struct ltnode {
+		bool operator()(const Node *pNode1, const Node *pNode2) const;
+	};
+}
+
+#endif // LTNODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66

src/map.cpp

@@ -0,0 +1,91 @@
+#include "map.h"
+#include "node.h"
+#include "eventhandler.h"
+#include "exceptions.h"
+
+namespace YAML
+{
+	Map::Map()
+	{
+	}
+
+	Map::~Map()
+	{
+		Clear();
+	}
+
+	void Map::Clear()
+	{
+		for(node_map::const_iterator it=m_data.begin();it!=m_data.end();++it) {
+			delete it->first;
+			delete it->second;
+		}
+		m_data.clear();
+	}
+
+	bool Map::GetBegin(std::map <Node *, Node *, ltnode>::const_iterator& it) const
+	{
+		it = m_data.begin();
+		return true;
+	}
+
+	bool Map::GetEnd(std::map <Node *, Node *, ltnode>::const_iterator& it) const
+	{
+		it = m_data.end();
+		return true;
+	}
+
+	std::size_t Map::GetSize() const
+	{
+		return m_data.size();
+	}
+
+	void Map::Insert(std::auto_ptr<Node> pKey, std::auto_ptr<Node> pValue)
+	{
+		node_map::const_iterator it = m_data.find(pKey.get());
+		if(it != m_data.end())
+			return;
+		
+		m_data[pKey.release()] = pValue.release();
+	}
+
+	void Map::EmitEvents(AliasManager& am, EventHandler& eventHandler, const Mark& mark, const std::string& tag, anchor_t anchor) const
+	{
+		eventHandler.OnMapStart(mark, tag, anchor);
+		for(node_map::const_iterator it=m_data.begin();it!=m_data.end();++it) {
+			it->first->EmitEvents(am, eventHandler);
+			it->second->EmitEvents(am, eventHandler);
+		}
+		eventHandler.OnMapEnd();
+	}
+
+	int Map::Compare(Content *pContent)
+	{
+		return -pContent->Compare(this);
+	}
+
+	int Map::Compare(Map *pMap)
+	{
+		node_map::const_iterator it = m_data.begin(), jt = pMap->m_data.begin();
+		while(1) {
+			if(it == m_data.end()) {
+				if(jt == pMap->m_data.end())
+					return 0;
+				else
+					return -1;
+			}
+			if(jt == pMap->m_data.end())
+				return 1;
+
+			int cmp = it->first->Compare(*jt->first);
+			if(cmp != 0)
+				return cmp;
+
+			cmp = it->second->Compare(*jt->second);
+			if(cmp != 0)
+				return cmp;
+		}
+
+		return 0;
+	}
+}

src/map.h

@@ -0,0 +1,46 @@
+#pragma once
+
+#ifndef MAP_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define MAP_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+
+#include "content.h"
+#include <map>
+#include <memory>
+
+namespace YAML
+{
+	class Node;
+
+	class Map: public Content
+	{
+	private:
+		typedef std::map <Node *, Node *, ltnode> node_map;
+
+	public:
+		Map();
+		virtual ~Map();
+
+		void Clear();
+
+		virtual bool GetBegin(std::map <Node *, Node *, ltnode>::const_iterator& it) const;
+		virtual bool GetEnd(std::map <Node *, Node *, ltnode>::const_iterator& it) const;
+		virtual std::size_t GetSize() const;
+
+		virtual void Insert(std::auto_ptr<Node> pKey, std::auto_ptr<Node> pValue);
+		virtual void EmitEvents(AliasManager& am, EventHandler& eventHandler, const Mark& mark, const std::string& tag, anchor_t anchor) const;
+
+		virtual bool IsMap() const { return true; }
+
+		// ordering
+		virtual int Compare(Content *pContent);
+		virtual int Compare(Scalar *) { return 1; }
+		virtual int Compare(Sequence *) { return 1; }
+		virtual int Compare(Map *pMap);
+
+	private:
+		node_map m_data;
+	};
+}
+
+#endif // MAP_H_62B23520_7C8E_11DE_8A39_0800200C9A66

src/memory.cpp

@@ -1,29 +0,0 @@
-#include "yaml-cpp/node/detail/memory.h"
-#include "yaml-cpp/node/detail/node.h"
-
-namespace YAML
-{
-	namespace detail
-	{
-		void memory_holder::merge(memory_holder& rhs)
-		{
-			if(m_pMemory == rhs.m_pMemory)
-				return;
-			
-			m_pMemory->merge(*rhs.m_pMemory);
-			rhs.m_pMemory = m_pMemory;
-		}
-		
-		node& memory::create_node()
-		{
-			shared_node pNode(new node);
-			m_nodes.insert(pNode);
-			return *pNode;
-		}
-		
-		void memory::merge(const memory& rhs)
-		{
-			m_nodes.insert(rhs.m_nodes.begin(), rhs.m_nodes.end());
-		}
-	}
-}

src/node.cpp

@@ -1,14 +1,256 @@
-#include "yaml-cpp/node/node.h"
+#include "node.h"
+#include "aliascontent.h"
+#include "aliasmanager.h"
+#include "content.h"
+#include "emitfromevents.h"
+#include "emitter.h"
+#include "eventhandler.h"
+#include "graphbuilderadapter.h"
+#include "iterpriv.h"
+#include "map.h"
 #include "nodebuilder.h"
-#include "nodeevents.h"
+#include "nodeproperties.h"
+#include "scalar.h"
+#include "scanner.h"
+#include "sequence.h"
+#include "tag.h"
+#include "token.h"
+#include <cassert>
+#include <stdexcept>
 
 namespace YAML
 {
-    Node Clone(const Node& node)
-    {
-		NodeEvents events(node);
-        NodeBuilder builder;
-        events.Emit(builder);
-        return builder.Root();
-    }
+	// the ordering!
+	bool ltnode::operator ()(const Node *pNode1, const Node *pNode2) const
+	{
+		return *pNode1 < *pNode2;
+	}
+
+	Node::Node(): m_pContent(0), m_alias(false), m_pIdentity(this), m_referenced(false)
+	{
+	}
+
+	Node::~Node()
+	{
+		Clear();
+	}
+
+	void Node::Clear()
+	{
+		delete m_pContent;
+		m_pContent = 0;
+		m_alias = false;
+		m_referenced = false;
+		m_tag.clear();
+	}
+	
+	std::auto_ptr<Node> Node::Clone() const
+	{
+		std::auto_ptr<Node> pNode(new Node);
+		NodeBuilder nodeBuilder(*pNode);
+		GraphBuilder<NodeBuilder> graphBuilder(nodeBuilder);
+		GraphBuilderAdapter eventHandler(graphBuilder);
+		EmitEvents(eventHandler);
+		return pNode;
+	}
+
+	void Node::EmitEvents(EventHandler& eventHandler) const
+	{
+		eventHandler.OnDocumentStart(m_mark);
+		AliasManager am;
+		EmitEvents(am, eventHandler);
+		eventHandler.OnDocumentEnd();
+	}
+
+	void Node::EmitEvents(AliasManager& am, EventHandler& eventHandler) const
+	{
+		anchor_t anchor = NullAnchor;
+		if(m_referenced || m_alias) {
+			if(const Node *pOther = am.LookupReference(*this)) {
+				eventHandler.OnAlias(m_mark, am.LookupAnchor(*pOther));
+				return;
+			}
+			
+			am.RegisterReference(*this);
+			anchor = am.LookupAnchor(*this);
+		}
+		
+		if(m_pContent)
+			m_pContent->EmitEvents(am, eventHandler, m_mark, GetTag(), anchor);
+		else
+			eventHandler.OnNull(GetTag(), anchor);
+	}
+
+	void Node::Init(CONTENT_TYPE type, const Mark& mark, const std::string& tag)
+	{
+		Clear();
+		m_mark = mark;
+		m_tag = tag;
+		m_alias = false;
+		m_pIdentity = this;
+		m_referenced = false;
+
+		switch(type) {
+			case CT_SCALAR:
+				m_pContent = new Scalar;
+				break;
+			case CT_SEQUENCE:
+				m_pContent = new Sequence;
+				break;
+			case CT_MAP:
+				m_pContent = new Map;
+				break;
+			default:
+				m_pContent = 0;
+				break;
+		}
+	}
+
+	void Node::InitNull(const std::string& tag)
+	{
+		Clear();
+		m_tag = tag;
+		m_alias = false;
+		m_pIdentity = this;
+		m_referenced = false;
+	}
+
+	void Node::InitAlias(const Mark& mark, const Node& identity)
+	{
+		Clear();
+		m_mark = mark;
+		m_alias = true;
+		m_pIdentity = &identity;
+		if(identity.m_pContent)
+			m_pContent = new AliasContent(identity.m_pContent);
+		identity.m_referenced = true;
+	}
+
+	void Node::SetData(const std::string& data)
+	{
+		assert(m_pContent); // TODO: throw
+		m_pContent->SetData(data);
+	}
+
+	void Node::Append(std::auto_ptr<Node> pNode)
+	{
+		assert(m_pContent); // TODO: throw
+		m_pContent->Append(pNode);
+	}
+	
+	void Node::Insert(std::auto_ptr<Node> pKey, std::auto_ptr<Node> pValue)
+	{
+		assert(m_pContent); // TODO: throw
+		m_pContent->Insert(pKey, pValue);
+	}
+
+	CONTENT_TYPE Node::GetType() const
+	{
+		if(!m_pContent)
+			return CT_NONE;
+
+		if(m_pContent->IsScalar())
+			return CT_SCALAR;
+		else if(m_pContent->IsSequence())
+			return CT_SEQUENCE;
+		else if(m_pContent->IsMap())
+			return CT_MAP;
+			
+		return CT_NONE;
+	}
+
+	// begin
+	// Returns an iterator to the beginning of this (sequence or map).
+	Iterator Node::begin() const
+	{
+		if(!m_pContent)
+			return Iterator();
+
+		std::vector <Node *>::const_iterator seqIter;
+		if(m_pContent->GetBegin(seqIter))
+			return Iterator(new IterPriv(seqIter));
+
+		std::map <Node *, Node *, ltnode>::const_iterator mapIter;
+		if(m_pContent->GetBegin(mapIter))
+			return Iterator(new IterPriv(mapIter));
+
+		return Iterator();
+	}
+
+	// end
+	// . Returns an iterator to the end of this (sequence or map).
+	Iterator Node::end() const
+	{
+		if(!m_pContent)
+			return Iterator();
+
+		std::vector <Node *>::const_iterator seqIter;
+		if(m_pContent->GetEnd(seqIter))
+			return Iterator(new IterPriv(seqIter));
+
+		std::map <Node *, Node *, ltnode>::const_iterator mapIter;
+		if(m_pContent->GetEnd(mapIter))
+			return Iterator(new IterPriv(mapIter));
+
+		return Iterator();
+	}
+
+	// size
+	// . Returns the size of this node, if it's a sequence node.
+	// . Otherwise, returns zero.
+	std::size_t Node::size() const
+	{
+		if(!m_pContent)
+			return 0;
+
+		return m_pContent->GetSize();
+	}
+
+	const Node *Node::FindAtIndex(std::size_t i) const
+	{
+		if(!m_pContent)
+			return 0;
+		
+		return m_pContent->GetNode(i);
+	}
+
+	bool Node::GetScalar(std::string& s) const
+	{
+		if(!m_pContent) {
+			if(m_tag.empty())
+				s = "~";
+			else
+				s = "";
+			return true;
+		}
+		
+		return m_pContent->GetScalar(s);
+	}
+
+	Emitter& operator << (Emitter& out, const Node& node)
+	{
+		EmitFromEvents emitFromEvents(out);
+		node.EmitEvents(emitFromEvents);
+		return out;
+	}
+
+	int Node::Compare(const Node& rhs) const
+	{
+		// Step 1: no content is the smallest
+		if(!m_pContent) {
+			if(rhs.m_pContent)
+				return -1;
+			else
+				return 0;
+		}
+		if(!rhs.m_pContent)
+			return 1;
+
+		return m_pContent->Compare(rhs.m_pContent);
+	}
+
+	bool operator < (const Node& n1, const Node& n2)
+	{
+		return n1.Compare(n2) < 0;
+	}
 }

src/node_data.cpp

@@ -1,295 +0,0 @@
-#include "yaml-cpp/node/detail/node_data.h"
-#include "yaml-cpp/node/detail/memory.h"
-#include "yaml-cpp/node/detail/node.h"
-#include "yaml-cpp/exceptions.h"
-#include <sstream>
-
-namespace YAML
-{
-	namespace detail
-	{
-		std::string node_data::empty_scalar;
-
-		node_data::node_data(): m_isDefined(false), m_type(NodeType::Null), m_seqSize(0)
-		{
-		}
-
-		void node_data::mark_defined()
-		{
-			if(m_type == NodeType::Undefined)
-				m_type = NodeType::Null;
-			m_isDefined = true;
-		}
-
-		void node_data::set_type(NodeType::value type)
-		{
-			if(type == NodeType::Undefined) {
-				m_type = type;
-				m_isDefined = false;
-				return;
-			}
-			
-
-			m_isDefined = true;
-			if(type == m_type)
-				return;
-			
-			m_type = type;
-			
-			switch(m_type) {
-				case NodeType::Null:
-					break;
-				case NodeType::Scalar:
-					m_scalar.clear();
-					break;
-				case NodeType::Sequence:
-					reset_sequence();
-					break;
-				case NodeType::Map:
-					reset_map();
-					break;
-				case NodeType::Undefined:
-					assert(false);
-					break;
-			}
-		}
-
-		void node_data::set_tag(const std::string& tag)
-		{
-			m_tag = tag;
-		}
-		
-		void node_data::set_null()
-		{
-			m_isDefined = true;
-			m_type = NodeType::Null;
-		}
-		
-		void node_data::set_scalar(const std::string& scalar)
-		{
-			m_isDefined = true;
-			m_type = NodeType::Scalar;
-			m_scalar = scalar;
-		}
-
-		// size/iterator
-		std::size_t node_data::size() const
-		{
-			if(!m_isDefined)
-				return 0;
-
-			switch(m_type) {
-				case NodeType::Sequence: compute_seq_size(); return m_seqSize;
-				case NodeType::Map: compute_map_size(); return m_map.size() - m_undefinedPairs.size();
-				default:
-					return 0;
-			}
-			return 0;
-		}
-		
-		void node_data::compute_seq_size() const
-		{
-			while(m_seqSize < m_sequence.size() && m_sequence[m_seqSize]->is_defined())
-				m_seqSize++;
-		}
-
-		void node_data::compute_map_size() const
-		{
-			kv_pairs::iterator it = m_undefinedPairs.begin();
-			while(it != m_undefinedPairs.end()) {
-				kv_pairs::iterator jt = boost::next(it);
-				if(it->first->is_defined() && it->second->is_defined())
-					m_undefinedPairs.erase(it);
-				it = jt;
-			}
-		}
-		
-		const_node_iterator node_data::begin() const
-		{
-			if(!m_isDefined)
-				return const_node_iterator();
-			
-			switch(m_type) {
-				case NodeType::Sequence: return const_node_iterator(m_sequence.begin());
-				case NodeType::Map: return const_node_iterator(m_map.begin(), m_map.end());
-				default: return const_node_iterator();
-			}
-		}
-		
-		node_iterator node_data::begin()
-		{
-			if(!m_isDefined)
-				return node_iterator();
-
-			switch(m_type) {
-				case NodeType::Sequence: return node_iterator(m_sequence.begin());
-				case NodeType::Map: return node_iterator(m_map.begin(), m_map.end());
-				default: return node_iterator();
-			}
-		}
-		
-		const_node_iterator node_data::end() const
-		{
-			if(!m_isDefined)
-				return const_node_iterator();
-
-			switch(m_type) {
-				case NodeType::Sequence: return const_node_iterator(m_sequence.end());
-				case NodeType::Map: return const_node_iterator(m_map.end(), m_map.end());
-				default: return const_node_iterator();
-			}
-		}
-		
-		node_iterator node_data::end()
-		{
-			if(!m_isDefined)
-				return node_iterator();
-
-			switch(m_type) {
-				case NodeType::Sequence: return node_iterator(m_sequence.end());
-				case NodeType::Map: return node_iterator(m_map.end(), m_map.end());
-				default: return node_iterator();
-			}
-		}
-
-		// sequence
-		void node_data::push_back(node& node, shared_memory_holder /* pMemory */)
-		{
-			if(m_type == NodeType::Undefined || m_type == NodeType::Null) {
-				m_type = NodeType::Sequence;
-				reset_sequence();
-			}
-			
-			if(m_type != NodeType::Sequence)
-                throw BadPushback();
-			
-			m_sequence.push_back(&node);
-		}
-
-		void node_data::insert(node& key, node& value, shared_memory_holder pMemory)
-		{
-			switch(m_type) {
-				case NodeType::Map:
-					break;
-				case NodeType::Undefined:
-				case NodeType::Null:
-				case NodeType::Sequence:
-					convert_to_map(pMemory);
-					break;
-				case NodeType::Scalar:
-                    throw BadSubscript();
-			}
-
-			insert_map_pair(key, value);
-		}
-
-		// indexing
-		node& node_data::get(node& key, shared_memory_holder pMemory) const
-		{
-			if(m_type != NodeType::Map)
-				return pMemory->create_node();
-			
-			for(node_map::const_iterator it=m_map.begin();it!=m_map.end();++it) {
-				if(it->first->is(key))
-					return *it->second;
-			}
-			
-			return pMemory->create_node();
-		}
-		
-		node& node_data::get(node& key, shared_memory_holder pMemory)
-		{
-			switch(m_type) {
-				case NodeType::Map:
-					break;
-				case NodeType::Undefined:
-				case NodeType::Null:
-				case NodeType::Sequence:
-					convert_to_map(pMemory);
-					break;
-				case NodeType::Scalar:
-                    throw BadSubscript();
-			}
-
-			for(node_map::const_iterator it=m_map.begin();it!=m_map.end();++it) {
-				if(it->first->is(key))
-					return *it->second;
-			}
-			
-			node& value = pMemory->create_node();
-			insert_map_pair(key, value);
-			return value;
-		}
-		
-		bool node_data::remove(node& key, shared_memory_holder /* pMemory */)
-		{
-			if(m_type != NodeType::Map)
-				return false;
-
-			for(node_map::iterator it=m_map.begin();it!=m_map.end();++it) {
-				if(it->first->is(key)) {
-					m_map.erase(it);
-					return true;
-				}
-			}
-			
-			return false;
-		}
-
-		void node_data::reset_sequence()
-		{
-			m_sequence.clear();
-			m_seqSize = 0;
-		}
-
-		void node_data::reset_map()
-		{
-			m_map.clear();
-			m_undefinedPairs.clear();
-		}
-
-		void node_data::insert_map_pair(node& key, node& value)
-		{
-			m_map[&key] = &value;
-			if(!key.is_defined() || !value.is_defined())
-				m_undefinedPairs.push_back(kv_pair(&key, &value));
-		}
-
-		void node_data::convert_to_map(shared_memory_holder pMemory)
-		{
-			switch(m_type) {
-				case NodeType::Undefined:
-				case NodeType::Null:
-					reset_map();
-					m_type = NodeType::Map;
-					break;
-				case NodeType::Sequence:
-					convert_sequence_to_map(pMemory);
-					break;
-				case NodeType::Map:
-					break;
-				case NodeType::Scalar:
-					assert(false);
-					break;
-			}
-		}
-
-		void node_data::convert_sequence_to_map(shared_memory_holder pMemory)
-		{
-			assert(m_type == NodeType::Sequence);
-
-			reset_map();
-			for(std::size_t i=0;i<m_sequence.size();i++) {
-				std::stringstream stream;
-				stream << i;
-
-				node& key = pMemory->create_node();
-				key.set_scalar(stream.str());
-				insert_map_pair(key, *m_sequence[i]);
-			}
-			
-			reset_sequence();
-			m_type = NodeType::Map;
-		}
-	}
-}

src/nodebuilder.cpp

@@ -1,138 +1,90 @@
 #include "nodebuilder.h"
-#include "yaml-cpp/mark.h"
-#include "yaml-cpp/node/node.h"
-#include "yaml-cpp/node/impl.h"
+#include "mark.h"
+#include "node.h"
+#include "nodeproperties.h"
 #include <cassert>
 
 namespace YAML
 {
-	NodeBuilder::NodeBuilder(): m_pMemory(new detail::memory_holder), m_pRoot(0), m_mapDepth(0)
+	NodeBuilder::NodeBuilder(Node& root): m_root(root), m_initializedRoot(false)
+	{
+		m_root.Clear();
+	}
+	
+	NodeBuilder::NodeBuilder(const NodeBuilder& o): m_root(o.m_root), m_initializedRoot(o.m_initializedRoot)
 	{
-		m_anchors.push_back(0); // since the anchors start at 1
 	}
 	
 	NodeBuilder::~NodeBuilder()
 	{
 	}
-	
-	Node NodeBuilder::Root()
+
+	Node *NodeBuilder::NewNull(const std::string& tag, Node *pParent)
 	{
-		if(!m_pRoot)
-			return Node();
-		
-		return Node(*m_pRoot, m_pMemory);
+		(void)pParent;
+		Node *pNode = NewNode();
+		pNode->InitNull(tag);
+		return pNode;
 	}
 
-	void NodeBuilder::OnDocumentStart(const Mark&)
+	Node *NodeBuilder::AnchorReference(const Mark& mark, Node *pNode)
 	{
-	}
-	
-	void NodeBuilder::OnDocumentEnd()
-	{
-	}
-	
-	void NodeBuilder::OnNull(const Mark& /* mark */, anchor_t anchor)
-	{
-		detail::node& node = Push(anchor);
-		node.set_null();
-		Pop();
-	}
-	
-	void NodeBuilder::OnAlias(const Mark& /* mark */, anchor_t anchor)
-	{
-		detail::node& node = *m_anchors[anchor];
-		Push(node);
-		Pop();
-	}
-	
-	void NodeBuilder::OnScalar(const Mark& /* mark */, const std::string& tag, anchor_t anchor, const std::string& value)
-	{
-		detail::node& node = Push(anchor);
-		node.set_scalar(value);
-		node.set_tag(tag);
-		Pop();
-	}
-	
-	void NodeBuilder::OnSequenceStart(const Mark& /* mark */, const std::string& tag, anchor_t anchor)
-	{
-		detail::node& node = Push(anchor);
-		node.set_tag(tag);
-		node.set_type(NodeType::Sequence);
-	}
-	
-	void NodeBuilder::OnSequenceEnd()
-	{
-		Pop();
-	}
-	
-	void NodeBuilder::OnMapStart(const Mark& /* mark */, const std::string& tag, anchor_t anchor)
-	{
-		detail::node& node = Push(anchor);
-		node.set_type(NodeType::Map);
-		node.set_tag(tag);
-		m_mapDepth++;
-	}
-	
-	void NodeBuilder::OnMapEnd()
-	{
-		assert(m_mapDepth > 0);
-		m_mapDepth--;
-		Pop();
+		Node *pAlias = NewNode();
+		pAlias->InitAlias(mark, *pNode);
+		return pAlias;
 	}
 
-	detail::node& NodeBuilder::Push(anchor_t anchor)
+	Node *NodeBuilder::NewScalar(const Mark& mark, const std::string& tag, Node *pParent, const std::string& value)
 	{
-		detail::node& node = m_pMemory->create_node();
-		RegisterAnchor(anchor, node);
-		Push(node);
-		return node;
+		(void)pParent;
+		Node *pNode = NewNode();
+		pNode->Init(CT_SCALAR, mark, tag);
+		pNode->SetData(value);
+		return pNode;
+	}
+
+	NodeBuilder::Sequence *NodeBuilder::NewSequence(const Mark& mark, const std::string& tag, Node *pParent)
+	{
+		(void)pParent;
+		Node *pNode = NewNode();
+		pNode->Init(CT_SEQUENCE, mark, tag);
+		return pNode;
+	}
+
+	void NodeBuilder::AppendToSequence(Sequence *pSequence, Node *pNode)
+	{
+		std::auto_ptr<Node> apNode(m_unlinked.pop(pNode));
+		assert(apNode.get());
+		pSequence->Append(apNode);
+	}
+
+	NodeBuilder::Map *NodeBuilder::NewMap(const Mark& mark, const std::string& tag, Node* pParent)
+	{
+		(void)pParent;
+		Node *pNode = NewNode();
+		pNode->Init(CT_MAP, mark, tag);
+		return pNode;
+	}
+
+	void NodeBuilder::AssignInMap(Map *pMap, Node *pKeyNode, Node *pValueNode)
+	{
+		std::auto_ptr<Node> apKeyNode(m_unlinked.pop(pKeyNode));
+		std::auto_ptr<Node> apValueNode(m_unlinked.pop(pValueNode));
+		assert(apKeyNode.get() && apValueNode.get());
+		pMap->Insert(apKeyNode, apValueNode);
 	}
 	
-	void NodeBuilder::Push(detail::node& node)
+	Node* NodeBuilder::NewNode()
 	{
-		const bool needsKey = (!m_stack.empty() && m_stack.back()->type() == NodeType::Map && m_keys.size() < m_mapDepth);
-		
-		m_stack.push_back(&node);
-		if(needsKey)
-			m_keys.push_back(PushedKey(&node, false));
-	}
-	
-	void NodeBuilder::Pop()
-	{
-		assert(!m_stack.empty());
-		if(m_stack.size() == 1) {
-			m_pRoot = m_stack[0];
-			m_stack.pop_back();
-			return;
+		if(!m_initializedRoot) {
+			m_initializedRoot = true;
+			return &m_root;
 		}
 		
-		detail::node& node = *m_stack.back();
-		m_stack.pop_back();
-
-		detail::node& collection = *m_stack.back();
-		
-		if(collection.type() == NodeType::Sequence) {
-			collection.push_back(node, m_pMemory);
-		} else if(collection.type() == NodeType::Map) {
-			assert(!m_keys.empty());
-			PushedKey& key = m_keys.back();
-			if(key.second) {
-				collection.insert(*key.first, node, m_pMemory);
-				m_keys.pop_back();
-			} else {
-				key.second = true;
-			}
-		} else {
-			assert(false);
-			m_stack.clear();
-		}
-	}
-
-	void NodeBuilder::RegisterAnchor(anchor_t anchor, detail::node& node)
-	{
-		if(anchor) {
-			assert(anchor == m_anchors.size());
-			m_anchors.push_back(&node);
-		}
+		std::auto_ptr<Node> pNode(new Node);
+		Node* pResult = pNode.get();
+		// Save the pointer in a collection that will free it on exception
+		m_unlinked.push(pNode);
+		return pResult;
 	}
 }

src/nodebuilder.h

@@ -1,58 +1,53 @@
-#ifndef NODE_NODEBUILDER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define NODE_NODEBUILDER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
 #pragma once
-#endif
 
-#include "yaml-cpp/eventhandler.h"
-#include "yaml-cpp/node/ptr.h"
-#include <vector>
+#ifndef NODEBUILDER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#define NODEBUILDER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+
+#include <map>
+#include <memory>
+#include <stack>
+#include <string>
+
+#include "ptr_stack.h"
 
 namespace YAML
 {
 	class Node;
-
-	class NodeBuilder: public EventHandler
+	class Mark;
+	
+	class NodeBuilder
 	{
 	public:
-		NodeBuilder();
+		typedef YAML::Node Node;
+		typedef YAML::Node Map;
+		typedef YAML::Node Sequence;
+		
+		explicit NodeBuilder(Node& root);
+		NodeBuilder(const NodeBuilder& o);
 		virtual ~NodeBuilder();
-		
-		Node Root();
-		
-		virtual void OnDocumentStart(const Mark& mark);
-		virtual void OnDocumentEnd();
-		
-		virtual void OnNull(const Mark& mark, anchor_t anchor);
-		virtual void OnAlias(const Mark& mark, anchor_t anchor);
-		virtual void OnScalar(const Mark& mark, const std::string& tag, anchor_t anchor, const std::string& value);
-		
-		virtual void OnSequenceStart(const Mark& mark, const std::string& tag, anchor_t anchor);
-		virtual void OnSequenceEnd();
-		
-		virtual void OnMapStart(const Mark& mark, const std::string& tag, anchor_t anchor);
-		virtual void OnMapEnd();
-		
-	private:
-		detail::node& Push(anchor_t anchor);
-		void Push(detail::node& node);
-		void Pop();
-		void RegisterAnchor(anchor_t anchor, detail::node& node);
-		
-	private:
-		detail::shared_memory_holder m_pMemory;
-		detail::node *m_pRoot;
-		
-		typedef std::vector<detail::node *> Nodes;
-		Nodes m_stack;
-		Nodes m_anchors;
 
-		typedef std::pair<detail::node *, bool> PushedKey;
-		std::vector<PushedKey> m_keys;
-		std::size_t m_mapDepth;
+		Node *NewNull(const std::string& tag, Node *pParent);
+		Node *AnchorReference(const Mark& mark, Node *pNode);
+		Node *NewScalar(const Mark& mark, const std::string& tag, Node *pParent, const std::string& value);
+		
+		Sequence *NewSequence(const Mark& mark, const std::string& tag, Node *pParent);
+		void AppendToSequence(Sequence *pSequence, Node *pNode);
+		void SequenceComplete(Sequence *pSequence) {(void)pSequence;}
+		
+		Map *NewMap(const Mark& mark, const std::string& tag, Node *pParent);
+		void AssignInMap(Map *pMap, Node *pKeyNode, Node *pValueNode);
+		void MapComplete(Map *pMap) {(void)pMap;}
+		
+	private:
+		Node* NewNode();
+		
+	private:
+		Node& m_root;
+		bool m_initializedRoot;
+		
+		ptr_stack<Node> m_unlinked;
 	};
 }
 
-#endif // NODE_NODEBUILDER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
+#endif // NODEBUILDER_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 

src/nodeevents.cpp

@@ -1,99 +0,0 @@
-#include "nodeevents.h"
-#include "yaml-cpp/node/node.h"
-#include "yaml-cpp/node/impl.h"
-#include "yaml-cpp/eventhandler.h"
-#include "yaml-cpp/mark.h"
-
-namespace YAML
-{
-	void NodeEvents::AliasManager::RegisterReference(const detail::node& node)
-	{
-		m_anchorByIdentity.insert(std::make_pair(node.ref(), _CreateNewAnchor()));
-	}
-	
-	anchor_t NodeEvents::AliasManager::LookupAnchor(const detail::node& node) const
-	{
-		AnchorByIdentity::const_iterator it = m_anchorByIdentity.find(node.ref());
-		if(it == m_anchorByIdentity.end())
-			return 0;
-		return it->second;
-	}
-
-	NodeEvents::NodeEvents(const Node& node): m_pMemory(node.m_pMemory), m_root(*node.m_pNode)
-	{
-		Setup(m_root);
-	}
-
-	void NodeEvents::Setup(const detail::node& node)
-	{
-		int& refCount = m_refCount[node.ref()];
-		refCount++;
-		if(refCount > 1)
-			return;
-		
-		if(node.type() == NodeType::Sequence) {
-			for(detail::const_node_iterator it=node.begin();it!=node.end();++it)
-				Setup(**it);
-		} else if(node.type() == NodeType::Map) {
-			for(detail::const_node_iterator it=node.begin();it!=node.end();++it) {
-				Setup(*it->first);
-				Setup(*it->second);
-			}
-		}
-	}
-
-	void NodeEvents::Emit(EventHandler& handler)
-	{
-		AliasManager am;
-		
-		handler.OnDocumentStart(Mark());
-		Emit(m_root, handler, am);
-		handler.OnDocumentEnd();
-	}
-
-	void NodeEvents::Emit(const detail::node& node, EventHandler& handler, AliasManager& am) const
-	{
-		anchor_t anchor = NullAnchor;
-		if(IsAliased(node)) {
-			anchor = am.LookupAnchor(node);
-			if(anchor) {
-				handler.OnAlias(Mark(), anchor);
-				return;
-			}
-			
-			am.RegisterReference(node);
-			anchor = am.LookupAnchor(node);
-		}
-		
-		switch(node.type()) {
-			case NodeType::Undefined:
-				break;
-			case NodeType::Null:
-				handler.OnNull(Mark(), anchor);
-				break;
-			case NodeType::Scalar:
-				handler.OnScalar(Mark(), node.tag(), anchor, node.scalar());
-				break;
-			case NodeType::Sequence:
-				handler.OnSequenceStart(Mark(), node.tag(), anchor);
-				for(detail::const_node_iterator it=node.begin();it!=node.end();++it)
-					Emit(**it, handler, am);
-				handler.OnSequenceEnd();
-				break;
-			case NodeType::Map:
-				handler.OnMapStart(Mark(), node.tag(), anchor);
-				for(detail::const_node_iterator it=node.begin();it!=node.end();++it) {
-					Emit(*it->first, handler, am);
-					Emit(*it->second, handler, am);
-				}
-				handler.OnMapEnd();
-				break;
-		}
-	}
-
-	bool NodeEvents::IsAliased(const detail::node& node) const
-	{
-		RefCount::const_iterator it = m_refCount.find(node.ref());
-		return it != m_refCount.end() && it->second > 1;
-	}
-}

src/nodeevents.h

@@ -1,57 +0,0 @@
-#ifndef NODE_NODEEVENTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define NODE_NODEEVENTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-#include "yaml-cpp/anchor.h"
-#include "yaml-cpp/node/ptr.h"
-#include <map>
-#include <vector>
-
-namespace YAML
-{
-	class EventHandler;
-	class Node;
-	
-	class NodeEvents
-	{
-	public:
-		explicit NodeEvents(const Node& node);
-		
-		void Emit(EventHandler& handler);
-		
-	private:
-		class AliasManager {
-		public:
-			AliasManager(): m_curAnchor(0) {}
-			
-			void RegisterReference(const detail::node& node);
-			anchor_t LookupAnchor(const detail::node& node) const;
-			
-		private:
-			anchor_t _CreateNewAnchor() { return ++m_curAnchor; }
-			
-		private:
-			typedef std::map<const detail::node_ref*, anchor_t> AnchorByIdentity;
-			AnchorByIdentity m_anchorByIdentity;
-			
-			anchor_t m_curAnchor;
-		};
-		
-		void Setup(const detail::node& node);
-		void Emit(const detail::node& node, EventHandler& handler, AliasManager& am) const;
-		bool IsAliased(const detail::node& node) const;
-		
-	private:
-		detail::shared_memory_holder m_pMemory;
-		detail::node& m_root;
-		
-		typedef std::map<const detail::node_ref *, int> RefCount;
-		RefCount m_refCount;
-	};
-}
-
-#endif // NODE_NODEEVENTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-

src/null.cpp

@@ -1,6 +1,12 @@
-#include "yaml-cpp/null.h"
+#include "null.h"
+#include "node.h"
 
 namespace YAML
 {
 	_Null Null;
+
+	bool IsNull(const Node& node)
+	{
+		return node.Read(Null);
+	}
 }

src/ostream.cpp

@@ -0,0 +1,63 @@
+#include "ostream.h"
+#include <cstring>
+
+namespace YAML
+{
+	ostream::ostream(): m_buffer(0), m_pos(0), m_size(0), m_row(0), m_col(0)
+	{
+		reserve(1024);
+	}
+	
+	ostream::~ostream()
+	{
+		delete [] m_buffer;
+	}
+	
+	void ostream::reserve(unsigned size)
+	{
+		if(size <= m_size)
+			return;
+		
+		char *newBuffer = new char[size];
+		std::memset(newBuffer, 0, size * sizeof(char));
+		std::memcpy(newBuffer, m_buffer, m_size * sizeof(char));
+		delete [] m_buffer;
+		m_buffer = newBuffer;
+		m_size = size;
+	}
+	
+	void ostream::put(char ch)
+	{
+		if(m_pos >= m_size - 1)   // an extra space for the NULL terminator
+			reserve(m_size * 2);
+		
+		m_buffer[m_pos] = ch;
+		m_pos++;
+		
+		if(ch == '\n') {
+			m_row++;
+			m_col = 0;
+		} else
+			m_col++;
+	}
+
+	ostream& operator << (ostream& out, const char *str)
+	{
+		std::size_t length = std::strlen(str);
+		for(std::size_t i=0;i<length;i++)
+			out.put(str[i]);
+		return out;
+	}
+	
+	ostream& operator << (ostream& out, const std::string& str)
+	{
+		out << str.c_str();
+		return out;
+	}
+	
+	ostream& operator << (ostream& out, char ch)
+	{
+		out.put(ch);
+		return out;
+	}
+}

src/ostream_wrapper.cpp

@@ -1,56 +0,0 @@
-#include "yaml-cpp/ostream_wrapper.h"
-#include <cstring>
-#include <iostream>
-
-namespace YAML
-{
-	ostream_wrapper::ostream_wrapper(): m_pStream(0), m_pos(0), m_row(0), m_col(0), m_comment(false)
-	{
-	}
-	
-	ostream_wrapper::ostream_wrapper(std::ostream& stream): m_pStream(&stream), m_pos(0), m_row(0), m_col(0), m_comment(false)
-	{
-	}
-
-	ostream_wrapper::~ostream_wrapper()
-	{
-	}
-	
-    void ostream_wrapper::write(const std::string& str)
-    {
-        if(m_pStream) {
-            m_pStream->write(str.c_str(), str.size());
-        } else {
-            m_buffer.resize(std::max(m_buffer.size(), m_pos + str.size() + 1));
-            std::copy(str.begin(), str.end(), &m_buffer[m_pos]);
-        }
-        
-        for(std::size_t i=0;i<str.size();i++)
-            update_pos(str[i]);
-    }
-
-    void ostream_wrapper::write(const char *str, std::size_t size)
-    {
-        if(m_pStream) {
-            m_pStream->write(str, size);
-        } else {
-            m_buffer.resize(std::max(m_buffer.size(), m_pos + size + 1));
-            std::copy(str, str + size, &m_buffer[m_pos]);
-        }
-        
-        for(std::size_t i=0;i<size;i++)
-            update_pos(str[i]);
-    }
-	
-    void ostream_wrapper::update_pos(char ch)
-    {
-		m_pos++;
-        m_col++;
-		
-		if(ch == '\n') {
-			m_row++;
-			m_col = 0;
-            m_comment = false;
-		}
-    }
-}

src/parse.cpp

@@ -1,68 +0,0 @@
-#include "yaml-cpp/node/parse.h"
-#include "yaml-cpp/node/node.h"
-#include "yaml-cpp/node/impl.h"
-#include "yaml-cpp/parser.h"
-#include "nodebuilder.h"
-
-#include <fstream>
-#include <sstream>
-
-namespace YAML
-{
-	Node Load(const std::string& input) {
-		std::stringstream stream(input);
-		return Load(stream);
-	}
-	
-	Node Load(const char *input) {
-		std::stringstream stream(input);
-		return Load(stream);
-	}
-	
-	Node Load(std::istream& input) {
-		Parser parser(input);
-		NodeBuilder builder;
-		if(!parser.HandleNextDocument(builder))
-			return Node();
-		
-		return builder.Root();
-	}
-
-    Node LoadFile(const std::string& filename) {
-        std::ifstream fin(filename.c_str());
-        if(!fin)
-            throw BadFile();
-        return Load(fin);
-    }
-
-	std::vector<Node> LoadAll(const std::string& input) {
-		std::stringstream stream(input);
-		return LoadAll(stream);
-	}
-	
-	std::vector<Node> LoadAll(const char *input) {
-		std::stringstream stream(input);
-		return LoadAll(stream);
-	}
-	
-	std::vector<Node> LoadAll(std::istream& input) {
-		std::vector<Node> docs;
-		
-		Parser parser(input);
-		while(1) {
-			NodeBuilder builder;
-			if(!parser.HandleNextDocument(builder))
-				break;
-			docs.push_back(builder.Root());
-		}
-		
-		return docs;
-	}
-
-    std::vector<Node> LoadAllFromFile(const std::string& filename) {
-        std::ifstream fin(filename.c_str());
-        if(!fin)
-            throw BadFile();
-        return LoadAll(fin);
-    }
-}

src/parser.cpp

@@ -1,7 +1,10 @@
-#include "yaml-cpp/parser.h"
-#include "yaml-cpp/eventhandler.h"
-#include "yaml-cpp/exceptions.h"
+#include "parser.h"
 #include "directives.h"
+#include "eventhandler.h"
+#include "exceptions.h"
+#include "graphbuilderadapter.h"
+#include "node.h"
+#include "nodebuilder.h"
 #include "scanner.h"
 #include "singledocparser.h"
 #include "tag.h"
@@ -52,6 +55,28 @@ namespace YAML
 		sdp.HandleDocument(eventHandler);
 		return true;
 	}
+	
+	// BuildNextDocumentGraph
+	// . Builds a graph of the next document
+	// . Returns NULL if there are no more documents
+	void *Parser::BuildNextDocumentGraph(GraphBuilderInterface& graphBuilder)
+	{
+		GraphBuilderAdapter eventHandler(graphBuilder);
+		if (HandleNextDocument(eventHandler)) {
+			return eventHandler.RootNode();
+		} else {
+			return NULL;
+		}
+	}
+
+	// GetNextDocument
+	// . Reads the next document in the queue (of tokens).
+	// . Throws a ParserException on error.
+	bool Parser::GetNextDocument(Node& document)
+	{
+		NodeBuilder builder(document);
+		return BuildNextDocumentGraph(builder);
+	}
 
 	// ParseDirectives
 	// . Reads any directives that are next in the queue.
@@ -101,7 +126,7 @@ namespace YAML
 		str.get();
 		str >> m_pDirectives->version.minor;
 		if(!str || str.peek() != EOF)
-			throw ParserException(token.mark, std::string(ErrorMsg::YAML_VERSION) + token.params[0]);
+			throw ParserException(token.mark, ErrorMsg::YAML_VERSION + token.params[0]);
 
 		if(m_pDirectives->version.major > 1)
 			throw ParserException(token.mark, ErrorMsg::YAML_MAJOR_VERSION);

src/ptr_stack.h

@@ -1,18 +1,16 @@
+#pragma once
+
 #ifndef PTR_STACK_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define PTR_STACK_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-#include "yaml-cpp/noncopyable.h"
-#include <cstddef>
-#include <cstdlib>
+#include <algorithm>
 #include <memory>
 #include <vector>
 
+#include "noncopyable.h"
+
 template <typename T>
-class ptr_stack: private YAML::noncopyable
+class ptr_stack : private YAML::noncopyable
 {
 public:
 	ptr_stack() {}
@@ -28,6 +26,8 @@ public:
 	bool empty() const { return m_data.empty(); }
 	
 	void push(std::auto_ptr<T> t) {
+		// Make sure that the space is available before releasing the
+		// auto_ptr to it.  NULL can be deleted safely.
 		m_data.push_back(NULL);
 		m_data.back() = t.release();
 	}
@@ -36,12 +36,18 @@ public:
 		m_data.pop_back();
 		return t;
 	}
-	T& top() { return *m_data.back(); }
-	const T& top() const { return *m_data.back(); }
-
-	T& top(std::ptrdiff_t diff) { return **(m_data.end() - 1 + diff); }
-	const T& top(std::ptrdiff_t diff) const { return **(m_data.end() - 1 + diff); }
-
+	std::auto_ptr<T> pop(T* val) {
+		typename std::vector<T*>::reverse_iterator itVal =
+		  std::find(m_data.rbegin(), m_data.rend(), val);
+		std::auto_ptr<T> t;
+		if (itVal != m_data.rend()) {
+			t.reset(*itVal);
+			m_data.erase((itVal + 1).base());
+		}
+		return t;
+	}
+	T& top() const { return *m_data.back(); }
+	
 private:
 	std::vector<T*> m_data;
 };

src/ptr_vector.h

@@ -1,47 +0,0 @@
-#ifndef PTR_VECTOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define PTR_VECTOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-#include "yaml-cpp/noncopyable.h"
-#include <cstddef>
-#include <cstdlib>
-#include <memory>
-#include <vector>
-
-namespace YAML {
-	
-	template <typename T>
-	class ptr_vector: private YAML::noncopyable
-	{
-	public:
-		ptr_vector() {}
-		~ptr_vector() { clear(); }
-		
-		void clear() {
-			for(unsigned i=0;i<m_data.size();i++)
-				delete m_data[i];
-			m_data.clear();
-		}
-		
-		std::size_t size() const { return m_data.size(); }
-		bool empty() const { return m_data.empty(); }
-		
-		void push_back(std::auto_ptr<T> t) {
-			m_data.push_back(NULL);
-			m_data.back() = t.release();
-		}
-		T& operator[](std::size_t i) { return *m_data[i]; }
-		const T& operator[](std::size_t i) const { return *m_data[i]; }
-		
-		T& back() { return *m_data.back(); }
-		const T& back() const { return *m_data.back(); }
-
-	private:
-		std::vector<T*> m_data;
-	};
-}
-
-#endif // PTR_VECTOR_H_62B23520_7C8E_11DE_8A39_0800200C9A66

src/regex.h

@@ -1,10 +1,8 @@
+#pragma once
+
 #ifndef REGEX_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define REGEX_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
 
 #include <vector>
 #include <string>

src/regeximpl.h

@@ -1,10 +1,8 @@
+#pragma once
+
 #ifndef REGEXIMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 #define REGEXIMPL_H_62B23520_7C8E_11DE_8A39_0800200C9A66
 
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
 
 #include "stream.h"
 #include "stringsource.h"
@@ -60,13 +58,7 @@ namespace YAML
 	template<>
 	inline bool RegEx::IsValidSource<StringCharSource>(const StringCharSource&source) const
 	{
-		switch(m_op) {
-			case REGEX_MATCH:
-			case REGEX_RANGE:
-				return source;
-			default:
-				return true;
-		}
+		return source || m_op == REGEX_EMPTY;
 	}
 
 	template <typename Source>

src/scalar.cpp

@@ -0,0 +1,34 @@
+#include "scalar.h"
+#include "eventhandler.h"
+
+namespace YAML
+{
+	Scalar::Scalar()
+	{
+	}
+
+	Scalar::~Scalar()
+	{
+	}
+
+	void Scalar::EmitEvents(AliasManager&, EventHandler& eventHandler, const Mark& mark, const std::string& tag, anchor_t anchor) const
+	{
+		eventHandler.OnScalar(mark, tag, anchor, m_data);
+	}
+
+	int Scalar::Compare(Content *pContent)
+	{
+		return -pContent->Compare(this);
+	}
+
+	int Scalar::Compare(Scalar *pScalar)
+	{
+		if(m_data < pScalar->m_data)
+			return -1;
+		else if(m_data > pScalar->m_data)
+			return 1;
+		else
+			return 0;
+	}
+}
+