Fixed bug with simple keys that are quoted scalars

src/scantoken.cpp

@@ -309,8 +309,8 @@ namespace YAML
 	{
 		std::string scalar;
 
-		// eat single or double quote
-		char quote = INPUT.get();
+		// peek at single or double quote (don't eat because we need to preserve (for the time being) the input position)
+		char quote = INPUT.peek();
 		bool single = (quote == '\'');
 
 		// setup the scanning parameters
@@ -330,6 +330,11 @@ namespace YAML
 			InsertSimpleKey();
 
 		int line = INPUT.line, column = INPUT.column;
+
+		// now eat that opening quote
+		INPUT.get();
+		
+		// and scan
 		scalar = ScanScalar(INPUT, params);
 		m_simpleKeyAllowed = false;
 

yaml-reader/tests.cpp

@@ -262,6 +262,7 @@ namespace Test
 		RunParserTest(&Parser::SimpleMap, "simple map", passed);
 		RunParserTest(&Parser::FlowSeq, "flow seq", passed);
 		RunParserTest(&Parser::FlowMap, "flow map", passed);
+		RunParserTest(&Parser::QuotedSimpleKeys, "quoted simple keys", passed);
 
 		RunEncodingTest(&EncodeToUtf8, false, "UTF-8, no BOM", passed);
 		RunEncodingTest(&EncodeToUtf8, true, "UTF-8 with BOM", passed);

yaml-reader/tests.h

@@ -28,6 +28,7 @@ namespace Test {
 		bool SimpleMap();
 		bool FlowSeq();
 		bool FlowMap();
+		bool QuotedSimpleKeys();
 	}
 	
 	namespace Emitter {