merges r25402,r25404,r25405,r25406 and r25407 from trunk into ruby_1_9_1.

--
* parse.y (parser_here_document): dispatch delayed heredoc
  contents.  based on a patch from Andy Keep in [ruby-core:24855].
--
* parse.y (mlhs_basic): fixed handling splat in middle of mlhs.  a
  patch from Andy Keep in [ruby-core:26163]
--
* parse.y (method_call): dispatch symbols.  a patch from Andy Keep in
  [ruby-core:26169].  [ruby-core:26165]
--
* test/ripper/test_*.rb: fixed indent.
--
* parse.y (ripper_intern): enable literal optimization.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26496 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 7 deletions

diff --git a/parse.y b/parse.y
index 15a3b787e5..0d66fcfac3 100644
--- a/parse.y
+++ b/parse.y
@@ -515,7 +515,7 @@ static VALUE ripper_dispatch5(struct parser_params*,ID,VALUE,VALUE,VALUE,VALUE,V
 
 #define yyparse ripper_yyparse
 
-static VALUE ripper_intern(const char*);
+#define ripper_intern(s) ID2SYM(rb_intern(s))
 static VALUE ripper_id2sym(ID);
 #ifdef __GNUC__
 #define ripper_id2sym(id) ((id) < 256 && rb_ispunct(id) ? \
@@ -10205,12 +10205,6 @@ ripper_id2sym(ID id)
     return ID2SYM(rb_intern(name));
 }
 
-static VALUE
-ripper_intern(const char *s)
-{
-    return ID2SYM(rb_intern(s));
-}
-
 static ID
 ripper_get_id(VALUE v)
 {