Merged the other-tags branch into the trunk (this wasn't an rX:Y merge, since the branch wasn't branched directly from the head of the trunk)

include/yaml-cpp/emitter.h

@@ -78,6 +78,8 @@ namespace YAML
 		void EmitEndMap();
 		void EmitKey();
 		void EmitValue();
+		void EmitKindTag();
+		void EmitTag(bool verbatim, const _Tag& tag);
 		
 	private:
 		ostream m_stream;

include/yaml-cpp/emittermanip.h

@@ -11,6 +11,7 @@ namespace YAML
 	enum EMITTER_MANIP {
 		// general manipulators
 		Auto,
+		TagByKind,
 
 		// output character set
 		EmitNonAscii,
@@ -82,14 +83,24 @@ namespace YAML
 	}
 	
 	struct _Tag {
-		_Tag(const std::string& content_): content(content_), verbatim(true) {}
+		explicit _Tag(const std::string& content_)
+		: content(content_), verbatim(true)
+		{
+		}
 		std::string content;
 		bool verbatim;
 	};
 	
-	inline _Tag VerbatimTag(const std::string& content) {
+	typedef _Tag VerbatimTag;
-		return _Tag(content);
+	
+	struct LocalTag : public _Tag
+	{
+		explicit LocalTag(const std::string& content_)
+		: _Tag(content_)
+		{
+			verbatim = false;
 		}
+	};
 
 	struct _Comment {
 		_Comment(const std::string& content_): content(content_) {}

src/emitter.cpp

@@ -120,6 +120,9 @@ namespace YAML
 			case Value:
 				EmitValue();
 				break;
+			case TagByKind:
+				EmitKindTag();
+				break;
 			default:
 				m_pState->SetLocalValue(value);
 				break;
@@ -651,15 +654,26 @@ namespace YAML
 		if(!good())
 			return *this;
 		
+		EmitTag(tag.verbatim, tag);
+		return *this;
+	}
+	
+	void Emitter::EmitTag(bool verbatim, const _Tag& tag)
+	{
 		PreAtomicWrite();
 		EmitSeparationIfNecessary();
-		if(!Utils::WriteTag(m_stream, tag.content)) {
+		if(!Utils::WriteTag(m_stream, tag.content, verbatim)) {
 			m_pState->SetError(ErrorMsg::INVALID_TAG);
-			return *this;
+			return;
 		}
 		m_pState->RequireSeparation();
 		// Note: no PostAtomicWrite() because we need another value for this node
-		return *this;
+	}
+	
+	void Emitter::EmitKindTag()
+	{
+		_Tag tag("");
+		EmitTag(false, tag);
 	}
 
 	Emitter& Emitter::Write(const _Comment& comment)

src/emitterutils.cpp

@@ -294,12 +294,13 @@ namespace YAML
 			return WriteAliasName(out, str);
 		}
 
-		bool WriteTag(ostream& out, const std::string& str)
+		bool WriteTag(ostream& out, const std::string& str, bool verbatim)
 		{
-			out << "!<";
+			out << (verbatim ? "!<" : "!");
 			StringCharSource buffer(str.c_str(), str.size());
+			const RegEx& reValid = verbatim ? Exp::URI() : Exp::Tag();
 			while(buffer) {
-				int n = Exp::URI().Match(buffer);
+				int n = reValid.Match(buffer);
 				if(n <= 0)
 					return false;
 
@@ -308,6 +309,7 @@ namespace YAML
 					++buffer;
 				}
 			}
+			if (verbatim)
 				out << ">";
 			return true;
 		}

src/emitterutils.h

@@ -18,7 +18,7 @@ namespace YAML
 		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 WriteTag(ostream& out, const std::string& str, bool verbatim);
 	}
 }
 

src/scantoken.cpp

@@ -276,7 +276,12 @@ namespace YAML
 		} else {
 			bool canBeHandle;
 			token.value = ScanTagHandle(INPUT, canBeHandle);
-			token.data = (token.value.empty() ? Tag::SECONDARY_HANDLE : Tag::PRIMARY_HANDLE);
+			if(!canBeHandle && token.value.empty())
+				token.data = Tag::NON_SPECIFIC;
+			else if(token.value.empty())
+				token.data = Tag::SECONDARY_HANDLE;
+			else
+				token.data = Tag::PRIMARY_HANDLE;
 			
 			// is there a suffix?
 			if(canBeHandle && INPUT.peek() == Keys::Tag) {
@@ -321,7 +326,7 @@ namespace YAML
 		//if(Exp::IllegalCharInScalar.Matches(INPUT))
 		//	throw ParserException(INPUT.mark(), ErrorMsg::CHAR_IN_SCALAR);
 
-		Token token(Token::SCALAR, mark);
+		Token token(Token::PLAIN_SCALAR, mark);
 		token.value = scalar;
 		m_tokens.push(token);
 	}
@@ -360,7 +365,7 @@ namespace YAML
 		m_simpleKeyAllowed = false;
 		m_canBeJSONFlow = true;
 
-		Token token(Token::SCALAR, mark);
+		Token token(Token::NON_PLAIN_SCALAR, mark);
 		token.value = scalar;
 		m_tokens.push(token);
 	}
@@ -427,7 +432,7 @@ namespace YAML
 		m_simpleKeyAllowed = true;
 		m_canBeJSONFlow = false;
 
-		Token token(Token::SCALAR, mark);
+		Token token(Token::NON_PLAIN_SCALAR, mark);
 		token.value = scalar;
 		m_tokens.push(token);
 	}

src/singledocparser.cpp

@@ -8,6 +8,7 @@
 #include "token.h"
 #include <sstream>
 #include <cstdio>
+#include <algorithm>
 
 namespace YAML
 {
@@ -73,10 +74,17 @@ namespace YAML
 		anchor_t anchor;
 		ParseProperties(tag, anchor);
 		
+		const Token& token = m_scanner.peek();
+		
+		// add non-specific tags
+		if(tag.empty())
+			tag = (token.type == Token::NON_PLAIN_SCALAR ? "!" : "?");
+		
 		// now split based on what kind of node we should be
-		switch(m_scanner.peek().type) {
+		switch(token.type) {
-			case Token::SCALAR:
+			case Token::PLAIN_SCALAR:
-				eventHandler.OnScalar(mark, tag, anchor, m_scanner.peek().value);
+			case Token::NON_PLAIN_SCALAR:
+				eventHandler.OnScalar(mark, tag, anchor, token.value);
 				m_scanner.pop();
 				return;
 			case Token::FLOW_SEQ_START:

src/token.h

@@ -57,7 +57,8 @@ namespace YAML
 			ANCHOR,
 			ALIAS,
 			TAG,
-			SCALAR
+			PLAIN_SCALAR,
+			NON_PLAIN_SCALAR
 		};
 
 		// data