scalar supports anchors

3 files changed, 12 insertions, 3 deletions

diff --git a/ext/psych/parser.c b/ext/psych/parser.c
index 6fd6cb4..1503520 100644
--- a/ext/psych/parser.c
+++ b/ext/psych/parser.c
@@ -79,11 +79,15 @@ static VALUE parse_string(VALUE self, VALUE string)
               (long)event.data.scalar.length
           );
 
+          VALUE anchor = event.data.scalar.anchor ?
+            rb_str_new2((const char *)event.data.scalar.anchor) :
+            Qnil;
+
           VALUE tag = event.data.scalar.tag ?
             rb_str_new2((const char *)event.data.scalar.tag) :
             Qnil;
 
-          rb_funcall(handler, rb_intern("scalar"), 2, tag, val);
+          rb_funcall(handler, rb_intern("scalar"), 3, val, anchor, tag);
         }
         break;
       case YAML_STREAM_END_EVENT:
diff --git a/lib/psych/parser/handler.rb b/lib/psych/parser/handler.rb
index a36e8fa..a0152e7 100644
--- a/lib/psych/parser/handler.rb
+++ b/lib/psych/parser/handler.rb
@@ -26,7 +26,7 @@ module Psych
 
       ###
       # Called when a scalar +value+ is found
-      def scalar tag, value
+      def scalar value, anchor = nil, tag = nil
       end
 
       ###
diff --git a/test/psych/test_parser.rb b/test/psych/test_parser.rb
index 90c19b2..4ab7860 100644
--- a/test/psych/test_parser.rb
+++ b/test/psych/test_parser.rb
@@ -30,7 +30,12 @@ module Psych
 
     def test_scalar_with_tag
       @parser.parse("---\n!!str foo\n")
-      assert_called :scalar, ['tag:yaml.org,2002:str', 'foo']
+      assert_called :scalar, ['foo', 'tag:yaml.org,2002:str']
+    end
+
+    def test_scalar_with_anchor
+      @parser.parse("---\n&A foo\n")
+      assert_called :scalar, ['foo', 'A']
     end
 
     def test_alias