зеркало из https://github.com/github/ruby.git
symbol.c, symbol.h: split from parse.y
* symbol.c, symbol.h: Symbol class implementation and internals, split from parse.y. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46768 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
d299250afa
Коммит
94ce481263
|
@ -1,3 +1,8 @@
|
|||
Wed Jul 9 17:07:28 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* symbol.c, symbol.h: Symbol class implementation and internals,
|
||||
split from parse.y.
|
||||
|
||||
Wed Jul 9 14:45:39 2014 Koichi Sasada <ko1@atdot.net>
|
||||
|
||||
* parse.y: change Symbol <-> ID relationship to avoid
|
||||
|
|
|
@ -81,6 +81,7 @@ COMMONOBJS = array.$(OBJEXT) \
|
|||
strftime.$(OBJEXT) \
|
||||
string.$(OBJEXT) \
|
||||
struct.$(OBJEXT) \
|
||||
symbol.$(OBJEXT) \
|
||||
time.$(OBJEXT) \
|
||||
transcode.$(OBJEXT) \
|
||||
util.$(OBJEXT) \
|
||||
|
@ -731,7 +732,7 @@ object.$(OBJEXT): {$(VPATH)}object.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
|
|||
pack.$(OBJEXT): {$(VPATH)}pack.c $(RUBY_H_INCLUDES) {$(VPATH)}encoding.h \
|
||||
{$(VPATH)}oniguruma.h {$(VPATH)}internal.h
|
||||
parse.$(OBJEXT): {$(VPATH)}parse.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h \
|
||||
$(ENCODING_H_INCLUDES) {$(VPATH)}id.h {$(VPATH)}regenc.h \
|
||||
$(ENCODING_H_INCLUDES) {$(VPATH)}id.h {$(VPATH)}symbol.h {$(VPATH)}regenc.h \
|
||||
{$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c \
|
||||
{$(VPATH)}defs/keywords {$(VPATH)}id.c {$(VPATH)}parse.y \
|
||||
{$(VPATH)}parse.h {$(VPATH)}internal.h $(PROBES_H_INCLUDES) {$(VPATH)}vm_opts.h {$(VPATH)}gc.h
|
||||
|
@ -778,6 +779,9 @@ strftime.$(OBJEXT): {$(VPATH)}strftime.c $(RUBY_H_INCLUDES) \
|
|||
string.$(OBJEXT): {$(VPATH)}string.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h {$(VPATH)}gc.h \
|
||||
{$(VPATH)}regex.h $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h $(PROBES_H_INCLUDES)
|
||||
struct.$(OBJEXT): {$(VPATH)}struct.c $(RUBY_H_INCLUDES) {$(VPATH)}internal.h
|
||||
symbol.$(OBJEXT): {$(VPATH)}symbol.c $(RUBY_H_INCLUDES) $(ENCODING_H_INCLUDES) \
|
||||
{$(VPATH)}internal.h {$(VPATH)}node.h {$(VPATH)}parse.h {$(VPATH)}id.h {$(VPATH)}symbol.h \
|
||||
$(PROBES_H_INCLUDES)
|
||||
thread.$(OBJEXT): {$(VPATH)}thread.c {$(VPATH)}eval_intern.h \
|
||||
$(RUBY_H_INCLUDES) {$(VPATH)}gc.h $(VM_CORE_H_INCLUDES) \
|
||||
{$(VPATH)}thread_$(THREAD_MODEL).c $(ENCODING_H_INCLUDES) \
|
||||
|
|
1151
parse.y
1151
parse.y
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
@ -0,0 +1,56 @@
|
|||
/**********************************************************************
|
||||
|
||||
symbol.h -
|
||||
|
||||
$Author$
|
||||
created at: Tue Jul 8 15:49:54 JST 2014
|
||||
|
||||
Copyright (C) 2014 Yukihiro Matsumoto
|
||||
|
||||
**********************************************************************/
|
||||
|
||||
#ifndef RUBY_SYMBOL_H
|
||||
#define RUBY_SYMBOL_H 1
|
||||
|
||||
#include "id.h"
|
||||
|
||||
#define ID_DYNAMIC_SYM_P(id) (!(id&ID_STATIC_SYM)&&id>tLAST_TOKEN)
|
||||
#define STATIC_SYM2ID(sym) RSHIFT((unsigned long)(sym), RUBY_SPECIAL_SHIFT)
|
||||
#define STATIC_ID2SYM(id) (((VALUE)(id)<<RUBY_SPECIAL_SHIFT)|SYMBOL_FLAG)
|
||||
|
||||
static inline int
|
||||
id_type(ID id)
|
||||
{
|
||||
if (id<=tLAST_OP_ID) {
|
||||
return -1;
|
||||
}
|
||||
if (id&ID_STATIC_SYM) {
|
||||
return (int)((id)&ID_SCOPE_MASK);
|
||||
}
|
||||
else {
|
||||
VALUE dsym = (VALUE)id;
|
||||
return (int)(RSYMBOL(dsym)->type);
|
||||
}
|
||||
}
|
||||
|
||||
#define is_notop_id(id) ((id)>tLAST_OP_ID)
|
||||
#define is_local_id(id) (id_type(id)==ID_LOCAL)
|
||||
#define is_global_id(id) (id_type(id)==ID_GLOBAL)
|
||||
#define is_instance_id(id) (id_type(id)==ID_INSTANCE)
|
||||
#define is_attrset_id(id) (id_type(id)==ID_ATTRSET)
|
||||
#define is_const_id(id) (id_type(id)==ID_CONST)
|
||||
#define is_class_id(id) (id_type(id)==ID_CLASS)
|
||||
#define is_junk_id(id) (id_type(id)==ID_JUNK)
|
||||
|
||||
RUBY_FUNC_EXPORTED const unsigned int ruby_global_name_punct_bits[(0x7e - 0x20 + 31) / 32];
|
||||
|
||||
static inline int
|
||||
is_global_name_punct(const int c)
|
||||
{
|
||||
if (c <= 0x20 || 0x7e < c) return 0;
|
||||
return (ruby_global_name_punct_bits[(c - 0x20) / 32] >> (c % 32)) & 1;
|
||||
}
|
||||
|
||||
ID rb_intern_cstr_without_pindown(const char *, long, rb_encoding *);
|
||||
|
||||
#endif
|
Загрузка…
Ссылка в новой задаче