From a37463ef14409c81422b3c3d6c35a0dbd21f51b7 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 9 Jun 2008 09:25:32 +0000
Subject: * include/ruby/ruby.h (CONST_ID): constant ID cache for non-gcc.

* *.c: no cache in init functions.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 include/ruby/ruby.h | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'include/ruby')

diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 614a6145b..99321f193 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -764,17 +764,21 @@ const char *rb_id2name(ID);
 ID rb_to_id(VALUE);
 VALUE rb_id2str(ID);
 
+#define CONST_ID_CACHE(result, str)			\
+    ({							\
+	static ID rb_intern_id_cache;			\
+	if (!rb_intern_id_cache)			\
+	    rb_intern_id_cache = (rb_intern)(str);	\
+	result rb_intern_id_cache;			\
+    })
+#define CONST_ID(var, str) \
+    do {CONST_ID_CACHE(var =, str);} while (0)
 #ifdef __GNUC__
 /* __builtin_constant_p and statement expression is available
  * since gcc-2.7.2.3 at least. */
 #define rb_intern(str) \
     (__builtin_constant_p(str) ? \
-        ({ \
-            static ID rb_intern_id_cache; \
-            if (!rb_intern_id_cache) \
-                rb_intern_id_cache = rb_intern(str); \
-            rb_intern_id_cache; \
-        }) : \
+        CONST_ID_CACHE(/**/, str) : \
         rb_intern(str))
 #endif
 
-- 
cgit