diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-02 15:05:27 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-02 15:05:27 +0000 |
commit | ccf5372b252a229ddb6693db132edc013419ccdc (patch) | |
tree | 2d0619ed60d5749e05e9479c5aa1cab82959266e /ruby.h | |
parent | 2156870525be05f0bd769af141c3f6cff9fff8c4 (diff) |
* object.c (Init_Object): move symbol related code to string.c
* string.c (Init_String): Symbol as subclass of String.
* parse.y (rb_intern2): handle symbol as strings.
* string.c (str_new): substring of symbols are mere strings, not
symbols.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.h')
-rw-r--r-- | ruby.h | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -195,10 +195,11 @@ VALUE rb_ull2inum(unsigned LONG_LONG); #define IMMEDIATE_MASK 0x03 #define IMMEDIATE_P(x) ((VALUE)(x) & IMMEDIATE_MASK) -#define SYMBOL_FLAG 0x0e -#define SYMBOL_P(x) (((VALUE)(x)&0xff)==SYMBOL_FLAG) -#define ID2SYM(x) ((VALUE)(((long)(x))<<8|SYMBOL_FLAG)) -#define SYM2ID(x) RSHIFT((VALUE)x,8) +#define SYMBOL_P(x) (!IMMEDIATE_P(x) && RBASIC(x)->klass == rb_cSymbol) +VALUE rb_id2sym(ID); +ID rb_sym2id(VALUE); +#define ID2SYM(x) rb_id2sym(x) +#define SYM2ID(x) rb_sym2id(x) /* special contants - i.e. non-zero and non-fixnum constants */ #define Qfalse ((VALUE)0) @@ -596,6 +597,7 @@ void rb_gc_register_address(VALUE*); void rb_gc_unregister_address(VALUE*); ID rb_intern(const char*); +ID rb_intern2(const char*, long); const char *rb_id2name(ID); ID rb_to_id(VALUE); |