pcre.diff

Jan DolinĂ¡r, 05/17/2012 08:13 PM

Download (2.47 KB)

View differences:

uppsrc/plugin/pcre/RegExp.h (working copy)
13 13
		UTF8      = PCRE_UTF8,
14 14
		CASELESS  = PCRE_CASELESS,
15 15
		MULTILINE = PCRE_MULTILINE,
16
		UNGREEDY  = PCRE_UNGREEDY
16
		UNGREEDY  = PCRE_UNGREEDY,
17
		DOTALL    = PCRE_DOTALL,
18
		
19
		EXECUTE_OPTIONS = PCRE_ANCHORED
20
		                | PCRE_NEWLINE_CR
21
		                | PCRE_NEWLINE_LF
22
		                | PCRE_NEWLINE_CRLF
23
		                | PCRE_NEWLINE_ANYCRLF
24
		                | PCRE_NEWLINE_ANY
25
		                | PCRE_NOTBOL
26
		                | PCRE_NOTEOL
27
		                | PCRE_NOTEMPTY
28
		                | PCRE_NOTEMPTY_ATSTART
29
		                | PCRE_NO_START_OPTIMIZE
30
		                | PCRE_NO_UTF8_CHECK
31
		                | PCRE_PARTIAL_SOFT
32
		                | PCRE_PARTIAL_HARD,
33
		COMPILE_OPTIONS = PCRE_ANCHORED
34
		                | PCRE_AUTO_CALLOUT
35
		                | PCRE_BSR_ANYCRLF
36
		                | PCRE_BSR_UNICODE
37
		                | PCRE_CASELESS
38
		                | PCRE_DOLLAR_ENDONLY
39
		                | PCRE_DOTALL
40
		                | PCRE_DUPNAMES
41
		                | PCRE_EXTENDED
42
		                | PCRE_EXTRA
43
		                | PCRE_FIRSTLINE
44
		                | PCRE_JAVASCRIPT_COMPAT
45
		                | PCRE_MULTILINE
46
		                | PCRE_NEWLINE_CR
47
		                | PCRE_NEWLINE_LF
48
		                | PCRE_NEWLINE_CRLF
49
		                | PCRE_NEWLINE_ANYCRLF
50
		                | PCRE_NEWLINE_ANY
51
		                | PCRE_NO_AUTO_CAPTURE
52
		                | PCRE_NO_START_OPTIMIZE
53
		                | PCRE_UCP
54
		                | PCRE_UNGREEDY
55
		                | PCRE_UTF8
56
		                | PCRE_NO_UTF8_CHECK
17 57
	};
18 58

  
19 59
private:
uppsrc/plugin/pcre/RegExp.cpp (working copy)
43 43

  
44 44
void RegExp::SetOptions(int options)
45 45
{
46
	if(options & UNICODE)
47
		compile_options |= UNICODE;
48
	if(options & CASELESS)
49
		compile_options |= CASELESS;
50
	if(options & UNGREEDY)
51
		compile_options |= UNGREEDY;
52
	if(options & MULTILINE)
53
		compile_options |= MULTILINE;
54
	if(options & PARTIAL)
55
		execute_options = PARTIAL;
46
	compile_options = options & COMPILE_OPTIONS;
47
	execute_options = options & EXECUTE_OPTIONS;
56 48
}
57 49

  
58 50
void RegExp::SetPattern(const char * p)