wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-09 01:08:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #80 - Fix deprot in js/src/irregexp.

Browse source 
Regression seems to have been introduced by PR #2060? This tree didn't fail
 building before we've reinstated unified building for js/src.
Found while building js/src de-unified.
This commit is contained in:
Job Bautista 2022-12-29 19:32:55 +08:00 • committed by roytam1
commit 507ed86ef5
3 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/src/irregexp/InfallibleVector.h
View file

@ -30,6 +30,9 @@
#ifndef V8_INFALLIBLEVECTOR_H_
#define V8_INFALLIBLEVECTOR_H_
#include "ds/LifoAlloc.h"
#include "mozilla/Vector.h"
namespace js {
namespace irregexp {
@ -39,7 +42,7 @@ namespace irregexp {
template<typename T, size_t N>
class InfallibleVector
{
Vector<T, N, LifoAllocPolicy<Infallible>> vector_;
mozilla::Vector<T, N, LifoAllocPolicy<Infallible>> vector_;
InfallibleVector(const InfallibleVector&) = delete;
void operator=(const InfallibleVector&) = delete;
@ -100,4 +103,4 @@ typedef InfallibleVector<int32_t, 10> IntegerVector;
} } // namespace js::irregexp
#endif // V8_INFALLIBLEVECTOR_H_
#endif // V8_INFALLIBLEVECTOR_H_

31
js/src/irregexp/RegExpCharRanges.cpp
View file

@ -29,7 +29,10 @@
#include "irregexp/RegExpCharRanges.h"
#include "ds/LifoAlloc.h"
#include "mozilla/Unused.h"
#include "unicode/uniset.h"
#include "vm/Unicode.h"
// Generated table
#include "irregexp/RegExpCharacters-inl.h"
@ -447,7 +450,7 @@ bool IsExactPropertyValueAlias(const std::string& property_value_name, UProperty
return false;
}
bool LookupPropertyValueName(LifoAlloc* alloc,
bool LookupPropertyValueName(js::LifoAlloc* alloc,
UProperty property,
const std::string& property_value_name, bool negate,
CharacterRangeVector* ranges,
@ -485,7 +488,7 @@ bool LookupPropertyValueName(LifoAlloc* alloc,
return success;
}
bool LookupSpecialPropertyValueName(LifoAlloc* alloc,
bool LookupSpecialPropertyValueName(js::LifoAlloc* alloc,
const std::string& name, bool negate,
CharacterRangeVector* ranges,
CharacterRangeVector* lead_ranges,
@ -497,14 +500,14 @@ bool LookupSpecialPropertyValueName(LifoAlloc* alloc,
// is the empty set.
} else {
CharacterRange::AddUnicodeRange(alloc, ranges, lead_ranges, trail_ranges, wide_ranges,
0, unicode::NonBMPMax);
0, js::unicode::NonBMPMax);
}
} else
if (name == "ASCII") {
if (negate) {
// negative ASCII contains all planes
CharacterRange::AddUnicodeRange(alloc, ranges, lead_ranges, trail_ranges, wide_ranges,
0x80, unicode::NonBMPMax);
0x80, js::unicode::NonBMPMax);
} else {
// positve ASCII is just low codepoints
ranges->append(CharacterRange::Range(0x00, 0x7F));
@ -748,12 +751,12 @@ CharacterRange::InsertRangeInCanonicalList(CharacterRangeVector& list,
}
int
irregexp::GetCaseIndependentLetters(char16_t character,
bool ascii_subject,
bool unicode,
const char16_t* choices,
size_t choices_length,
char16_t* letters)
js::irregexp::GetCaseIndependentLetters(char16_t character,
bool ascii_subject,
bool unicode,
const char16_t* choices,
size_t choices_length,
char16_t* letters)
{
size_t count = 0;
for (size_t i = 0; i < choices_length; i++) {
@ -781,10 +784,10 @@ irregexp::GetCaseIndependentLetters(char16_t character,
}
int
irregexp::GetCaseIndependentLetters(char16_t character,
bool ascii_subject,
bool unicode,
char16_t* letters)
js::irregexp::GetCaseIndependentLetters(char16_t character,
bool ascii_subject,
bool unicode,
char16_t* letters)
{
if (unicode) {
const char16_t choices[] = {

2
js/src/irregexp/RegExpCharRanges.h
View file

@ -32,8 +32,10 @@
#include <string>
#include "ds/LifoAlloc.h"
#include "irregexp/RegExpCharacters.h"
#include "irregexp/InfallibleVector.h"
#include "vm/Unicode.h"
namespace js {