kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

enc/unicode: check Unicode versions

Browse source 
* enc/unicode/case-folding.rb, tool/enc-unicode.rb: check if
  Unicode versions are consistent with each other.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55687 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-07-15 00:53:50 +00:00
parent ed5401a696
commit e827c334c3
5 changed files with 61 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Jul 15 09:53:48 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enc/unicode/case-folding.rb, tool/enc-unicode.rb: check if
Unicode versions are consistent with each other.
Fri Jul 15 08:25:15 2016 Jeremy Evans <code@jeremyevans.net> Fri Jul 15 08:25:15 2016 Jeremy Evans <code@jeremyevans.net>
* string.c (STR_BUF_MIN_SIZE): reduce from 128 to 127 * string.c (STR_BUF_MIN_SIZE): reduce from 128 to 127

10
enc/unicode/case-folding.rb
View file

@ -155,8 +155,16 @@ class CaseFolding
dest.print("/* DO NOT EDIT THIS FILE. */\n") dest.print("/* DO NOT EDIT THIS FILE. */\n")
dest.print("/* Generated by enc/unicode/case-folding.rb */\n\n") dest.print("/* Generated by enc/unicode/case-folding.rb */\n\n")
versions = version.scan(/\d+/)
dest.print("#if defined ONIG_UNICODE_VERSION_STRING && !( \\\n")
%w[MAJOR MINOR TEENY].zip(versions) do |n, v|
dest.print(" ONIG_UNICODE_VERSION_#{n} == #{v} && \\\n")
end
dest.print(" 1)\n")
dest.print("# error ONIG_UNICODE_VERSION_STRING mismatch\n")
dest.print("#endif\n")
dest.print("#define ONIG_UNICODE_VERSION_STRING #{version.dump}\n") dest.print("#define ONIG_UNICODE_VERSION_STRING #{version.dump}\n")
%w[MAJOR MINOR TEENY].zip(version.scan(/\d+/)) do |n, v| %w[MAJOR MINOR TEENY].zip(versions) do |n, v|
dest.print("#define ONIG_UNICODE_VERSION_#{n} #{v}\n") dest.print("#define ONIG_UNICODE_VERSION_#{n} #{v}\n")
end end
dest.print("\n") dest.print("\n")

39
enc/unicode/casefold.h
View file

@ -1,6 +1,13 @@
/* DO NOT EDIT THIS FILE. */ /* DO NOT EDIT THIS FILE. */
/* Generated by enc/unicode/case-folding.rb */ /* Generated by enc/unicode/case-folding.rb */
#if defined ONIG_UNICODE_VERSION_STRING && !( \
ONIG_UNICODE_VERSION_MAJOR == 8 && \
ONIG_UNICODE_VERSION_MINOR == 0 && \
ONIG_UNICODE_VERSION_TEENY == 0 && \
1)
# error ONIG_UNICODE_VERSION_STRING mismatch
#endif
#define ONIG_UNICODE_VERSION_STRING "8.0.0" #define ONIG_UNICODE_VERSION_STRING "8.0.0"
#define ONIG_UNICODE_VERSION_MAJOR 8 #define ONIG_UNICODE_VERSION_MAJOR 8
#define ONIG_UNICODE_VERSION_MINOR 0 #define ONIG_UNICODE_VERSION_MINOR 0
@ -1337,12 +1344,10 @@ static const CaseFold_11_Type CaseFold_11_Table[] = {
/* maximum key range = 2294, duplicates = 0 */ /* maximum key range = 2294, duplicates = 0 */
#ifdef __GNUC__ #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
__inline
#else
#ifdef __cplusplus
inline inline
#endif #elif defined(__GNUC__)
__inline
#endif #endif
/*ARGSUSED*/ /*ARGSUSED*/
static unsigned int static unsigned int
@ -4369,12 +4374,10 @@ static const CaseUnfold_11_Type CaseUnfold_11_Table[] = {
/* maximum key range = 1827, duplicates = 0 */ /* maximum key range = 1827, duplicates = 0 */
#ifdef __GNUC__ #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
__inline
#else
#ifdef __cplusplus
inline inline
#endif #elif defined(__GNUC__)
__inline
#endif #endif
/*ARGSUSED*/ /*ARGSUSED*/
static unsigned int static unsigned int
@ -6004,12 +6007,10 @@ static const CaseUnfold_12_Type CaseUnfold_12_Table[] = {
/* maximum key range = 71, duplicates = 0 */ /* maximum key range = 71, duplicates = 0 */
#ifdef __GNUC__ #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
__inline
#else
#ifdef __cplusplus
inline inline
#endif #elif defined(__GNUC__)
__inline
#endif #endif
/*ARGSUSED*/ /*ARGSUSED*/
static unsigned int static unsigned int
@ -6160,12 +6161,10 @@ static const CaseUnfold_13_Type CaseUnfold_13_Table[] = {
/* maximum key range = 20, duplicates = 0 */ /* maximum key range = 20, duplicates = 0 */
#ifdef __GNUC__ #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
__inline
#else
#ifdef __cplusplus
inline inline
#endif #elif defined(__GNUC__)
__inline
#endif #endif
/*ARGSUSED*/ /*ARGSUSED*/
static unsigned int static unsigned int

23
enc/unicode/name2ctype.h
View file

@ -28605,8 +28605,8 @@ static const OnigCodePoint CR_Age_8_0[] = {
0xe0100, 0xe01ef, 0xe0100, 0xe01ef,
0xefffe, 0x10ffff, 0xefffe, 0x10ffff,
}; /* CR_Age_8_0 */ }; /* CR_Age_8_0 */
#endif /* USE_UNICODE_AGE_PROPERTIES */
#endif /* USE_UNICODE_AGE_PROPERTIES */
/* 'In_Basic_Latin': Block */ /* 'In_Basic_Latin': Block */
#define CR_In_Basic_Latin CR_ASCII #define CR_In_Basic_Latin CR_ASCII
@ -30195,8 +30195,8 @@ static const OnigCodePoint CR_In_No_Block[] = {
0xe0080, 0xe00ff, 0xe0080, 0xe00ff,
0xe01f0, 0xeffff, 0xe01f0, 0xeffff,
}; /* CR_In_No_Block */ }; /* CR_In_No_Block */
#endif /* USE_UNICODE_PROPERTIES */
#endif /* USE_UNICODE_PROPERTIES */
static const OnigCodePoint* const CodeRanges[] = { static const OnigCodePoint* const CodeRanges[] = {
CR_NEWLINE, CR_NEWLINE,
CR_Alpha, CR_Alpha,
@ -30747,12 +30747,10 @@ static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned
/* maximum key range = 5324, duplicates = 0 */ /* maximum key range = 5324, duplicates = 0 */
#endif /* USE_UNICODE_PROPERTIES */ #endif /* USE_UNICODE_PROPERTIES */
#ifdef __GNUC__ #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
__inline
#else
#ifdef __cplusplus
inline inline
#endif #elif defined(__GNUC__)
__inline
#endif #endif
static unsigned int static unsigned int
uniname2ctype_hash (str, len) uniname2ctype_hash (str, len)
@ -34025,3 +34023,14 @@ uniname2ctype(const UChar *name, unsigned int len)
if (p) return p->ctype; if (p) return p->ctype;
return -1; return -1;
} }
#if defined ONIG_UNICODE_VERSION_STRING && !( \
ONIG_UNICODE_VERSION_MAJOR == 8 && \
ONIG_UNICODE_VERSION_MINOR == 0 && \
ONIG_UNICODE_VERSION_TEENY == 0 && \
1)
# error ONIG_UNICODE_VERSION_STRING mismatch
#endif
#define ONIG_UNICODE_VERSION_STRING "8.0.0"
#define ONIG_UNICODE_VERSION_MAJOR 8
#define ONIG_UNICODE_VERSION_MINOR 0
#define ONIG_UNICODE_VERSION_TEENY 0

12
tool/enc-unicode.rb
View file

@ -454,6 +454,18 @@ uniname2ctype(const UChar *name, unsigned int len)
return -1; return -1;
} }
__HEREDOC __HEREDOC
versions = $unicode_version.scan(/\d+/)
print("#if defined ONIG_UNICODE_VERSION_STRING && !( \\\n")
%w[MAJOR MINOR TEENY].zip(versions) do |n, v|
print(" ONIG_UNICODE_VERSION_#{n} == #{v} && \\\n")
end
print(" 1)\n")
print("# error ONIG_UNICODE_VERSION_STRING mismatch\n")
print("#endif\n")
print("#define ONIG_UNICODE_VERSION_STRING #{$unicode_version.dump}\n")
%w[MAJOR MINOR TEENY].zip(versions) do |n, v|
print("#define ONIG_UNICODE_VERSION_#{n} #{v}\n")
end
output.restore output.restore