diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-14 08:57:07 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-14 08:57:07 +0000 |
commit | dc02325fd82602bc9f9e6d1b85b5b03425d6d43f (patch) | |
tree | 36639504d69b3a58522706e956fe7326d0011eb2 /id.h | |
parent | c710140216e3fde8130d8a583a1e1c9582be20e9 (diff) | |
download | ruby-dc02325fd82602bc9f9e6d1b85b5b03425d6d43f.tar.gz |
* include/ruby/encoding.h (rb_enc_ispunct): added.
* common.mk (COMMONOBJS), inits.c (rb_call_inits): id.c is now
included from parse.c.
* id.c (Init_id), id.h (ruby_method_ids): added IDs used by VM.
* parse.y (global_symbols): added rooms for VM IDs.
* parse.y (rb_intern3, rb_id2str): single puctuation symbol is now
same as char code.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18614 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'id.h')
-rw-r--r-- | id.h | 72 |
1 files changed, 43 insertions, 29 deletions
@@ -12,10 +12,21 @@ #ifndef RUBY_ID_H #define RUBY_ID_H +#define ID_SCOPE_SHIFT 3 +#define ID_SCOPE_MASK 0x07 +#define ID_LOCAL 0x00 +#define ID_INSTANCE 0x01 +#define ID_GLOBAL 0x03 +#define ID_ATTRSET 0x04 +#define ID_CONST 0x05 +#define ID_CLASS 0x06 +#define ID_JUNK 0x07 +#define ID_INTERNAL ID_JUNK + #include "parse.h" -extern VALUE symIFUNC; -extern VALUE symCFUNC; +#define symIFUNC ID2SYM(idIFUNC) +#define symCFUNC ID2SYM(idCFUNC) enum ruby_method_ids { idPLUS = '+', @@ -36,34 +47,37 @@ enum ruby_method_ids { idEqTilde = tMATCH, idAREF = tAREF, idASET = tASET, - idDummy + idLAST_TOKEN = tLAST_TOKEN >> ID_SCOPE_SHIFT, + tIntern, + tMethodMissing, + tLength, + tGets, + tSucc, + tEach, + tLambda, + tSend, + t__send__, + tInitialize, +#if SUPPORT_JOKE + tBitblt, + tAnswer, +#endif + tLAST_ID }; -extern ID idThrowState; -extern ID idIntern; -extern ID idMethodMissing; -extern ID idLength; -extern ID idGets; -extern ID idSucc; -extern ID idEach; -extern ID idLambda; -extern ID idRangeEachLT; -extern ID idRangeEachLE; -extern ID idArrayEach; -extern ID idTimes; -extern ID idEnd; -extern ID idBitblt; -extern ID idAnswer; -extern ID idSend; -extern ID id__send__; -extern ID idRespond_to; -extern ID idInitialize; - -extern ID id_core_set_method_alias; -extern ID id_core_set_variable_alias; -extern ID id_core_undef_method; -extern ID id_core_define_method; -extern ID id_core_define_singleton_method; -extern ID id_core_set_postexe; +#define idIntern ((tIntern<<ID_SCOPE_SHIFT)|ID_LOCAL) +#define idMethodMissing ((tMethodMissing<<ID_SCOPE_SHIFT)|ID_LOCAL) +#define idLength ((tLength<<ID_SCOPE_SHIFT)|ID_LOCAL) +#define idGets ((tGets<<ID_SCOPE_SHIFT)|ID_LOCAL) +#define idSucc ((tSucc<<ID_SCOPE_SHIFT)|ID_LOCAL) +#define idEach ((tEach<<ID_SCOPE_SHIFT)|ID_LOCAL) +#define idLambda ((tLambda<<ID_SCOPE_SHIFT)|ID_LOCAL) +#define idSend ((tSend<<ID_SCOPE_SHIFT)|ID_LOCAL) +#define id__send__ ((t__send__<<ID_SCOPE_SHIFT)|ID_LOCAL) +#define idInitialize ((tInitialize<<ID_SCOPE_SHIFT)|ID_LOCAL) +#if SUPPORT_JOKE +#define idBitblt ((tBitblt<<ID_SCOPE_SHIFT)|ID_LOCAL) +#define idAnswer ((tAnswer<<ID_SCOPE_SHIFT)|ID_LOCAL) +#endif #endif /* RUBY_ID_H */ |