[ruby-dev:11900] [PATCH] id2ref for Symbol

~~~~~~

  ObjectSpace::_id2ref(:-.__id__) == :- ~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~

  ruby -e 'p ObjectSpace::_id2ref(8)'
  -e:1:in `_id2ref': 0x10 is not id value (RangeError)

  ~~ parse.y ~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~


Index: gc.c
===================================================================
RCS file: /ruby/ruby/gc.c,v
retrieving revision 1.51
diff -u -2 -p -r1.51 gc.c
--- gc.c	2000/12/29 18:23:22	1.51
+++ gc.c	2000/12/30 03:03:38
@@ -1264,16 +1264,20 @@ id2ref(obj, id)
 
     rb_secure(4);
-    ptr = NUM2UINT(id);
-    if (FIXNUM_P(ptr)) return (VALUE)ptr;
-    if (ptr == Qtrue) return Qtrue;
-    if (ptr == Qfalse) return Qfalse;
-    if (ptr == Qnil) return Qnil;
+    ptr = id;
+    id = NUM2UINT(id);
+    if (FIXNUM_P(id)) return id;
+    if (id == Qtrue) return Qtrue;
+    if (id == Qfalse) return Qfalse;
+    if (id == Qnil) return Qnil;
+    if (IMMEDIATE_P(id)) {
+	if (SYMBOL_P(id) && rb_id2name(SYM2ID(id))) return id;
+	rb_raise(rb_eRangeError, "0x%x is unknown immediate", id);
+    }
 
-    ptr = id ^ FIXNUM_FLAG;	/* unset FIXNUM_FLAG */
     if (!is_pointer_to_heap(ptr)) {
-	rb_raise(rb_eRangeError, "0x%x is not id value", ptr);
+	rb_raise(rb_eRangeError, "0x%x is not id value", id);
     }
     if (BUILTIN_TYPE(ptr) == 0) {
-	rb_raise(rb_eRangeError, "0x%x is recycled object", ptr);
+	rb_raise(rb_eRangeError, "0x%x is recycled object", id);
     }
     return (VALUE)ptr;
Index: parse.y
===================================================================
RCS file: /ruby/ruby/parse.y,v
retrieving revision 1.77
diff -u -2 -p -r1.77 parse.y
--- parse.y	2000/12/28 05:00:39	1.77
+++ parse.y	2000/12/30 03:36:47
@@ -4785,11 +4785,6 @@ static struct {
     tDOT2,	"..",
     tDOT3,	"...",
-    '+',	"+",
-    '-',	"-",
     '+',	"+(binary)",
     '-',	"-(binary)",
-    '*',	"*",
-    '/',	"/",
-    '%',	"%",
     tPOW,	"**",
     tUPLUS,	"+@",
@@ -4797,11 +4792,6 @@ static struct {
     tUPLUS,	"+(unary)",
     tUMINUS,	"-(unary)",
-    '|',	"|",
-    '^',	"^",
-    '&',	"&",
     tCMP,	"<=>",
-    '>',	">",
     tGEQ,	">=",
-    '<',	"<",
     tLEQ,	"<=",
     tEQ,	"==",
@@ -4810,6 +4800,4 @@ static struct {
     tMATCH,	"=~",
     tNMATCH,	"!~",
-    '!',	"!",
-    '~',	"~",
     '!',	"!(unary)",
     '~',	"~(unary)",
@@ -4822,5 +4810,4 @@ static struct {
     tCOLON2,	"::",
     tCOLON3,	"::",
-    '`',	"`",
     0,		0,
 };
@@ -4838,4 +4825,6 @@ Init_sym()
 }
 
+#define ASCII_SYMBOL_P(c) (isascii(c) && !ISALPHA(c))
+
 ID
 rb_intern(name)
@@ -4846,4 +4835,7 @@ rb_intern(name)
     int last;
 
+    if (!name[0]) return 0;
+    if (!name[1] && ASCII_SYMBOL_P(name[0])) return toascii(name[0]);
+
     if (st_lookup(sym_tbl, name, &id))
 	return id;
@@ -4909,4 +4901,10 @@ rb_id2name(id)
 {
     char *name;
+
+    if (ASCII_SYMBOL_P(id)) {
+	static char name[128][2];
+	name[id][0] = (char)id;
+	return name[id];
+    }
 
     if (id < LAST_TOKEN) {


-- 
--- ~~~~Bug~~~~
--- ~~~~~Bug~~~~~
    ~~ ~~