string interpolation in regex

1 files changed, 20 insertions, 0 deletions

diff --git a/src/parse.y b/src/parse.y
index 2c5690ea3..7bca4a4d6 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -715,6 +715,13 @@ new_regx(parser_state *p, const char *p1, const char* p2)
   return cons((node*)NODE_REGX, cons((node*)p1, (node*)p2));
 }
 
+// (:dregx . a)
+static node*
+new_dregx(parser_state *p, node *a, node *b)
+{
+  return cons((node*)NODE_DREGX, cons(a, b));
+}
+
 // (:backref . n)
 static node*
 new_back_ref(parser_state *p, int n)
@@ -2510,6 +2517,10 @@ regexp		: tREGEXP_BEG tREGEXP
 		    {
 			$$ = $2;
 		    }
+		| tREGEXP_BEG string_interp tREGEXP
+		    {
+		      $$ = new_dregx(p, $2, $3);
+		    }
 		;
 
 symbol		: basic_symbol
@@ -5502,6 +5513,15 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
     printf("NODE_REGX /%s/%s\n", (char*)tree->car, (char*)tree->cdr);
     break;
 
+  case NODE_DREGX:
+    printf("NODE_DREGX\n");
+    dump_recur(mrb, tree->car, offset+1);
+    dump_prefix(offset);
+    printf("tail: %s\n", (char*)tree->cdr->cdr->car);
+    dump_prefix(offset);
+    printf("opt: %s\n", (char*)tree->cdr->cdr->cdr);
+    break;
+
   case NODE_SYM:
     printf("NODE_SYM :%s\n", mrb_sym2name(mrb, sym(tree)));
     break;