* debug.c (dummy_gdb_enums.various): added ENCODING and CODERANGE

  constants.

* .gdbinit: use enum constants.


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

3 files changed, 19 insertions, 5 deletions

diff --git a/.gdbinit b/.gdbinit
index 0c5600be9c..e5ebb03c16 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -69,14 +69,14 @@ define rp
         printf "(assoc) "
       end
     end
-    printf "encoding:%d ", ($flags & (RUBY_FL_USER8|RUBY_FL_USER9|RUBY_FL_USER10|RUBY_FL_USER11)) >> RUBY_ENCODING_SHIFT
-    if ($flags & (RUBY_FL_USER12|RUBY_FL_USER13)) == 0
+    printf "encoding:%d ", ($flags & RUBY_ENCODING_MASK) >> RUBY_ENCODING_SHIFT
+    if ($flags & RUBY_ENC_CODERANGE_MASK) == 0
       printf "coderange:unknown "
     else
-    if ($flags & (RUBY_FL_USER12|RUBY_FL_USER13)) == RUBY_FL_USER12
+    if ($flags & RUBY_ENC_CODERANGE_MASK) == RUBY_ENC_CODERANGE_7BIT
       printf "coderange:7bit "
     else
-    if ($flags & (RUBY_FL_USER12|RUBY_FL_USER13)) == RUBY_FL_USER13
+    if ($flags & RUBY_ENC_CODERANGE_MASK) == RUBY_ENC_CODERANGE_VALID
       printf "coderange:valid "
     else
       printf "coderange:broken "
@@ -97,7 +97,7 @@ define rp
     if $flags & RUBY_FL_USER4
       printf "(fixed) "
     end
-    printf "encoding:%d ", ($flags & (RUBY_FL_USER8|RUBY_FL_USER9|RUBY_FL_USER10|RUBY_FL_USER11)) >> RUBY_ENCODING_SHIFT
+    printf "encoding:%d ", ($flags & RUBY_ENCODING_MASK) >> RUBY_ENCODING_SHIFT
     print (struct RRegexp *)$arg0
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_ARRAY
diff --git a/ChangeLog b/ChangeLog
index e1f97eddb0..950b583099 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Dec 21 17:31:22 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* debug.c (dummy_gdb_enums.various): added ENCODING and CODERANGE
+	  constants.
+
+	* .gdbinit: use enum constants.
+
 Fri Dec 21 17:28:17 2007  Koichi Sasada  <ko1@atdot.net>
 
 	* bootstraptest/featurebug.rb: added.
diff --git a/debug.c b/debug.c
index 5dc5c86a39..abc1daa7eb 100644
--- a/debug.c
+++ b/debug.c
@@ -21,7 +21,14 @@ static const union {
     enum ruby_value_type        value_type;
     enum node_type              node_type;
     enum {
+        RUBY_ENCODING_INLINE_MAX = ENCODING_INLINE_MAX,
         RUBY_ENCODING_SHIFT = ENCODING_SHIFT,
+        RUBY_ENCODING_MASK  = ENCODING_MASK,
+        RUBY_ENC_CODERANGE_MASK    = ENC_CODERANGE_MASK,
+        RUBY_ENC_CODERANGE_UNKNOWN = ENC_CODERANGE_UNKNOWN,
+        RUBY_ENC_CODERANGE_7BIT    = ENC_CODERANGE_7BIT,
+        RUBY_ENC_CODERANGE_VALID   = ENC_CODERANGE_VALID,
+        RUBY_ENC_CODERANGE_BROKEN  = ENC_CODERANGE_BROKEN, 
         RUBY_FL_MARK        = FL_MARK,
         RUBY_FL_RESERVED    = FL_RESERVED,
         RUBY_FL_FINALIZE    = FL_FINALIZE,