From 1e8bbf315464f212ee53de3929c02de0b73c92a1 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 16 Oct 2008 22:21:42 +0000
Subject: * .gdbinit (rp): REGEXP handling fixed.

* string.c (rb_str_rindex_m): need not to call rb_enc_check on
  regexp.

* re.c (unescape_escaped_nonascii): try ASCII-8BIT encoding for
  broken strings.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 .gdbinit | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to '.gdbinit')

diff --git a/.gdbinit b/.gdbinit
index 96e033fa88..c2a8b28d0b 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -86,11 +86,17 @@ define rp
     print (struct RString *)$arg0
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_REGEXP
+    set $regsrc = ((struct RRegexp*)$arg0)->src
+    set $rsflags = ((struct RBasic*)$regsrc)->flags
     printf "T_REGEXP: "
     set print address off
-    output ((struct RRegexp*)$arg0)->str
+    output (char *)(($rsflags & RUBY_FL_USER1) ? \
+	    ((struct RString*)$regsrc)->as.heap.ptr : \
+	    ((struct RString*)$regsrc)->as.ary)
     set print address on
-    printf " len:%ld ", ((struct RRegexp*)$arg0)->len
+    printf " len:%ld ", ($rsflags & RUBY_FL_USER1) ? \
+            ((struct RString*)$regsrc)->as.heap.len : \
+            (($rsflags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
     if $flags & RUBY_FL_USER6
       printf "(none) "
     end
-- 
cgit v1.2.3