[前][次][番号順一覧][スレッド一覧]

ruby-changes:18458

From: akr <ko1@a...>
Date: Fri, 7 Jan 2011 00:38:37 +0900 (JST)
Subject: [ruby-changes:18458] Ruby:r30481 (trunk): * string.c: parenthesize macro arguments.

akr	2011-01-07 00:38:14 +0900 (Fri, 07 Jan 2011)

  New Revision: 30481

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30481

  Log:
    * string.c: parenthesize macro arguments.

  Modified files:
    trunk/ChangeLog
    trunk/string.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30480)
+++ ChangeLog	(revision 30481)
@@ -1,3 +1,7 @@
+Fri Jan  7 00:37:35 2011  Tanaka Akira  <akr@f...>
+
+	* string.c: parenthesize macro arguments.
+
 Thu Jan  6 20:55:49 2011  NAKAMURA Usaku  <usa@r...>
 
 	* lib/mkmf.rb (create_makefile): ignore rest from first dot from
Index: string.c
===================================================================
--- string.c	(revision 30480)
+++ string.c	(revision 30481)
@@ -16,8 +16,8 @@
 #include "ruby/encoding.h"
 #include <assert.h>
 
-#define BEG(no) regs->beg[no]
-#define END(no) regs->end[no]
+#define BEG(no) (regs->beg[(no)])
+#define END(no) (regs->end[(no)])
 
 #include <math.h>
 #include <ctype.h>
@@ -53,21 +53,21 @@
 #define STR_NOEMBED FL_USER1
 #define STR_SHARED  FL_USER2 /* = ELTS_SHARED */
 #define STR_ASSOC   FL_USER3
-#define STR_SHARED_P(s) FL_ALL(s, STR_NOEMBED|ELTS_SHARED)
-#define STR_ASSOC_P(s)  FL_ALL(s, STR_NOEMBED|STR_ASSOC)
+#define STR_SHARED_P(s) FL_ALL((s), STR_NOEMBED|ELTS_SHARED)
+#define STR_ASSOC_P(s)  FL_ALL((s), STR_NOEMBED|STR_ASSOC)
 #define STR_NOCAPA  (STR_NOEMBED|ELTS_SHARED|STR_ASSOC)
-#define STR_NOCAPA_P(s) (FL_TEST(s,STR_NOEMBED) && FL_ANY(s,ELTS_SHARED|STR_ASSOC))
+#define STR_NOCAPA_P(s) (FL_TEST((s),STR_NOEMBED) && FL_ANY((s),ELTS_SHARED|STR_ASSOC))
 #define STR_UNSET_NOCAPA(s) do {\
-    if (FL_TEST(s,STR_NOEMBED)) FL_UNSET(s,(ELTS_SHARED|STR_ASSOC));\
+    if (FL_TEST((s),STR_NOEMBED)) FL_UNSET((s),(ELTS_SHARED|STR_ASSOC));\
 } while (0)
 
 
 #define STR_SET_NOEMBED(str) do {\
-    FL_SET(str, STR_NOEMBED);\
-    STR_SET_EMBED_LEN(str, 0);\
+    FL_SET((str), STR_NOEMBED);\
+    STR_SET_EMBED_LEN((str), 0);\
 } while (0)
-#define STR_SET_EMBED(str) FL_UNSET(str, STR_NOEMBED)
-#define STR_EMBED_P(str) (!FL_TEST(str, STR_NOEMBED))
+#define STR_SET_EMBED(str) FL_UNSET((str), STR_NOEMBED)
+#define STR_EMBED_P(str) (!FL_TEST((str), STR_NOEMBED))
 #define STR_SET_EMBED_LEN(str, n) do { \
     long tmp_n = (n);\
     RBASIC(str)->flags &= ~RSTRING_EMBED_LEN_MASK;\
@@ -76,7 +76,7 @@
 
 #define STR_SET_LEN(str, n) do { \
     if (STR_EMBED_P(str)) {\
-	STR_SET_EMBED_LEN(str, n);\
+	STR_SET_EMBED_LEN((str), (n));\
     }\
     else {\
 	RSTRING(str)->as.heap.len = (n);\
@@ -87,7 +87,7 @@
     if (STR_EMBED_P(str)) {\
 	long n = RSTRING_LEN(str);\
 	n--;\
-	STR_SET_EMBED_LEN(str, n);\
+	STR_SET_EMBED_LEN((str), n);\
     }\
     else {\
 	RSTRING(str)->as.heap.len--;\
@@ -97,7 +97,7 @@
 #define RESIZE_CAPA(str,capacity) do {\
     if (STR_EMBED_P(str)) {\
 	if ((capacity) > RSTRING_EMBED_LEN_MAX) {\
-	    char *tmp = ALLOC_N(char, capacity+1);\
+	    char *tmp = ALLOC_N(char, (capacity)+1);\
 	    memcpy(tmp, RSTRING_PTR(str), RSTRING_LEN(str));\
 	    RSTRING(str)->as.heap.ptr = tmp;\
 	    RSTRING(str)->as.heap.len = RSTRING_LEN(str);\
@@ -1276,7 +1276,7 @@
     RSTRING(str)->as.heap.aux.capa = capa;
 }
 
-#define str_make_independent(str) str_make_independent_expand(str, 0L)
+#define str_make_independent(str) str_make_independent_expand((str), 0L)
 
 void
 rb_str_modify(VALUE str)
@@ -1791,7 +1791,7 @@
     return str;
 }
 
-#define str_buf_cat2(str, ptr) str_buf_cat(str, (ptr), strlen(ptr))
+#define str_buf_cat2(str, ptr) str_buf_cat((str), (ptr), strlen(ptr))
 
 VALUE
 rb_str_buf_cat(VALUE str, const char *ptr, long len)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]