diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/psych/parser.c | 2 | ||||
| -rw-r--r-- | test/psych/test_parser.rb | 15 |
3 files changed, 23 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Sat Jan 22 11:21:40 2011 Aaron Patterson <aaron@tenderlovemaking.com> + + * ext/psych/parser.c (parse): fixing off-by-one error on line numbers + in parse exceptions. [ruby-core:34690] + + * test/psych/test_parser.rb: test for error + Sat Jan 22 10:25:19 2011 Aaron Patterson <aaron@tenderlovemaking.com> * ext/psych/parser.c (parse): add the file name to the exception when diff --git a/ext/psych/parser.c b/ext/psych/parser.c index 7bfdf4af90..05b493a853 100644 --- a/ext/psych/parser.c +++ b/ext/psych/parser.c @@ -95,7 +95,7 @@ static VALUE parse(VALUE self, VALUE yaml) while(!done) { if(!yaml_parser_parse(parser, &event)) { VALUE path; - size_t line = parser->mark.line; + size_t line = parser->mark.line + 1; size_t column = parser->mark.column; if(rb_respond_to(yaml, id_path)) diff --git a/test/psych/test_parser.rb b/test/psych/test_parser.rb index a60a0c6d86..3894eadb4e 100644 --- a/test/psych/test_parser.rb +++ b/test/psych/test_parser.rb @@ -155,6 +155,21 @@ module Psych assert_match "(#{io.path}):", e.message end + # ruby-core:34690 + def test_exception_line + e = assert_raises(Psych::SyntaxError) do + @parser.parse(<<-eoyaml) +# based on "SGML/XML character entity reference" at http://www.bitjungle.com/isoent/ +# +--- +#DOUBLE LOW-9 QUOTATION MARK +#requires fontenc:T1 +ldquor: ,, + eoyaml + end + assert_match 'line 6', e.message + end + def test_mapping_end @parser.parse("---\n!!map { key: value }") assert_called :end_mapping |