@@ -75,7 +75,7 @@ static void set32x64Bits(uint32_t table[64], int32_t start, int32_t limit) {
7575 int32_t  trail=start&0x3f ; //  Named for UTF-8 2-byte trail byte with lower 6 bits.
7676
7777 //  Set one bit indicating an all-one block.
78-  uint32_t  bits=( uint32_t ) 1 << lead;
78+  uint32_t  bits =  static_cast < uint32_t >( 1 ) <<  lead;
7979 if ((start+1 )==limit) { //  Single-character shortcut.
8080 table[trail]|=bits;
8181 return ;
@@ -100,9 +100,9 @@ static void set32x64Bits(uint32_t table[64], int32_t start, int32_t limit) {
100100 ++lead;
101101 }
102102 if (lead<limitLead) {
103-  bits= ~((( unsigned ) 1 << lead)- 1 );
103+  bits =  ~((static_cast < unsigned >( 1 ) <<  lead) -  1 );
104104 if (limitLead<0x20 ) {
105-  bits&=(( unsigned ) 1 << limitLead)- 1 ;
105+  bits &= ( static_cast < unsigned >( 1 ) <<  limitLead) -  1 ;
106106 }
107107 for (trail=0 ; trail<64 ; ++trail) {
108108 table[trail]|=bits;
@@ -111,7 +111,7 @@ static void set32x64Bits(uint32_t table[64], int32_t start, int32_t limit) {
111111 //  limit<=0x800. If limit==0x800 then limitLead=32 and limitTrail=0.
112112 //  In that case, bits=1<<limitLead is undefined but the bits value
113113 //  is not used because trail<limitTrail is already false.
114-  bits=( uint32_t ) 1 << ((limitLead == 0x20 ) ? (limitLead - 1 ) : limitLead);
114+  bits =  static_cast < uint32_t >( 1 ) <<  ((limitLead == 0x20 ) ? (limitLead - 1 ) : limitLead);
115115 for (trail=0 ; trail<limitTrail; ++trail) {
116116 table[trail]|=bits;
117117 }
@@ -290,22 +290,22 @@ int32_t BMPSet::findCodePoint(UChar32 c, int32_t lo, int32_t hi) const {
290290
291291UBool
292292BMPSet::contains (UChar32 c) const  {
293-  if (( uint32_t )c<= 0xff ) {
294-  return  (UBool) latin1Contains[c];
295-  } else  if (( uint32_t )c<= 0x7ff ) {
296-  return  (UBool)(( table7FF[c& 0x3f ]&(( uint32_t ) 1 <<(c>> 6 )))!= 0 ) ;
297-  } else  if (( uint32_t )c< 0xd800  || (c>= 0xe000  && c<= 0xffff )) {
293+  if  ( static_cast < uint32_t >(c) <=  0xff ) {
294+  return  latin1Contains[c];
295+  } else  if  ( static_cast < uint32_t >(c) <=  0x7ff ) {
296+  return  (table7FF[c &  0x3f ] & ( static_cast < uint32_t >( 1 ) << (c >>  6 ))) !=  0 ;
297+  } else  if  ( static_cast < uint32_t >(c) <  0xd800  || (c >=  0xe000  && c <=  0xffff )) {
298298 int  lead=c>>12 ;
299299 uint32_t  twoBits=(bmpBlockBits[(c>>6 )&0x3f ]>>lead)&0x10001 ;
300300 if (twoBits<=1 ) {
301301 //  All 64 code points with the same bits 15..6
302302 //  are either in the set or not.
303-  return  (UBool) twoBits;
303+  return  twoBits;
304304 } else  {
305305 //  Look up the code point in its 4k block of code points.
306306 return  containsSlow (c, list4kStarts[lead], list4kStarts[lead+1 ]);
307307 }
308-  } else  if (( uint32_t )c<= 0x10ffff ) {
308+  } else  if  ( static_cast < uint32_t >(c) <=  0x10ffff ) {
309309 //  surrogate or supplementary code point
310310 return  containsSlow (c, list4kStarts[0xd ], list4kStarts[0x11 ]);
311311 } else  {
@@ -332,7 +332,7 @@ BMPSet::span(const char16_t *s, const char16_t *limit, USetSpanCondition spanCon
332332 break ;
333333 }
334334 } else  if (c<=0x7ff ) {
335-  if ((table7FF[c& 0x3f ]&(( uint32_t ) 1 <<(c>> 6 )))== 0 ) {
335+  if   ((table7FF[c &  0x3f ] & ( static_cast < uint32_t >( 1 ) << (c >>  6 ))) ==  0 ) {
336336 break ;
337337 }
338338 } else  if (c<0xd800  || c>=0xe000 ) {
@@ -372,7 +372,7 @@ BMPSet::span(const char16_t *s, const char16_t *limit, USetSpanCondition spanCon
372372 break ;
373373 }
374374 } else  if (c<=0x7ff ) {
375-  if ((table7FF[c& 0x3f ]&(( uint32_t ) 1 <<(c>> 6 )))!= 0 ) {
375+  if   ((table7FF[c &  0x3f ] & ( static_cast < uint32_t >( 1 ) << (c >>  6 ))) !=  0 ) {
376376 break ;
377377 }
378378 } else  if (c<0xd800  || c>=0xe000 ) {
@@ -421,7 +421,7 @@ BMPSet::spanBack(const char16_t *s, const char16_t *limit, USetSpanCondition spa
421421 break ;
422422 }
423423 } else  if (c<=0x7ff ) {
424-  if ((table7FF[c& 0x3f ]&(( uint32_t ) 1 <<(c>> 6 )))== 0 ) {
424+  if   ((table7FF[c &  0x3f ] & ( static_cast < uint32_t >( 1 ) << (c >>  6 ))) ==  0 ) {
425425 break ;
426426 }
427427 } else  if (c<0xd800  || c>=0xe000 ) {
@@ -464,7 +464,7 @@ BMPSet::spanBack(const char16_t *s, const char16_t *limit, USetSpanCondition spa
464464 break ;
465465 }
466466 } else  if (c<=0x7ff ) {
467-  if ((table7FF[c& 0x3f ]&(( uint32_t ) 1 <<(c>> 6 )))!= 0 ) {
467+  if   ((table7FF[c &  0x3f ] & ( static_cast < uint32_t >( 1 ) << (c >>  6 ))) !=  0 ) {
468468 break ;
469469 }
470470 } else  if (c<0xd800  || c>=0xe000 ) {
@@ -527,7 +527,7 @@ BMPSet::spanUTF8(const uint8_t *s, int32_t length, USetSpanCondition spanConditi
527527 b=*s;
528528 } while (U8_IS_SINGLE (b));
529529 }
530-  length=( int32_t ) (limit- s);
530+  length =  static_cast < int32_t > (limit -  s);
531531 }
532532
533533 if (spanCondition!=USET_SPAN_NOT_CONTAINED) {
@@ -547,7 +547,7 @@ BMPSet::spanUTF8(const uint8_t *s, int32_t length, USetSpanCondition spanConditi
547547 * the truncated sequence. 
548548 */  
549549 b=*(limit-1 );
550-  if (( int8_t )b< 0 ) {
550+  if  ( static_cast < int8_t >(b) <  0 ) {
551551 //  b>=0x80: lead or trail byte
552552 if (b<0xc0 ) {
553553 //  single trail byte, check for preceding 3- or 4-byte lead byte
@@ -602,15 +602,15 @@ BMPSet::spanUTF8(const uint8_t *s, int32_t length, USetSpanCondition spanConditi
602602 if (b>=0xe0 ) {
603603 if (b<0xf0 ) {
604604 if ( /*  handle U+0000..U+FFFF inline */ 
605-  (t1=( uint8_t ) (s[0 ]- 0x80 )) <= 0x3f  &&
606-  (t2=( uint8_t ) (s[1 ]- 0x80 )) <= 0x3f 
605+  (t1 =  static_cast < uint8_t > (s[0 ] -  0x80 )) <= 0x3f  &&
606+  (t2 =  static_cast < uint8_t > (s[1 ] -  0x80 )) <= 0x3f 
607607 ) {
608608 b&=0xf ;
609609 uint32_t  twoBits=(bmpBlockBits[t1]>>b)&0x10001 ;
610610 if (twoBits<=1 ) {
611611 //  All 64 code points with this lead byte and middle trail byte
612612 //  are either in the set or not.
613-  if (twoBits!=( uint32_t ) spanCondition) {
613+  if   (twoBits !=  static_cast < uint32_t >( spanCondition) ) {
614614 return  s-1 ;
615615 }
616616 } else  {
@@ -624,12 +624,12 @@ BMPSet::spanUTF8(const uint8_t *s, int32_t length, USetSpanCondition spanConditi
624624 continue ;
625625 }
626626 } else  if ( /*  handle U+10000..U+10FFFF inline */ 
627-  (t1=( uint8_t ) (s[0 ]- 0x80 )) <= 0x3f  &&
628-  (t2=( uint8_t ) (s[1 ]- 0x80 )) <= 0x3f  &&
629-  (t3=( uint8_t ) (s[2 ]- 0x80 )) <= 0x3f 
627+  (t1 =  static_cast < uint8_t > (s[0 ] -  0x80 )) <= 0x3f  &&
628+  (t2 =  static_cast < uint8_t > (s[1 ] -  0x80 )) <= 0x3f  &&
629+  (t3 =  static_cast < uint8_t > (s[2 ] -  0x80 )) <= 0x3f 
630630 ) {
631631 //  Give an illegal sequence the same value as the result of contains(FFFD).
632-  UChar32 c=(( UChar32)(b- 0xf0 )<< 18 )|(( UChar32)t1<< 12 )| (t2<< 6 )| t3;
632+  UChar32 c = ( static_cast < UChar32>(b -  0xf0 ) <<  18 ) | ( static_cast < UChar32>(t1) <<  12 ) |  (t2 <<  6 ) |  t3;
633633 if ( ( (0x10000 <=c && c<=0x10ffff ) ?
634634 containsSlow (c, list4kStarts[0x10 ], list4kStarts[0x11 ]) :
635635 containsFFFD
@@ -643,9 +643,9 @@ BMPSet::spanUTF8(const uint8_t *s, int32_t length, USetSpanCondition spanConditi
643643 } else  {
644644 if ( /*  handle U+0000..U+07FF inline */ 
645645 b>=0xc0  &&
646-  (t1=( uint8_t ) (*s- 0x80 )) <= 0x3f 
646+  (t1 =  static_cast < uint8_t > (*s -  0x80 )) <= 0x3f 
647647 ) {
648-  if (( USetSpanCondition) ((table7FF[t1]&(( uint32_t ) 1 <<(b& 0x1f )))!= 0 ) != spanCondition) {
648+  if  ( static_cast < USetSpanCondition> ((table7FF[t1] & ( static_cast < uint32_t >( 1 ) << (b &  0x1f ))) !=  0 ) != spanCondition) {
649649 return  s-1 ;
650650 }
651651 ++s;
@@ -711,7 +711,7 @@ BMPSet::spanBackUTF8(const uint8_t *s, int32_t length, USetSpanCondition spanCon
711711 c=utf8_prevCharSafeBody (s, 0 , &length, b, -3 );
712712 //  c is a valid code point, not ASCII, not a surrogate
713713 if (c<=0x7ff ) {
714-  if (( USetSpanCondition) ((table7FF[c& 0x3f ]&(( uint32_t ) 1 <<(c>> 6 )))!= 0 ) != spanCondition) {
714+  if  ( static_cast < USetSpanCondition> ((table7FF[c &  0x3f ] & ( static_cast < uint32_t >( 1 ) << (c >>  6 ))) !=  0 ) != spanCondition) {
715715 return  prev+1 ;
716716 }
717717 } else  if (c<=0xffff ) {
@@ -720,7 +720,7 @@ BMPSet::spanBackUTF8(const uint8_t *s, int32_t length, USetSpanCondition spanCon
720720 if (twoBits<=1 ) {
721721 //  All 64 code points with the same bits 15..6
722722 //  are either in the set or not.
723-  if (twoBits!=( uint32_t ) spanCondition) {
723+  if   (twoBits !=  static_cast < uint32_t >( spanCondition) ) {
724724 return  prev+1 ;
725725 }
726726 } else  {
0 commit comments