Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

正規表現キーワードの一致判定が0文字マッチをマッチとみなさないように変更する #1030

Merged
merged 9 commits into from
Sep 1, 2019
Merged

正規表現キーワードの一致判定が0文字マッチをマッチとみなさないように変更する #1030

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f79ab06
USE_PARENT除去
berryzplus Sep 1, 2019
9aadb5f
m_sInfo[i]の全置換
berryzplus Sep 1, 2019
b0c999d
m_pTypes->m_RegexKeywordArr[i].m_nColorIndexの全置換
berryzplus Sep 1, 2019
279c7fa
info.pBregexpの全置換
berryzplus Sep 1, 2019
23f61c5
cStr.GetPtr()の全置換
berryzplus Sep 1, 2019
4a4e61b
begp+cStr.GetLength()の全置換
berryzplus Sep 1, 2019
2299566
begp+nPosの全置換
berryzplus Sep 1, 2019
0e76c51
変数の宣言位置を利用箇所の近くに移動
berryzplus Sep 1, 2019
b3d7e97
正規表現キーワードの一致判定で0文字マッチをマッチとみなさない
berryzplus Sep 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sakura_core/CRegexKeyword.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,8 @@ BOOL CRegexKeyword::RegexIsKeyword(
int matched = ExistBMatchEx()
? BMatchEx(NULL, begp, startp, endp, &pBregexp, m_szMsg)
: BMatch(NULL, startp, endp, &pBregexp, m_szMsg);
if( 0 < matched )
if( 0 < matched
&& pBregexp->endp[0] - pBregexp->startp[0] > 0 )
beru marked this conversation as resolved.
Show resolved Hide resolved
{
info.nOffset = pBregexp->startp[0] - begp;
info.nLength = pBregexp->endp[0] - pBregexp->startp[0];
Expand Down