1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ruby.h: add mark to PRIsVALUE

Browse Source 
* include/ruby/ruby.h (PRIsVALUE), vsnprintf.c (BSD_vfprintf): add
  RUBY_PRI_VALUE_MARK to reduce danger of accidental conflict with
  plain "%i".  binary incompatible with extension libraries using
  PRIsVALUE and built for 2.1 and earlier.  [EXPERIMENTAL]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-11-04 03:51:33 +00:00
parent 95e83cb3f9
commit a9f3eb75de
4 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Nov 4 12:51:31 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/ruby.h (PRIsVALUE), vsnprintf.c (BSD_vfprintf): add
RUBY_PRI_VALUE_MARK to reduce danger of accidental conflict with
plain "%i". binary incompatible with extension libraries using
PRIsVALUE and built for 2.1 and earlier. [EXPERIMENTAL]
Tue Nov 4 12:33:44 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> Tue Nov 4 12:33:44 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* object.c: fix document of Kernel#String by @suzukaze * object.c: fix document of Kernel#String by @suzukaze

5
include/ruby/ruby.h
View File

@ -123,20 +123,21 @@ typedef char ruby_check_sizeof_voidp[SIZEOF_VOIDP == sizeof(void*) ? 1 : -1];
#define PRI_64_PREFIX PRI_LL_PREFIX #define PRI_64_PREFIX PRI_LL_PREFIX
#endif #endif
#define RUBY_PRI_VALUE_MARK "\v"
#if defined PRIdPTR && !defined PRI_VALUE_PREFIX #if defined PRIdPTR && !defined PRI_VALUE_PREFIX
#define PRIdVALUE PRIdPTR #define PRIdVALUE PRIdPTR
#define PRIoVALUE PRIoPTR #define PRIoVALUE PRIoPTR
#define PRIuVALUE PRIuPTR #define PRIuVALUE PRIuPTR
#define PRIxVALUE PRIxPTR #define PRIxVALUE PRIxPTR
#define PRIXVALUE PRIXPTR #define PRIXVALUE PRIXPTR
#define PRIsVALUE PRIiPTR #define PRIsVALUE PRIiPTR""RUBY_PRI_VALUE_MARK
#else #else
#define PRIdVALUE PRI_VALUE_PREFIX"d" #define PRIdVALUE PRI_VALUE_PREFIX"d"
#define PRIoVALUE PRI_VALUE_PREFIX"o" #define PRIoVALUE PRI_VALUE_PREFIX"o"
#define PRIuVALUE PRI_VALUE_PREFIX"u" #define PRIuVALUE PRI_VALUE_PREFIX"u"
#define PRIxVALUE PRI_VALUE_PREFIX"x" #define PRIxVALUE PRI_VALUE_PREFIX"x"
#define PRIXVALUE PRI_VALUE_PREFIX"X" #define PRIXVALUE PRI_VALUE_PREFIX"X"
#define PRIsVALUE PRI_VALUE_PREFIX"i" #define PRIsVALUE PRI_VALUE_PREFIX"i"RUBY_PRI_VALUE_MARK
#endif #endif
#ifndef PRI_VALUE_PREFIX #ifndef PRI_VALUE_PREFIX
# define PRI_VALUE_PREFIX "" # define PRI_VALUE_PREFIX ""

3
sprintf.c
View File

@ -1253,6 +1253,9 @@ fmt_setup(char *buf, size_t size, int c, int flags, int width, int prec)
#define FLOATING_POINT 1 #define FLOATING_POINT 1
#define BSD__dtoa ruby_dtoa #define BSD__dtoa ruby_dtoa
#define BSD__hdtoa ruby_hdtoa #define BSD__hdtoa ruby_hdtoa
#ifdef RUBY_PRI_VALUE_MARK
# define PRI_EXTRA_MARK RUBY_PRI_VALUE_MARK
#endif
#include "vsnprintf.c" #include "vsnprintf.c"
typedef struct { typedef struct {

16
vsnprintf.c
View File

@ -806,7 +806,21 @@ reswitch: switch (ch) {
#else #else
# define INTPTR_FLAG 0 # define INTPTR_FLAG 0
#endif #endif
if (fp->vextra && (flags & INTPTR_MASK) == INTPTR_FLAG) { #ifdef PRI_EXTRA_MARK
# define PRI_EXTRA_MARK_LEN (sizeof(PRI_EXTRA_MARK)-1)
# define IS_PRI_EXTRA_MARK(s) \
(PRI_EXTRA_MARK_LEN < 1 || \
(*(s) == PRI_EXTRA_MARK[0] && \
(PRI_EXTRA_MARK_LEN == 1 || \
strncmp((s)+1, PRI_EXTRA_MARK+1, \
PRI_EXTRA_MARK_LEN-1) == 0)))
#else
# define PRI_EXTRA_MARK_LEN 0
# define IS_PRI_EXTRA_MARK(s) 1
#endif
if (fp->vextra && (flags & INTPTR_MASK) == INTPTR_FLAG &&
IS_PRI_EXTRA_MARK(fmt)) {
fmt += PRI_EXTRA_MARK_LEN;
FLUSH(); FLUSH();
#if defined _HAVE_SANE_QUAD_ && SIZEOF_VOIDP == SIZEOF_LONG_LONG #if defined _HAVE_SANE_QUAD_ && SIZEOF_VOIDP == SIZEOF_LONG_LONG
uqval = va_arg(ap, u_quad_t); uqval = va_arg(ap, u_quad_t);