From 500c78c610d9cde2f7a85755f8eb4105e5889ea4 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 5 Apr 2010 10:57:38 +0000
Subject: [PATCH] * re.c (make_regexp): use onig_new_with_source to keep  
 sourcefile and sourceline.

* re.c (onig_new_with_source): copied from onig_new in
  regcomp.c for keep sourcefile and sourceline.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27225 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  8 ++++++++
 re.c      | 26 ++++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2fa95e8d56..86ab4a4222 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Apr  5 19:54:58 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (make_regexp): use onig_new_with_source to keep
+	  sourcefile and sourceline.
+
+	* re.c (onig_new_with_source): copied from onig_new in
+	  regcomp.c for keep sourcefile and sourceline.
+
 Mon Apr  5 13:20:45 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* include/ruby/win32.h, win32/win32.c (EWOULDBLOCK): VC10 already
diff --git a/re.c b/re.c
index 6230173c04..c9568612fc 100644
--- a/re.c
+++ b/re.c
@@ -725,6 +725,28 @@ rb_reg_named_captures(VALUE re)
     return hash;
 }
 
+static int
+onig_new_with_source(regex_t** reg, const UChar* pattern, const UChar* pattern_end,
+	  OnigOptionType option, OnigEncoding enc, const OnigSyntaxType* syntax,
+	  OnigErrorInfo* einfo, const char *sourcefile, int sourceline)
+{
+  int r;
+
+  *reg = (regex_t* )xmalloc(sizeof(regex_t));
+  if (IS_NULL(*reg)) return ONIGERR_MEMORY;
+
+  r = onig_reg_init(*reg, option, ONIGENC_CASE_FOLD_DEFAULT, enc, syntax);
+  if (r) goto err;
+
+  r = onig_compile(*reg, pattern, pattern_end, einfo, sourcefile, sourceline);
+  if (r) {
+  err:
+    onig_free(*reg);
+    *reg = NULL;
+  }
+  return r;
+}
+
 static Regexp*
 make_regexp(const char *s, long len, rb_encoding *enc, int flags, onig_errmsg_buffer err,
 	const char *sourcefile, int sourceline)
@@ -740,8 +762,8 @@ make_regexp(const char *s, long len, rb_encoding *enc, int flags, onig_errmsg_bu
        from that.
     */
 
-    r = onig_new(&rp, (UChar*)s, (UChar*)(s + len), flags,
-		 enc, OnigDefaultSyntax, &einfo);
+    r = onig_new_with_source(&rp, (UChar*)s, (UChar*)(s + len), flags,
+		 enc, OnigDefaultSyntax, &einfo, sourcefile, sourceline);
     if (r) {
 	onig_error_code_to_str((UChar*)err, r, &einfo);
 	return 0;