From fdbb82967f54491b3b209af8f2d4aeedfb5ea214 Mon Sep 17 00:00:00 2001
From: duerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 17 Mar 2016 03:09:00 +0000
Subject: * enc/unicode.c: Fixed two macro definitions. *
 test/ruby/enc/test_case_mapping.rb: Test cases that detected   the above
 bugs.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 enc/unicode.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'enc/unicode.c')

diff --git a/enc/unicode.c b/enc/unicode.c
index 5087c55a07..796eb94c19 100644
--- a/enc/unicode.c
+++ b/enc/unicode.c
@@ -147,7 +147,7 @@ code3_equal(const OnigCodePoint *x, const OnigCodePoint *y)
 #define SpecialsCodepointExtract(n) ((n)&((1<<SpecialsLengthOffset)-1))
 #define SpecialsLengthEncode(n)     ((n)<<SpecialsLengthOffset)
 
-#define OnigSpecialIndexMask (((1<<OnigSpecialIndexWidth)-1)<<OnigSpecialIndexWidth)
+#define OnigSpecialIndexMask        (((1<<OnigSpecialIndexWidth)-1)<<OnigSpecialIndexShift)
 #define OnigSpecialIndexEncode(n)   ((n)<<OnigSpecialIndexShift)
 #define OnigSpecialIndexDecode(n)   (((n)&OnigSpecialIndexMask)>>OnigSpecialIndexShift)
 
@@ -158,7 +158,7 @@ code3_equal(const OnigCodePoint *x, const OnigCodePoint *y)
 #define ST ONIGENC_CASE_TITLECASE
 #define SU ONIGENC_CASE_UP_SPECIAL
 #define SL ONIGENC_CASE_DOWN_SPECIAL
-#define I(n) 0
+#define I(n) OnigSpecialIndexEncode(n)
 #define L(n) SpecialsLengthEncode(n)
 
 #include "enc/unicode/casefold.h"
-- 
cgit v1.2.3