aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-04 01:05:09 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-04 01:05:09 +0000
commit0ee5c55e51f0d4c0a7170b7985d3cb9d361be98e (patch)
tree01e86f9a82b436f837aa447d3153135361934bde
parent0e6a3991851921260942d06972fcc1fe32fb240f (diff)
downloadruby-0ee5c55e51f0d4c0a7170b7985d3cb9d361be98e.tar.gz
symbol.c: move macros
* symbol.c (SYMBOL_PINNED, SYMBOL_PINNED_P, ID_DYNAMIC_SYM_P), (STATIC_SYM2ID, STATIC_ID2SYM): move from symbol.h as these macros are used only in symbol.c. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--symbol.c7
-rw-r--r--symbol.h6
2 files changed, 7 insertions, 6 deletions
diff --git a/symbol.c b/symbol.c
index 060a54b899..99c7512332 100644
--- a/symbol.c
+++ b/symbol.c
@@ -18,6 +18,13 @@
#include "gc.h"
#include "probes.h"
+#define SYMBOL_PINNED FL_USER1
+#define SYMBOL_PINNED_P(sym) FL_TEST((sym), SYMBOL_PINNED)
+
+#define ID_DYNAMIC_SYM_P(id) (!(id&ID_STATIC_SYM)&&id>tLAST_OP_ID)
+#define STATIC_SYM2ID(sym) RSHIFT((unsigned long)(sym), RUBY_SPECIAL_SHIFT)
+#define STATIC_ID2SYM(id) (((VALUE)(id)<<RUBY_SPECIAL_SHIFT)|SYMBOL_FLAG)
+
static ID register_static_symid(ID, const char *, long, rb_encoding *);
static ID register_static_symid_str(ID, VALUE);
#define REGISTER_SYMID(id, name) register_static_symid((id), (name), strlen(name), enc)
diff --git a/symbol.h b/symbol.h
index aeffa9759c..36db8ef667 100644
--- a/symbol.h
+++ b/symbol.h
@@ -15,12 +15,6 @@
#include "id.h"
#define RSYMBOL(obj) (R_CAST(RSymbol)(obj))
-#define SYMBOL_PINNED FL_USER1
-#define SYMBOL_PINNED_P(sym) FL_TEST((sym), SYMBOL_PINNED)
-
-#define ID_DYNAMIC_SYM_P(id) (!(id&ID_STATIC_SYM)&&id>tLAST_OP_ID)
-#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)