nobu	2007-12-21 17:31:24 +0900 (Fri, 21 Dec 2007)

  New Revision: 14422

  Modified files:
    trunk/.gdbinit
    trunk/ChangeLog
    trunk/debug.c

  Log:
    * debug.c (dummy_gdb_enums.various): added ENCODING and CODERANGE
      constants.
    
    * .gdbinit: use enum constants.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/.gdbinit?r1=14422&r2=14421
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14422&r2=14421
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/debug.c?r1=14422&r2=14421

Index: .gdbinit
===================================================================
--- .gdbinit	(revision 14421)
+++ .gdbinit	(revision 14422)
@@ -69,14 +69,14 @@
         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 @@
     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
Index: debug.c
===================================================================
--- debug.c	(revision 14421)
+++ debug.c	(revision 14422)
@@ -21,7 +21,14 @@
     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,
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14421)
+++ ChangeLog	(revision 14422)
@@ -1,3 +1,10 @@
+Fri Dec 21 17:31:22 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@a...>
 
 	* bootstraptest/featurebug.rb: added.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml