diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/psych/parser.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Wed Oct 5 01:52:16 2011 Aaron Patterson <aaron@tenderlovemaking.com> + + * ext/psych/parser.c (parse): Use context_mark for indicating error + line and column. + Wed Oct 5 01:22:08 2011 Aaron Patterson <aaron@tenderlovemaking.com> * ext/psych/lib/psych/scalar_scanner.rb: use normal begin / rescue diff --git a/ext/psych/parser.c b/ext/psych/parser.c index e68768f562..f3928a9510 100644 --- a/ext/psych/parser.c +++ b/ext/psych/parser.c @@ -99,8 +99,8 @@ 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 column = parser->mark.column; + size_t line = parser->context_mark.line + 1; + size_t column = parser->context_mark.column + 1; if(rb_respond_to(yaml, id_path)) path = rb_funcall(yaml, id_path, 0); |