From 4a98d5c8fd56119a5e30f8e371fd4aac1866895d Mon Sep 17 00:00:00 2001
From: Yukihiro Matsumoto <matz@ruby-lang.org>
Date: Thu, 28 Jun 2012 23:35:17 +0900
Subject: allow string interpolation in symbols like :"a=#{15}"

---
 src/codegen.c |  9 +++++++++
 src/parse.y   | 14 +++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/codegen.c b/src/codegen.c
index fb0006625..2654fcbe3 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -1711,6 +1711,15 @@ codegen(codegen_scope *s, node *tree, int val)
     }
     break;
 
+  case NODE_DSYM:
+    codegen(s, tree, val);
+    if (val) {
+      pop();
+      genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern(s->mrb, "intern")), 0));
+      push();
+    }
+    break;
+
   case NODE_SELF:
     if (val) {
       genop(s, MKOP_A(OP_LOADSELF, cursp()));
diff --git a/src/parse.y b/src/parse.y
index 069a97412..af8b93cfa 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -527,13 +527,6 @@ new_strsym(parser_state *p, node* str)
   return mrb_intern2(p->mrb, s, len);
 }
 
-// (:sym . a)
-static node*
-new_dsym(parser_state *p, node *a)
-{
-  return cons((node*)NODE_DSYM, a);
-}
-
 // (:lvar . a)
 static node*
 new_lvar(parser_state *p, mrb_sym sym)
@@ -705,6 +698,13 @@ new_dstr(parser_state *p, node *a)
   return cons((node*)NODE_DSTR, a);
 }
 
+// (:dsym . a)
+static node*
+new_dsym(parser_state *p, node *a)
+{
+  return cons((node*)NODE_DSYM, new_dstr(p, a));
+}
+
 // (:backref . n)
 static node*
 new_back_ref(parser_state *p, int n)
-- 
cgit v1.2.3