ruby-changes:18380
From: akr <ko1@a...>
Date: Mon, 27 Dec 2010 18:27:49 +0900 (JST)
Subject: [ruby-changes:18380] Ruby:r30403 (trunk): * re.c: parenthesize macro arguments.
akr 2010-12-27 18:27:43 +0900 (Mon, 27 Dec 2010) New Revision: 30403 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30403 Log: * re.c: parenthesize macro arguments. Modified files: trunk/ChangeLog trunk/re.c Index: ChangeLog =================================================================== --- ChangeLog (revision 30402) +++ ChangeLog (revision 30403) @@ -1,3 +1,7 @@ +Mon Dec 27 18:27:13 2010 Tanaka Akira <akr@f...> + + * re.c: parenthesize macro arguments. + Mon Dec 27 15:22:23 2010 NAKAMURA Usaku <usa@r...> * win32/README.win32: note to need NT based OS to build ruby. Index: re.c =================================================================== --- re.c (revision 30402) +++ re.c (revision 30403) @@ -21,8 +21,8 @@ typedef char onig_errmsg_buffer[ONIG_MAX_ERROR_MESSAGE_LEN]; #define errcpy(err, msg) strlcpy((err), (msg), ONIG_MAX_ERROR_MESSAGE_LEN) -#define BEG(no) regs->beg[no] -#define END(no) regs->end[no] +#define BEG(no) (regs->beg[(no)]) +#define END(no) (regs->end[(no)]) #if 'a' == 97 /* it's ascii */ static const char casetable[] = { @@ -3282,7 +3282,7 @@ rb_encoding *str_enc = rb_enc_get(str); rb_encoding *src_enc = rb_enc_get(src); int acompat = rb_enc_asciicompat(str_enc); -#define ASCGET(s,e,cl) (acompat ? (*cl=1,ISASCII(s[0])?s[0]:-1) : rb_enc_ascget(s, e, cl, str_enc)) +#define ASCGET(s,e,cl) (acompat ? (*(cl)=1,ISASCII((s)[0])?(s)[0]:-1) : rb_enc_ascget((s), (e), (cl), str_enc)) p = s = RSTRING_PTR(str); e = s + RSTRING_LEN(str); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/