Support quoted and typed keys

src/main/php/org/yaml/Input.class.php

@@ -176,7 +176,7 @@ private function escape($in, &$offset) {
    * @param  string $end
    * @return var[]
    */
-  private function token(&$in, &$offset, $end= '#') {
+  public function token(&$in, &$offset, $end= '#') {
     $l= strlen($in);
     $offset+= strspn($in, ' ', $offset);
     if ($offset >= $l) return null;
@@ -186,7 +186,7 @@ private function token(&$in, &$offset, $end= '#') {
 
     $c= $in[$offset];
     if ('"' === $c) {
-      $offset+= 1;
+      $offset++;
       $string= '';
       do {
         $p= strcspn($in, '\\"', $offset);
@@ -206,7 +206,7 @@ private function token(&$in, &$offset, $end= '#') {
         $offset+= $p;
       } while (true);
     } else if ("'" === $c) {
-      $offset+= 1;
+      $offset++;
       $string= '';
       do {
         $p= strcspn($in, "'", $offset);
@@ -231,7 +231,7 @@ private function token(&$in, &$offset, $end= '#') {
       $in.= $this->nextLine();
       return $this->token($in, $offset, $end);
     } else if ('*' === $c) {
-      $offset+= 1;
+      $offset++;
       $p= strcspn($in, $end, $offset);
       $literal= trim(substr($in, $offset, $p));
       $offset+= strlen($literal);
@@ -270,10 +270,10 @@ private function token(&$in, &$offset, $end= '#') {
       $offset++;
       return $c;
     } else if (0 === substr_compare($in, '!!', $offset, 2)) {
-      $p= strcspn($in, ' ', $offset);
+      $p= strcspn($in, ' '.$end, $offset);
       $tag= substr($in, $offset + 2, $p - 2);
       $offset+= $p + 1;
-      if ($offset >= $l) return [$tag, null];
+      if ($offset >= $l || $end === $in[$offset]) return [$tag, null];
       $token= $this->token($in, $offset, $end);
       return [$tag, $token[1]];
     } else {

src/main/php/org/yaml/YamlParser.class.php

@@ -57,25 +57,31 @@ public function valueOf($reader, $value, $level= 0) {
           } else {
             $r[$key]= $this->valueOf($reader, substr($line, $spaces + 2), $spaces);
           }
-        } else if (!strpos('#!?{[', $line[$spaces]) && strpos($line, ':')) {
-          $key= $value= null;
-          sscanf($line, "%[^:]: %[^\r]", $key, $value);
-          $key= trim(substr($key, $spaces), ' ');
-
-          // The “<<” merge key is used to indicate that all the keys of one or more specified
-          // maps should be inserted into the current map. If the value associated with the key
-          // is a single mapping node, each of its key/value pairs is inserted into the current
-          // mapping, unless the key already exists in it.
-          if ('<<' === $key) {
-            $merge= $this->valueOf($reader, $value, $spaces);
-            foreach (0 === key($merge) ? $merge : [$merge] as $map) {
-              $r+= $map;
-            }
+        } else {
+          $offset= $spaces;
+          $token= $reader->token($line, $offset, ':');
+
+          // After reading the token, if we encounter a colon, construct a map
+          if (false === ($p= strpos($line, ':', $offset))) {
+            $r= $this->tokenValue($token);
           } else {
-            $r[$key]= $this->valueOf($reader, $value, $spaces);
+            $key= trim($this->tokenValue($token));
+            $p++;
+            $value= $p + 1 < $l ? substr($line, $p + strspn($line, ' ', $p)) : null;
+
+            // The “<<” merge key is used to indicate that all the keys of one or more specified
+            // maps should be inserted into the current map. If the value associated with the key
+            // is a single mapping node, each of its key/value pairs is inserted into the current
+            // mapping, unless the key already exists in it.
+            if ('<<' === $key) {
+              $merge= $this->valueOf($reader, $value, $spaces);
+              foreach (0 === key($merge) ? $merge : [$merge] as $map) {
+                $r+= $map;
+              }
+            } else {
+              $r[$key]= $this->valueOf($reader, $value, $spaces);
+            }
           }
-        } else {
-          $r= $this->valueOf($reader, $line, $spaces);
         }
 
       } while (null !== ($line= $reader->nextLine()));

src/test/php/org/yaml/unittest/EmptyNodesTest.class.php

@@ -1,6 +1,6 @@
 <?php namespace org\yaml\unittest;
 
-use test\{Assert, Ignore, Test};
+use test\{Assert, Test};
 
 /**
  * 7.2 Empty Nodes
@@ -18,7 +18,7 @@ public function empty_value() {
     Assert::equals(['key' => null], $this->parse('key: '));
   }
 
-  #[Test, Ignore('Key types not yet supported')]
+  #[Test]
   public function empty_string_key() {
     Assert::equals(['' => 'value'], $this->parse('!!str : value'));
   }

src/test/php/org/yaml/unittest/YamlParserTest.class.php

@@ -131,6 +131,11 @@ public function parse_sequence() {
     );
   }
 
+  #[Test, Values([['key', 'key'], ['"key"', 'key'], ["'key'", 'key'], ['key b', 'key b'], ['"key:"', 'key:'], ['"key::b"', 'key::b'], ['"key \"b\""', 'key "b"'], ["'key ''b'''", "key 'b'"], ['!!str key', 'key']])]
+  public function string_keys($declaration, $expected) {
+    Assert::equals([$expected => 1], $this->parse("{$declaration}: 1"));
+  }
+
   #[Test]
   public function mapping_scalars_to_sequences() {
     Assert::equals(