From 917f067885810d3639eee3b12f879fd1e86e9052 Mon Sep 17 00:00:00 2001 From: aamine Date: Mon, 20 Sep 2004 02:02:58 +0000 Subject: * parse.y [ripper]: adjust line number for heredoc. [ruby-dev:24272] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6928 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index e749d49cd3..46de788925 100644 --- a/parse.y +++ b/parse.y @@ -4938,8 +4938,22 @@ parser_tokadd_string(parser, func, term, paren, nest) return c; } -#define NEW_STRTERM(func, term, paren) \ +#define NEW_STRTERM0(func, term, paren) \ rb_node_newnode(NODE_STRTERM, (func), (term) | ((paren) << (CHAR_BIT * 2)), 0) +#ifndef RIPPER +#define NEW_STRTERM(func, term, paren) NEW_STRTERM0(func, term, paren) +#else +#define NEW_STRTERM(func, term, paren) ripper_new_strterm(parser, func, term, paren) +static NODE * +ripper_new_strterm(parser, func, term, paren) + struct parser_params *parser; + VALUE func, term, paren; +{ + NODE *node = NEW_STRTERM0(func, term, paren); + nd_set_line(node, ruby_sourceline); + return node; +} +#endif static int parser_parse_string(parser, quote) @@ -5055,6 +5069,7 @@ parser_heredoc_identifier(parser) rb_str_new(tok(), toklen()), /* nd_lit */ len, /* nd_nth */ lex_lastline); /* nd_orig */ + nd_set_line(lex_strterm, ruby_sourceline); parser_clear_token(parser); return term == '`' ? tXSTRING_BEG : tSTRING_BEG; } -- cgit v1.2.3