Fixed complex keys.

scanner.cpp

@@ -229,14 +229,14 @@ namespace YAML
 				Eat(1);
 
 			// then eat a comment
-			if(Exp::Comment.Matches(INPUT.peek())) {
+			if(Exp::Comment.Matches(INPUT)) {
 				// eat until line break
-				while(INPUT && !Exp::Break.Matches(INPUT.peek()))
+				while(INPUT && !Exp::Break.Matches(INPUT))
 					Eat(1);
 			}
 
 			// if it's NOT a line break, then we're done!
-			if(!Exp::Break.Matches(INPUT.peek()))
+			if(!Exp::Break.Matches(INPUT))
 				break;
 
 			// otherwise, let's eat the line break and keep going

scantoken.cpp

@@ -204,7 +204,8 @@ namespace YAML
 	template <> PlainScalarToken *Scanner::ScanToken(PlainScalarToken *pToken)
 	{
 		// insert a potential simple key
-		InsertSimpleKey();
+		if(m_simpleKeyAllowed)
+			InsertSimpleKey();
 		m_simpleKeyAllowed = false;
 
 		// now eat and store the scalar
@@ -279,7 +280,8 @@ namespace YAML
 	template <> QuotedScalarToken *Scanner::ScanToken(QuotedScalarToken *pToken)
 	{
 		// insert a potential simple key
-		InsertSimpleKey();
+		if(m_simpleKeyAllowed)
+			InsertSimpleKey();
 		m_simpleKeyAllowed = false;
 
 		// eat single or double quote

test.yaml

@@ -1,98 +1,4 @@
----
+{
-model:
+  a simple key: a value,
-    file: data/models/compound.model
+  ? a complex key: another value,
-    textures: data/materials/compound
+}
-rooms:
-    - name: "Room #1"
-      pos: [0, 0, 0]
-      size: [1000, 1000, 500]
-      height: 500
-      stairtype: none
-      display: []
-      pathfinding:
-          tilesize: 50
-          size: [24, 24]
-          map:
-              -----------------------
-              -+++++++++++++++++++++-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+---------------------
-              -+---------------------
-              -+---------------------
-              -+---------------------
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+++++++++++++++++++++-
-              -----------------------
-    - name: Doorway
-      pos: [1000, 400, 0]
-      size: [50, 200, 500]
-      height: 500
-      stairtype: none
-      display: []
-      pathfinding:
-          tilesize: 50
-          size: [5, 9]
-          map:
-              -----
-              -+++-
-              -----
-              -----
-              -----
-              -----
-              -----
-              -+++-
-              -----
-    - name: "Room #2"
-      pos: [1050, 0, 0]
-      size: [1000, 1000, 500]
-      height: 500
-      stairtype: none
-      display: []
-      pathfinding:
-          tilesize: 50
-          size: [24, 24]
-          map:
-              -----------------------
-              -+++++++++++++++++++++-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              ---------------------+-
-              ---------------------+-
-              ---------------------+-
-              ---------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+-------------------+-
-              -+++++++++++++++++++++-
-              -----------------------
-exits:
-    - room1: "Room #1"
-      room2: "Room #2"
-      dir: e
-      pos: [400, 600]
-...