Merge pull request #1317 from RaiKoHoff/Dev_ONIGURUMA

Merge RC2 enhancements
This commit is contained in:
Rainer Kottenhoff 2019-06-06 09:00:33 +02:00 committed by GitHub
commit 2110e4fd38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions

View File

@ -27,11 +27,12 @@ Supported character encodings:
* doc/SYNTAX.md: contributed by seanofw
New feature of version 6.9.2
New feature of version 6.9.2 (Reiwa)
-----------------------------------
* add doc/SYNTAX.md
* Update Unicode version 12.1.0
* NEW: Unicode Text Segment mode option (?y{g}) (?y{w})
* NEW: Unicode Text Segment mode option (?y{g}) (?y{w}) (*original)
g: Extended Grapheme Cluster mode / w: Word mode

View File

@ -1,4 +1,4 @@
Unicode Properties (from Unicode Version: 12.0.0)
Unicode Properties (from Unicode Version: 12.1.0)
15: ASCII_Hex_Digit
16: Adlam

View File

@ -316,12 +316,12 @@ Sci::Position OnigurumaRegExEngine::FindText(Document* doc, Sci::Position minPos
//~m_MatchPos = SciPos(result); //
m_MatchPos = SciPos(m_Region.beg[0]);
//~m_MatchLen = SciPos(m_Region.end[0] - result);
m_MatchLen = SciPos(m_Region.end[0] - m_Region.beg[0]);
m_MatchLen = SciPos(m_Region.end[0]) - SciPos(m_Region.beg[0]);
}
//NOTE: potential 64-bit-size issue at interface here:
*length = m_MatchLen;
return SciPos(m_MatchPos);
return m_MatchPos;
}
// ============================================================================