nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Make DecodeOneUtf8CodePoint* take |const EndIter& aEnd| to enforce immutability of the end iterator. No bug, r=me as trivial

Browse source 
--HG--
extra : rebase_source : 203441e69e49bcedcf9810a1e9504f72de1f3820
This commit is contained in:
Jeff Walden 2018-08-09 21:04:23 -07:00
parent 0885260ab1
commit 65fc1cbcdc
1 changed files with 5 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

10
mfbt/Utf8.h
View file

@ -263,7 +263,7 @@ IsTrailingUnit(Utf8Unit aUnit)
/** /**
* Given |aLeadUnit| that is a non-ASCII code unit, a pointer to an |Iter aIter| * Given |aLeadUnit| that is a non-ASCII code unit, a pointer to an |Iter aIter|
* that (initially) itself points one unit past |aLeadUnit|, and * that (initially) itself points one unit past |aLeadUnit|, and
* |const EndIter aEnd| that denotes the end of the UTF-8 data when compared * |const EndIter& aEnd| that denotes the end of the UTF-8 data when compared
* against |*aIter| using |aEnd - *aIter|: * against |*aIter| using |aEnd - *aIter|:
* *
* If |aLeadUnit| and subsequent code units computed using |*aIter| (up to * If |aLeadUnit| and subsequent code units computed using |*aIter| (up to
@ -299,7 +299,7 @@ template<typename Iter,
class OnNotShortestForm> class OnNotShortestForm>
MOZ_ALWAYS_INLINE Maybe<char32_t> MOZ_ALWAYS_INLINE Maybe<char32_t>
DecodeOneUtf8CodePointInline(const Utf8Unit aLeadUnit, DecodeOneUtf8CodePointInline(const Utf8Unit aLeadUnit,
Iter* aIter, const EndIter aEnd, Iter* aIter, const EndIter& aEnd,
OnBadLeadUnit aOnBadLeadUnit, OnBadLeadUnit aOnBadLeadUnit,
OnNotEnoughUnits aOnNotEnoughUnits, OnNotEnoughUnits aOnNotEnoughUnits,
OnBadTrailingUnit aOnBadTrailingUnit, OnBadTrailingUnit aOnBadTrailingUnit,
@ -391,7 +391,7 @@ template<typename Iter,
class OnNotShortestForm> class OnNotShortestForm>
inline Maybe<char32_t> inline Maybe<char32_t>
DecodeOneUtf8CodePoint(const Utf8Unit aLeadUnit, DecodeOneUtf8CodePoint(const Utf8Unit aLeadUnit,
Iter* aIter, const EndIter aEnd, Iter* aIter, const EndIter& aEnd,
OnBadLeadUnit aOnBadLeadUnit, OnBadLeadUnit aOnBadLeadUnit,
OnNotEnoughUnits aOnNotEnoughUnits, OnNotEnoughUnits aOnNotEnoughUnits,
OnBadTrailingUnit aOnBadTrailingUnit, OnBadTrailingUnit aOnBadTrailingUnit,
@ -414,7 +414,7 @@ DecodeOneUtf8CodePoint(const Utf8Unit aLeadUnit,
template<typename Iter, typename EndIter> template<typename Iter, typename EndIter>
MOZ_ALWAYS_INLINE Maybe<char32_t> MOZ_ALWAYS_INLINE Maybe<char32_t>
DecodeOneUtf8CodePointInline(const Utf8Unit aLeadUnit, DecodeOneUtf8CodePointInline(const Utf8Unit aLeadUnit,
Iter* aIter, const EndIter aEnd) Iter* aIter, const EndIter& aEnd)
{ {
// aOnBadLeadUnit is called when |aLeadUnit| itself is an invalid lead unit in // aOnBadLeadUnit is called when |aLeadUnit| itself is an invalid lead unit in
// a multi-unit code point. It is passed no arguments: the caller already has // a multi-unit code point. It is passed no arguments: the caller already has
@ -466,7 +466,7 @@ DecodeOneUtf8CodePointInline(const Utf8Unit aLeadUnit,
template<typename Iter, typename EndIter> template<typename Iter, typename EndIter>
inline Maybe<char32_t> inline Maybe<char32_t>
DecodeOneUtf8CodePoint(const Utf8Unit aLeadUnit, DecodeOneUtf8CodePoint(const Utf8Unit aLeadUnit,
Iter* aIter, const EndIter aEnd) Iter* aIter, const EndIter& aEnd)
{ {
return DecodeOneUtf8CodePointInline(aLeadUnit, aIter, aEnd); return DecodeOneUtf8CodePointInline(aLeadUnit, aIter, aEnd);
} }