diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-22 22:43:41 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-22 22:43:41 +0000 |
| commit | 18e3c52bc4d39881e4ab3a0ffdd9117c1f5b2ab1 (patch) | |
| tree | 7ad96d7ee1998d13afdeb470e10028e0f49d87f6 | |
| parent | 8135c466ec00ad6f858c9068f48732fef165134a (diff) | |
reverting r30628 since this seems like a bug in libyaml
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30634 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -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, 1 insertions, 23 deletions
@@ -18,13 +18,6 @@ Sat Jan 22 11:33:04 2011 Aaron Patterson <aaron@tenderlovemaking.com> * test/psych/test_merge_keys.rb: test for merge keys -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 05b493a853..7bfdf4af90 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 + 1; + size_t line = parser->mark.line; 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 3894eadb4e..a60a0c6d86 100644 --- a/test/psych/test_parser.rb +++ b/test/psych/test_parser.rb @@ -155,21 +155,6 @@ 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 |