Skip to content

Commit 39c0106

Browse files
committed
update to cpython 3.12 op code
1 parent 9070e12 commit 39c0106

4 files changed

Lines changed: 61 additions & 57 deletions

File tree

‎benches/benches.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,47 +30,47 @@ fn benchmarks(b: &mut Bencher) {
3030
// # test common prefix
3131
// pattern p1 = re.compile('Python|Perl') # , 'Perl'), # Alternation
3232
// START GENERATED by generate_tests.py
33-
#[rustfmt::skip] let p1 = Pattern { code: &[15, 8, 1, 4, 6, 1, 1, 80, 0, 17, 80, 7, 13, 17, 121, 17, 116, 17, 104, 17, 111, 17, 110, 16, 11, 9, 17, 101, 17, 114, 17, 108, 16, 2, 0, 1] };
33+
#[rustfmt::skip] let p1 = Pattern { code: &[14, 8, 1, 4, 6, 1, 1, 80, 0, 16, 80, 7, 13, 16, 121, 16, 116, 16, 104, 16, 111, 16, 110, 15, 11, 9, 16, 101, 16, 114, 16, 108, 15, 2, 0, 1] };
3434
// END GENERATED
3535
// pattern p2 = re.compile('(Python|Perl)') #, 'Perl'), # Grouped alternation
3636
// START GENERATED by generate_tests.py
37-
#[rustfmt::skip] let p2 = Pattern { code: &[15, 8, 1, 4, 6, 1, 0, 80, 0, 18, 0, 17, 80, 7, 13, 17, 121, 17, 116, 17, 104, 17, 111, 17, 110, 16, 11, 9, 17, 101, 17, 114, 17, 108, 16, 2, 0, 18, 1, 1] };
37+
#[rustfmt::skip] let p2 = Pattern { code: &[14, 8, 1, 4, 6, 1, 0, 80, 0, 17, 0, 16, 80, 7, 13, 16, 121, 16, 116, 16, 104, 16, 111, 16, 110, 15, 11, 9, 16, 101, 16, 114, 16, 108, 15, 2, 0, 17, 1, 1] };
3838
// END GENERATED
3939
// pattern p3 = re.compile('Python|Perl|Tcl') #, 'Perl'), # Alternation
4040
// START GENERATED by generate_tests.py
41-
#[rustfmt::skip] let p3 = Pattern { code: &[15, 9, 4, 3, 6, 17, 80, 17, 84, 0, 7, 15, 17, 80, 17, 121, 17, 116, 17, 104, 17, 111, 17, 110, 16, 22, 11, 17, 80, 17, 101, 17, 114, 17, 108, 16, 11, 9, 17, 84, 17, 99, 17, 108, 16, 2, 0, 1] };
41+
#[rustfmt::skip] let p3 = Pattern { code: &[14, 9, 4, 3, 6, 16, 80, 16, 84, 0, 7, 15, 16, 80, 16, 121, 16, 116, 16, 104, 16, 111, 16, 110, 15, 22, 11, 16, 80, 16, 101, 16, 114, 16, 108, 15, 11, 9, 16, 84, 16, 99, 16, 108, 15, 2, 0, 1] };
4242
// END GENERATED
4343
// pattern p4 = re.compile('(Python|Perl|Tcl)') #, 'Perl'), # Grouped alternation
4444
// START GENERATED by generate_tests.py
45-
#[rustfmt::skip] let p4 = Pattern { code: &[15, 9, 4, 3, 6, 17, 80, 17, 84, 0, 18, 0, 7, 15, 17, 80, 17, 121, 17, 116, 17, 104, 17, 111, 17, 110, 16, 22, 11, 17, 80, 17, 101, 17, 114, 17, 108, 16, 11, 9, 17, 84, 17, 99, 17, 108, 16, 2, 0, 18, 1, 1] };
45+
#[rustfmt::skip] let p4 = Pattern { code: &[14, 9, 4, 3, 6, 16, 80, 16, 84, 0, 17, 0, 7, 15, 16, 80, 16, 121, 16, 116, 16, 104, 16, 111, 16, 110, 15, 22, 11, 16, 80, 16, 101, 16, 114, 16, 108, 15, 11, 9, 16, 84, 16, 99, 16, 108, 15, 2, 0, 17, 1, 1] };
4646
// END GENERATED
4747
// pattern p5 = re.compile('(Python)\\1') #, 'PythonPython'), # Backreference
4848
// START GENERATED by generate_tests.py
49-
#[rustfmt::skip] let p5 = Pattern { code: &[15, 18, 1, 12, 12, 6, 0, 80, 121, 116, 104, 111, 110, 0, 0, 0, 0, 0, 0, 18, 0, 17, 80, 17, 121, 17, 116, 17, 104, 17, 111, 17, 110, 18, 1, 12, 0, 1] };
49+
#[rustfmt::skip] let p5 = Pattern { code: &[14, 18, 1, 12, 12, 6, 0, 80, 121, 116, 104, 111, 110, 0, 0, 0, 0, 0, 0, 17, 0, 16, 80, 16, 121, 16, 116, 16, 104, 16, 111, 16, 110, 17, 1, 11, 0, 1] };
5050
// END GENERATED
5151
// pattern p6 = re.compile('([0a-z][a-z0-9]*,)+') #, 'a5,b7,c9,'), # Disable the fastmap optimization
5252
// START GENERATED by generate_tests.py
53-
#[rustfmt::skip] let p6 = Pattern { code: &[15, 4, 0, 2, 4294967295, 24, 31, 1, 4294967295, 18, 0, 14, 7, 17, 48, 23, 97, 122, 0, 25, 13, 0, 4294967295, 14, 8, 23, 97, 122, 23, 48, 57, 0, 1, 17, 44, 18, 1, 19, 1] };
53+
#[rustfmt::skip] let p6 = Pattern { code: &[14, 4, 0, 2, 4294967295, 23, 31, 1, 4294967295, 17, 0, 13, 7, 16, 48, 22, 97, 122, 0, 24, 13, 0, 4294967295, 13, 8, 22, 97, 122, 22, 48, 57, 0, 1, 16, 44, 17, 1, 18, 1] };
5454
// END GENERATED
5555
// pattern p7 = re.compile('([a-z][a-z0-9]*,)+') #, 'a5,b7,c9,'), # A few sets
5656
// START GENERATED by generate_tests.py
57-
#[rustfmt::skip] let p7 = Pattern { code: &[15, 4, 0, 2, 4294967295, 24, 29, 1, 4294967295, 18, 0, 14, 5, 23, 97, 122, 0, 25, 13, 0, 4294967295, 14, 8, 23, 97, 122, 23, 48, 57, 0, 1, 17, 44, 18, 1, 19, 1] };
57+
#[rustfmt::skip] let p7 = Pattern { code: &[14, 4, 0, 2, 4294967295, 23, 29, 1, 4294967295, 17, 0, 13, 5, 22, 97, 122, 0, 24, 13, 0, 4294967295, 13, 8, 22, 97, 122, 22, 48, 57, 0, 1, 16, 44, 17, 1, 18, 1] };
5858
// END GENERATED
5959
// pattern p8 = re.compile('Python') #, 'Python'), # Simple text literal
6060
// START GENERATED by generate_tests.py
61-
#[rustfmt::skip] let p8 = Pattern { code: &[15, 18, 3, 6, 6, 6, 6, 80, 121, 116, 104, 111, 110, 0, 0, 0, 0, 0, 0, 17, 80, 17, 121, 17, 116, 17, 104, 17, 111, 17, 110, 1] };
61+
#[rustfmt::skip] let p8 = Pattern { code: &[14, 18, 3, 6, 6, 6, 6, 80, 121, 116, 104, 111, 110, 0, 0, 0, 0, 0, 0, 16, 80, 16, 121, 16, 116, 16, 104, 16, 111, 16, 110, 1] };
6262
// END GENERATED
6363
// pattern p9 = re.compile('.*Python') #, 'Python'), # Bad text literal
6464
// START GENERATED by generate_tests.py
65-
#[rustfmt::skip] let p9 = Pattern { code: &[15, 4, 0, 6, 4294967295, 25, 5, 0, 4294967295, 2, 1, 17, 80, 17, 121, 17, 116, 17, 104, 17, 111, 17, 110, 1] };
65+
#[rustfmt::skip] let p9 = Pattern { code: &[14, 4, 0, 6, 4294967295, 24, 5, 0, 4294967295, 2, 1, 16, 80, 16, 121, 16, 116, 16, 104, 16, 111, 16, 110, 1] };
6666
// END GENERATED
6767
// pattern p10 = re.compile('.*Python.*') #, 'Python'), # Worse text literal
6868
// START GENERATED by generate_tests.py
69-
#[rustfmt::skip] let p10 = Pattern { code: &[15, 4, 0, 6, 4294967295, 25, 5, 0, 4294967295, 2, 1, 17, 80, 17, 121, 17, 116, 17, 104, 17, 111, 17, 110, 25, 5, 0, 4294967295, 2, 1, 1] };
69+
#[rustfmt::skip] let p10 = Pattern { code: &[14, 4, 0, 6, 4294967295, 24, 5, 0, 4294967295, 2, 1, 16, 80, 16, 121, 16, 116, 16, 104, 16, 111, 16, 110, 24, 5, 0, 4294967295, 2, 1, 1] };
7070
// END GENERATED
7171
// pattern p11 = re.compile('.*(Python)') #, 'Python'), # Bad text literal with grouping
7272
// START GENERATED by generate_tests.py
73-
#[rustfmt::skip] let p11 = Pattern { code: &[15, 4, 0, 6, 4294967295, 25, 5, 0, 4294967295, 2, 1, 18, 0, 17, 80, 17, 121, 17, 116, 17, 104, 17, 111, 17, 110, 18, 1, 1] };
73+
#[rustfmt::skip] let p11 = Pattern { code: &[14, 4, 0, 6, 4294967295, 24, 5, 0, 4294967295, 2, 1, 17, 0, 16, 80, 16, 121, 16, 116, 16, 104, 16, 111, 16, 110, 17, 1, 1] };
7474
// END GENERATED
7575

7676
let tests = [

‎src/constants.rs‎

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use bitflags::bitflags;
1515

16-
pub const SRE_MAGIC: usize = 20171005;
16+
pub const SRE_MAGIC: usize = 20221023;
1717
#[derive(num_enum::TryFromPrimitive, Debug)]
1818
#[repr(u32)]
1919
#[allow(non_camel_case_types, clippy::upper_case_acronyms)]
@@ -26,39 +26,41 @@ pub enum SreOpcode {
2626
ASSERT_NOT = 5,
2727
AT = 6,
2828
BRANCH = 7,
29-
CALL = 8,
30-
CATEGORY = 9,
31-
CHARSET = 10,
32-
BIGCHARSET = 11,
33-
GROUPREF = 12,
34-
GROUPREF_EXISTS = 13,
35-
IN = 14,
36-
INFO = 15,
37-
JUMP = 16,
38-
LITERAL = 17,
39-
MARK = 18,
40-
MAX_UNTIL = 19,
41-
MIN_UNTIL = 20,
42-
NOT_LITERAL = 21,
43-
NEGATE = 22,
44-
RANGE = 23,
45-
REPEAT = 24,
46-
REPEAT_ONE = 25,
47-
SUBPATTERN = 26,
48-
MIN_REPEAT_ONE = 27,
49-
GROUPREF_IGNORE = 28,
50-
IN_IGNORE = 29,
51-
LITERAL_IGNORE = 30,
52-
NOT_LITERAL_IGNORE = 31,
53-
GROUPREF_LOC_IGNORE = 32,
54-
IN_LOC_IGNORE = 33,
55-
LITERAL_LOC_IGNORE = 34,
56-
NOT_LITERAL_LOC_IGNORE = 35,
57-
GROUPREF_UNI_IGNORE = 36,
58-
IN_UNI_IGNORE = 37,
59-
LITERAL_UNI_IGNORE = 38,
60-
NOT_LITERAL_UNI_IGNORE = 39,
61-
RANGE_UNI_IGNORE = 40,
29+
CATEGORY = 8,
30+
CHARSET = 9,
31+
BIGCHARSET = 10,
32+
GROUPREF = 11,
33+
GROUPREF_EXISTS = 12,
34+
IN = 13,
35+
INFO = 14,
36+
JUMP = 15,
37+
LITERAL = 16,
38+
MARK = 17,
39+
MAX_UNTIL = 18,
40+
MIN_UNTIL = 19,
41+
NOT_LITERAL = 20,
42+
NEGATE = 21,
43+
RANGE = 22,
44+
REPEAT = 23,
45+
REPEAT_ONE = 24,
46+
SUBPATTERN = 25,
47+
MIN_REPEAT_ONE = 26,
48+
ATOMIC_GROUP = 27,
49+
POSSESSIVE_REPEAT = 28,
50+
POSSESSIVE_REPEAT_ONE = 29,
51+
GROUPREF_IGNORE = 30,
52+
IN_IGNORE = 31,
53+
LITERAL_IGNORE = 32,
54+
NOT_LITERAL_IGNORE = 33,
55+
GROUPREF_LOC_IGNORE = 34,
56+
IN_LOC_IGNORE = 35,
57+
LITERAL_LOC_IGNORE = 36,
58+
NOT_LITERAL_LOC_IGNORE = 37,
59+
GROUPREF_UNI_IGNORE = 38,
60+
IN_UNI_IGNORE = 39,
61+
LITERAL_UNI_IGNORE = 40,
62+
NOT_LITERAL_UNI_IGNORE = 41,
63+
RANGE_UNI_IGNORE = 42,
6264
}
6365
#[derive(num_enum::TryFromPrimitive, Debug)]
6466
#[repr(u32)]
@@ -101,7 +103,7 @@ pub enum SreCatCode {
101103
UNI_NOT_LINEBREAK = 17,
102104
}
103105
bitflags! {
104-
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
106+
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
105107
pub struct SreFlag: u16 {
106108
const TEMPLATE = 1;
107109
const IGNORECASE = 2;

‎src/engine.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,13 +759,15 @@ fn _match<S: StrDrive>(req: &Request<S>, state: &mut State, ctx: MatchContext) -
759759
ctx.skip_code_from(req, 2)
760760
}
761761
}
762-
SreOpcode::CALL => todo!(),
763762
SreOpcode::CHARSET => todo!(),
764763
SreOpcode::BIGCHARSET => todo!(),
765764
SreOpcode::NEGATE => todo!(),
766765
SreOpcode::RANGE => todo!(),
767766
SreOpcode::RANGE_UNI_IGNORE => todo!(),
768767
SreOpcode::SUBPATTERN => todo!(),
768+
SreOpcode::ATOMIC_GROUP => todo!(),
769+
SreOpcode::POSSESSIVE_REPEAT => todo!(),
770+
SreOpcode::POSSESSIVE_REPEAT_ONE => todo!(),
769771
}
770772
}
771773
};

‎tests/tests.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ impl Pattern {
1919
fn test_2427() {
2020
// pattern lookbehind = re.compile(r'(?<!\.)x\b')
2121
// START GENERATED by generate_tests.py
22-
#[rustfmt::skip] let lookbehind = Pattern { code: &[15, 4, 0, 1, 1, 5, 5, 1, 17, 46, 1, 17, 120, 6, 10, 1] };
22+
#[rustfmt::skip] let lookbehind = Pattern { code: &[14, 4, 0, 1, 1, 5, 5, 1, 16, 46, 1, 16, 120, 6, 10, 1] };
2323
// END GENERATED
2424
let (req, mut state) = lookbehind.state("x");
2525
assert!(state.pymatch(&req));
@@ -29,7 +29,7 @@ fn test_2427() {
2929
fn test_assert() {
3030
// pattern positive_lookbehind = re.compile(r'(?<=abc)def')
3131
// START GENERATED by generate_tests.py
32-
#[rustfmt::skip] let positive_lookbehind = Pattern { code: &[15, 4, 0, 3, 3, 4, 9, 3, 17, 97, 17, 98, 17, 99, 1, 17, 100, 17, 101, 17, 102, 1] };
32+
#[rustfmt::skip] let positive_lookbehind = Pattern { code: &[14, 4, 0, 3, 3, 4, 9, 3, 16, 97, 16, 98, 16, 99, 1, 16, 100, 16, 101, 16, 102, 1] };
3333
// END GENERATED
3434
let (req, mut state) = positive_lookbehind.state("abcdef");
3535
assert!(state.search(req));
@@ -39,7 +39,7 @@ fn test_assert() {
3939
fn test_string_boundaries() {
4040
// pattern big_b = re.compile(r'\B')
4141
// START GENERATED by generate_tests.py
42-
#[rustfmt::skip] let big_b = Pattern { code: &[15, 4, 0, 0, 0, 6, 11, 1] };
42+
#[rustfmt::skip] let big_b = Pattern { code: &[14, 4, 0, 0, 0, 6, 11, 1] };
4343
// END GENERATED
4444
let (req, mut state) = big_b.state("");
4545
assert!(!state.search(req));
@@ -49,7 +49,7 @@ fn test_string_boundaries() {
4949
fn test_zerowidth() {
5050
// pattern p = re.compile(r'\b|:+')
5151
// START GENERATED by generate_tests.py
52-
#[rustfmt::skip] let p = Pattern { code: &[15, 4, 0, 0, 4294967295, 7, 5, 6, 10, 16, 12, 10, 25, 6, 1, 4294967295, 17, 58, 1, 16, 2, 0, 1] };
52+
#[rustfmt::skip] let p = Pattern { code: &[14, 4, 0, 0, 4294967295, 7, 5, 6, 10, 15, 12, 10, 24, 6, 1, 4294967295, 16, 58, 1, 15, 2, 0, 1] };
5353
// END GENERATED
5454
let (mut req, mut state) = p.state("a:");
5555
req.must_advance = true;
@@ -62,7 +62,7 @@ fn test_repeat_context_panic() {
6262
use optional::Optioned;
6363
// pattern p = re.compile(r'(?:a*?(xx)??z)*')
6464
// START GENERATED by generate_tests.py
65-
#[rustfmt::skip] let p = Pattern { code: &[15, 4, 0, 0, 4294967295, 24, 25, 0, 4294967295, 27, 6, 0, 4294967295, 17, 97, 1, 24, 11, 0, 1, 18, 0, 17, 120, 17, 120, 18, 1, 20, 17, 122, 19, 1] };
65+
#[rustfmt::skip] let p = Pattern { code: &[14, 4, 0, 0, 4294967295, 23, 25, 0, 4294967295, 26, 6, 0, 4294967295, 16, 97, 1, 23, 11, 0, 1, 17, 0, 16, 120, 16, 120, 17, 1, 19, 16, 122, 18, 1] };
6666
// END GENERATED
6767
let (req, mut state) = p.state("axxzaz");
6868
assert!(state.pymatch(&req));
@@ -73,7 +73,7 @@ fn test_repeat_context_panic() {
7373
fn test_double_max_until() {
7474
// pattern p = re.compile(r'((1)?)*')
7575
// START GENERATED by generate_tests.py
76-
#[rustfmt::skip] let p = Pattern { code: &[15, 4, 0, 0, 4294967295, 24, 18, 0, 4294967295, 18, 0, 24, 9, 0, 1, 18, 2, 17, 49, 18, 3, 19, 18, 1, 19, 1] };
76+
#[rustfmt::skip] let p = Pattern { code: &[14, 4, 0, 0, 4294967295, 23, 18, 0, 4294967295, 17, 0, 23, 9, 0, 1, 17, 2, 16, 49, 17, 3, 18, 17, 1, 18, 1] };
7777
// END GENERATED
7878
let (req, mut state) = p.state("1111");
7979
assert!(state.pymatch(&req));
@@ -84,7 +84,7 @@ fn test_double_max_until() {
8484
fn test_info_single() {
8585
// pattern p = re.compile(r'aa*')
8686
// START GENERATED by generate_tests.py
87-
#[rustfmt::skip] let p = Pattern { code: &[15, 8, 1, 1, 4294967295, 1, 1, 97, 0, 17, 97, 25, 6, 0, 4294967295, 17, 97, 1, 1] };
87+
#[rustfmt::skip] let p = Pattern { code: &[14, 8, 1, 1, 4294967295, 1, 1, 97, 0, 16, 97, 24, 6, 0, 4294967295, 16, 97, 1, 1] };
8888
// END GENERATED
8989
let (req, mut state) = p.state("baaaa");
9090
assert!(state.search(req));
@@ -96,7 +96,7 @@ fn test_info_single() {
9696
fn test_info_single2() {
9797
// pattern p = re.compile(r'Python|Perl')
9898
// START GENERATED by generate_tests.py
99-
#[rustfmt::skip] let p = Pattern { code: &[15, 8, 1, 4, 6, 1, 1, 80, 0, 17, 80, 7, 13, 17, 121, 17, 116, 17, 104, 17, 111, 17, 110, 16, 11, 9, 17, 101, 17, 114, 17, 108, 16, 2, 0, 1] };
99+
#[rustfmt::skip] let p = Pattern { code: &[14, 8, 1, 4, 6, 1, 1, 80, 0, 16, 80, 7, 13, 16, 121, 16, 116, 16, 104, 16, 111, 16, 110, 15, 11, 9, 16, 101, 16, 114, 16, 108, 15, 2, 0, 1] };
100100
// END GENERATED
101101
let (req, mut state) = p.state("Perl");
102102
assert!(state.search(req));
@@ -106,7 +106,7 @@ fn test_info_single2() {
106106
fn test_info_literal() {
107107
// pattern p = re.compile(r'ababc+')
108108
// START GENERATED by generate_tests.py
109-
#[rustfmt::skip] let p = Pattern { code: &[15, 14, 1, 5, 4294967295, 4, 4, 97, 98, 97, 98, 0, 0, 1, 2, 17, 97, 17, 98, 17, 97, 17, 98, 25, 6, 1, 4294967295, 17, 99, 1, 1] };
109+
#[rustfmt::skip] let p = Pattern { code: &[14, 14, 1, 5, 4294967295, 4, 4, 97, 98, 97, 98, 0, 0, 1, 2, 16, 97, 16, 98, 16, 97, 16, 98, 24, 6, 1, 4294967295, 16, 99, 1, 1] };
110110
// END GENERATED
111111
let (req, mut state) = p.state("!ababc");
112112
assert!(state.search(req));
@@ -116,7 +116,7 @@ fn test_info_literal() {
116116
fn test_info_literal2() {
117117
// pattern p = re.compile(r'(python)\1')
118118
// START GENERATED by generate_tests.py
119-
#[rustfmt::skip] let p = Pattern { code: &[15, 18, 1, 12, 12, 6, 0, 112, 121, 116, 104, 111, 110, 0, 0, 0, 0, 0, 0, 18, 0, 17, 112, 17, 121, 17, 116, 17, 104, 17, 111, 17, 110, 18, 1, 12, 0, 1] };
119+
#[rustfmt::skip] let p = Pattern { code: &[14, 18, 1, 12, 12, 6, 0, 112, 121, 116, 104, 111, 110, 0, 0, 0, 0, 0, 0, 17, 0, 16, 112, 16, 121, 16, 116, 16, 104, 16, 111, 16, 110, 17, 1, 11, 0, 1] };
120120
// END GENERATED
121121
let (req, mut state) = p.state("pythonpython");
122122
assert!(state.search(req));

0 commit comments

Comments
 (0)