From: K.Kosako Date: Mon, 25 Mar 2019 01:59:38 +0000 (+0900) Subject: refactoring X-Git-Tag: v6.9.2_rc1~48 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=354ae3e5cfcde18111f06195ed2dab36a2ed4ae1;p=onig refactoring --- diff --git a/src/regcomp.c b/src/regcomp.c index 906136c..e73ad7c 100644 --- a/src/regcomp.c +++ b/src/regcomp.c @@ -4511,8 +4511,7 @@ setup_anchor(Node* node, regex_t* reg, int state, ScanEnv* env) ( ANCR_LOOK_BEHIND | ANCR_BEGIN_LINE | ANCR_END_LINE | ANCR_BEGIN_BUF \ | ANCR_BEGIN_POSITION | ANCR_WORD_BOUNDARY | ANCR_NO_WORD_BOUNDARY \ | ANCR_WORD_BEGIN | ANCR_WORD_END \ - | ANCR_TEXT_SEGMENT_BOUNDARY \ - | ANCR_NO_TEXT_SEGMENT_BOUNDARY ) + | ANCR_TEXT_SEGMENT_BOUNDARY | ANCR_NO_TEXT_SEGMENT_BOUNDARY ) #define ALLOWED_ANCHOR_IN_LB_NOT \ ( ANCR_LOOK_BEHIND | ANCR_LOOK_BEHIND_NOT | ANCR_BEGIN_LINE \ diff --git a/src/regenc.h b/src/regenc.h index c980d59..bd2819e 100644 --- a/src/regenc.h +++ b/src/regenc.h @@ -4,7 +4,7 @@ regenc.h - Oniguruma (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2018 K.Kosako + * Copyright (c) 2002-2019 K.Kosako * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -182,7 +182,9 @@ extern int onigenc_unicode_ctype_code_range P_((OnigCtype ctype, const OnigCodeP extern int onigenc_unicode_get_case_fold_codes_by_str P_((OnigEncoding enc, OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end, OnigCaseFoldCodeItem items[])); extern int onigenc_unicode_mbc_case_fold P_((OnigEncoding enc, OnigCaseFoldType flag, const UChar** pp, const UChar* end, UChar* fold)); extern int onigenc_unicode_apply_all_case_fold P_((OnigCaseFoldType flag, OnigApplyAllCaseFoldFunc f, void* arg)); + extern int onigenc_egcb_is_break_position P_((OnigEncoding enc, UChar* p, UChar* prev, const UChar* start, const UChar* end)); + #ifdef USE_UNICODE_WORD_BREAK extern int onigenc_wb_is_break_position P_((OnigEncoding enc, UChar* p, UChar* prev, const UChar* start, const UChar* end)); #endif