diff --git a/src/generator/gen_unicode.ml b/src/generator/gen_unicode.ml index af81eff7..a261227c 100644 --- a/src/generator/gen_unicode.ml +++ b/src/generator/gen_unicode.ml @@ -47,7 +47,7 @@ let print_elements ch hashtbl cats = (fun (b, e) -> Printf.sprintf "0x%x, 0x%x" b e) (Cset.union_list (Hashtbl.find_all hashtbl c) :> (int * int) list) in - Printf.fprintf ch " let %s = Sedlex_utils.Cset.of_list\n [" c; + Printf.fprintf ch " let %s = Sedlex_cset.of_list\n [" c; List.iteri (fun i x -> if i > 0 then diff --git a/src/syntax/unicode.ml b/src/syntax/unicode.ml index 7baa14e1..be3e74fb 100644 --- a/src/syntax/unicode.ml +++ b/src/syntax/unicode.ml @@ -9,17 +9,17 @@ let version = "16.0.0" module Categories = struct - let cc = Sedlex_utils.Cset.of_list + let cc = Sedlex_cset.of_list [0x0, 0x1f; 0x7f, 0x9f] - let cf = Sedlex_utils.Cset.of_list + let cf = Sedlex_cset.of_list [0xad, 0xad; 0x600, 0x605; 0x61c, 0x61c; 0x6dd, 0x6dd; 0x70f, 0x70f; 0x890, 0x891; 0x8e2, 0x8e2; 0x180e, 0x180e; 0x200b, 0x200f; 0x202a, 0x202e; 0x2060, 0x2064; 0x2066, 0x206f; 0xfeff, 0xfeff; 0xfff9, 0xfffb; 0x110bd, 0x110bd; 0x110cd, 0x110cd; 0x13430, 0x1343f; 0x1bca0, 0x1bca3; 0x1d173, 0x1d17a; 0xe0001, 0xe0001; 0xe0020, 0xe007f] - let cn = Sedlex_utils.Cset.of_list + let cn = Sedlex_cset.of_list [0x378, 0x379; 0x380, 0x383; 0x38b, 0x38b; 0x38d, 0x38d; 0x3a2, 0x3a2; 0x530, 0x530; 0x557, 0x558; 0x58b, 0x58c; 0x590, 0x590; 0x5c8, 0x5cf; 0x5eb, 0x5ee; 0x5f5, 0x5ff; 0x70e, 0x70e; 0x74b, 0x74c; 0x7b2, 0x7bf; @@ -168,13 +168,13 @@ module Categories = struct 0x323b0, 0xe0000; 0xe0002, 0xe001f; 0xe0080, 0xe00ff; 0xe01f0, 0xeffff; 0xffffe, 0xfffff; 0x10fffe, 0x10ffff] - let co = Sedlex_utils.Cset.of_list + let co = Sedlex_cset.of_list [0xe000, 0xf8ff; 0xf0000, 0xffffd; 0x100000, 0x10fffd] - let cs = Sedlex_utils.Cset.of_list + let cs = Sedlex_cset.of_list [0xd800, 0xdfff] - let ll = Sedlex_utils.Cset.of_list + let ll = Sedlex_cset.of_list [0x61, 0x7a; 0xb5, 0xb5; 0xdf, 0xf6; 0xf8, 0xff; 0x101, 0x101; 0x103, 0x103; 0x105, 0x105; 0x107, 0x107; 0x109, 0x109; 0x10b, 0x10b; 0x10d, 0x10d; 0x10f, 0x10f; 0x111, 0x111; 0x113, 0x113; 0x115, 0x115; @@ -309,7 +309,7 @@ module Categories = struct 0x1d7aa, 0x1d7c2; 0x1d7c4, 0x1d7c9; 0x1d7cb, 0x1d7cb; 0x1df00, 0x1df09; 0x1df0b, 0x1df1e; 0x1df25, 0x1df2a; 0x1e922, 0x1e943] - let lm = Sedlex_utils.Cset.of_list + let lm = Sedlex_cset.of_list [0x2b0, 0x2c1; 0x2c6, 0x2d1; 0x2e0, 0x2e4; 0x2ec, 0x2ec; 0x2ee, 0x2ee; 0x374, 0x374; 0x37a, 0x37a; 0x559, 0x559; 0x640, 0x640; 0x6e5, 0x6e6; 0x7f4, 0x7f5; 0x7fa, 0x7fa; 0x81a, 0x81a; 0x824, 0x824; 0x828, 0x828; @@ -326,7 +326,7 @@ module Categories = struct 0x16f93, 0x16f9f; 0x16fe0, 0x16fe1; 0x16fe3, 0x16fe3; 0x1aff0, 0x1aff3; 0x1aff5, 0x1affb; 0x1affd, 0x1affe; 0x1e030, 0x1e06d; 0x1e137, 0x1e13d; 0x1e4eb, 0x1e4eb; 0x1e94b, 0x1e94b] - let lo = Sedlex_utils.Cset.of_list + let lo = Sedlex_cset.of_list [0xaa, 0xaa; 0xba, 0xba; 0x1bb, 0x1bb; 0x1c0, 0x1c3; 0x294, 0x294; 0x5d0, 0x5ea; 0x5ef, 0x5f2; 0x620, 0x63f; 0x641, 0x64a; 0x66e, 0x66f; 0x671, 0x6d3; 0x6d5, 0x6d5; 0x6ee, 0x6ef; 0x6fa, 0x6fc; 0x6ff, 0x6ff; @@ -434,11 +434,11 @@ module Categories = struct 0x2a700, 0x2b739; 0x2b740, 0x2b81d; 0x2b820, 0x2cea1; 0x2ceb0, 0x2ebe0; 0x2ebf0, 0x2ee5d; 0x2f800, 0x2fa1d; 0x30000, 0x3134a; 0x31350, 0x323af] - let lt = Sedlex_utils.Cset.of_list + let lt = Sedlex_cset.of_list [0x1c5, 0x1c5; 0x1c8, 0x1c8; 0x1cb, 0x1cb; 0x1f2, 0x1f2; 0x1f88, 0x1f8f; 0x1f98, 0x1f9f; 0x1fa8, 0x1faf; 0x1fbc, 0x1fbc; 0x1fcc, 0x1fcc; 0x1ffc, 0x1ffc] - let lu = Sedlex_utils.Cset.of_list + let lu = Sedlex_cset.of_list [0x41, 0x5a; 0xc0, 0xd6; 0xd8, 0xde; 0x100, 0x100; 0x102, 0x102; 0x104, 0x104; 0x106, 0x106; 0x108, 0x108; 0x10a, 0x10a; 0x10c, 0x10c; 0x10e, 0x10e; 0x110, 0x110; 0x112, 0x112; 0x114, 0x114; 0x116, 0x116; @@ -571,7 +571,7 @@ module Categories = struct 0x1d6e2, 0x1d6fa; 0x1d71c, 0x1d734; 0x1d756, 0x1d76e; 0x1d790, 0x1d7a8; 0x1d7ca, 0x1d7ca; 0x1e900, 0x1e921] - let mc = Sedlex_utils.Cset.of_list + let mc = Sedlex_cset.of_list [0x903, 0x903; 0x93b, 0x93b; 0x93e, 0x940; 0x949, 0x94c; 0x94e, 0x94f; 0x982, 0x983; 0x9be, 0x9c0; 0x9c7, 0x9c8; 0x9cb, 0x9cc; 0x9d7, 0x9d7; 0xa03, 0xa03; 0xa3e, 0xa40; 0xa83, 0xa83; 0xabe, 0xac0; 0xac9, 0xac9; @@ -611,10 +611,10 @@ module Categories = struct 0x11ef5, 0x11ef6; 0x11f03, 0x11f03; 0x11f34, 0x11f35; 0x11f3e, 0x11f3f; 0x11f41, 0x11f41; 0x1612a, 0x1612c; 0x16f51, 0x16f87; 0x16ff0, 0x16ff1; 0x1d165, 0x1d166; 0x1d16d, 0x1d172] - let me = Sedlex_utils.Cset.of_list + let me = Sedlex_cset.of_list [0x488, 0x489; 0x1abe, 0x1abe; 0x20dd, 0x20e0; 0x20e2, 0x20e4; 0xa670, 0xa672] - let mn = Sedlex_utils.Cset.of_list + let mn = Sedlex_cset.of_list [0x300, 0x36f; 0x483, 0x487; 0x591, 0x5bd; 0x5bf, 0x5bf; 0x5c1, 0x5c2; 0x5c4, 0x5c5; 0x5c7, 0x5c7; 0x610, 0x61a; 0x64b, 0x65f; 0x670, 0x670; 0x6d6, 0x6dc; 0x6df, 0x6e4; 0x6e7, 0x6e8; 0x6ea, 0x6ed; 0x711, 0x711; @@ -688,7 +688,7 @@ module Categories = struct 0x1e2ae, 0x1e2ae; 0x1e2ec, 0x1e2ef; 0x1e4ec, 0x1e4ef; 0x1e5ee, 0x1e5ef; 0x1e8d0, 0x1e8d6; 0x1e944, 0x1e94a; 0xe0100, 0xe01ef] - let nd = Sedlex_utils.Cset.of_list + let nd = Sedlex_cset.of_list [0x30, 0x39; 0x660, 0x669; 0x6f0, 0x6f9; 0x7c0, 0x7c9; 0x966, 0x96f; 0x9e6, 0x9ef; 0xa66, 0xa6f; 0xae6, 0xaef; 0xb66, 0xb6f; 0xbe6, 0xbef; 0xc66, 0xc6f; 0xce6, 0xcef; 0xd66, 0xd6f; 0xde6, 0xdef; 0xe50, 0xe59; @@ -705,12 +705,12 @@ module Categories = struct 0x1e140, 0x1e149; 0x1e2f0, 0x1e2f9; 0x1e4f0, 0x1e4f9; 0x1e5f1, 0x1e5fa; 0x1e950, 0x1e959; 0x1fbf0, 0x1fbf9] - let nl = Sedlex_utils.Cset.of_list + let nl = Sedlex_cset.of_list [0x16ee, 0x16f0; 0x2160, 0x2182; 0x2185, 0x2188; 0x3007, 0x3007; 0x3021, 0x3029; 0x3038, 0x303a; 0xa6e6, 0xa6ef; 0x10140, 0x10174; 0x10341, 0x10341; 0x1034a, 0x1034a; 0x103d1, 0x103d5; 0x12400, 0x1246e] - let no = Sedlex_utils.Cset.of_list + let no = Sedlex_cset.of_list [0xb2, 0xb3; 0xb9, 0xb9; 0xbc, 0xbe; 0x9f4, 0x9f9; 0xb72, 0xb77; 0xbf0, 0xbf2; 0xc78, 0xc7e; 0xd58, 0xd5e; 0xd70, 0xd78; 0xf2a, 0xf33; 0x1369, 0x137c; 0x17f0, 0x17f9; 0x19da, 0x19da; 0x2070, 0x2070; 0x2074, 0x2079; @@ -727,17 +727,17 @@ module Categories = struct 0x1e8c7, 0x1e8cf; 0x1ec71, 0x1ecab; 0x1ecad, 0x1ecaf; 0x1ecb1, 0x1ecb4; 0x1ed01, 0x1ed2d; 0x1ed2f, 0x1ed3d; 0x1f100, 0x1f10c] - let pc = Sedlex_utils.Cset.of_list + let pc = Sedlex_cset.of_list [0x5f, 0x5f; 0x203f, 0x2040; 0x2054, 0x2054; 0xfe33, 0xfe34; 0xfe4d, 0xfe4f; 0xff3f, 0xff3f] - let pd = Sedlex_utils.Cset.of_list + let pd = Sedlex_cset.of_list [0x2d, 0x2d; 0x58a, 0x58a; 0x5be, 0x5be; 0x1400, 0x1400; 0x1806, 0x1806; 0x2010, 0x2015; 0x2e17, 0x2e17; 0x2e1a, 0x2e1a; 0x2e3a, 0x2e3b; 0x2e40, 0x2e40; 0x2e5d, 0x2e5d; 0x301c, 0x301c; 0x3030, 0x3030; 0x30a0, 0x30a0; 0xfe31, 0xfe32; 0xfe58, 0xfe58; 0xfe63, 0xfe63; 0xff0d, 0xff0d; 0x10d6e, 0x10d6e; 0x10ead, 0x10ead] - let pe = Sedlex_utils.Cset.of_list + let pe = Sedlex_cset.of_list [0x29, 0x29; 0x5d, 0x5d; 0x7d, 0x7d; 0xf3b, 0xf3b; 0xf3d, 0xf3d; 0x169c, 0x169c; 0x2046, 0x2046; 0x207e, 0x207e; 0x208e, 0x208e; 0x2309, 0x2309; 0x230b, 0x230b; 0x232a, 0x232a; 0x2769, 0x2769; 0x276b, 0x276b; 0x276d, 0x276d; @@ -755,16 +755,16 @@ module Categories = struct 0xfe5e, 0xfe5e; 0xff09, 0xff09; 0xff3d, 0xff3d; 0xff5d, 0xff5d; 0xff60, 0xff60; 0xff63, 0xff63] - let pf = Sedlex_utils.Cset.of_list + let pf = Sedlex_cset.of_list [0xbb, 0xbb; 0x2019, 0x2019; 0x201d, 0x201d; 0x203a, 0x203a; 0x2e03, 0x2e03; 0x2e05, 0x2e05; 0x2e0a, 0x2e0a; 0x2e0d, 0x2e0d; 0x2e1d, 0x2e1d; 0x2e21, 0x2e21] - let pi = Sedlex_utils.Cset.of_list + let pi = Sedlex_cset.of_list [0xab, 0xab; 0x2018, 0x2018; 0x201b, 0x201c; 0x201f, 0x201f; 0x2039, 0x2039; 0x2e02, 0x2e02; 0x2e04, 0x2e04; 0x2e09, 0x2e09; 0x2e0c, 0x2e0c; 0x2e1c, 0x2e1c; 0x2e20, 0x2e20] - let po = Sedlex_utils.Cset.of_list + let po = Sedlex_cset.of_list [0x21, 0x23; 0x25, 0x27; 0x2a, 0x2a; 0x2c, 0x2c; 0x2e, 0x2f; 0x3a, 0x3b; 0x3f, 0x40; 0x5c, 0x5c; 0xa1, 0xa1; 0xa7, 0xa7; 0xb6, 0xb7; 0xbf, 0xbf; 0x37e, 0x37e; 0x387, 0x387; 0x55a, 0x55f; @@ -805,7 +805,7 @@ module Categories = struct 0x16b44, 0x16b44; 0x16d6d, 0x16d6f; 0x16e97, 0x16e9a; 0x16fe2, 0x16fe2; 0x1bc9f, 0x1bc9f; 0x1da87, 0x1da8b; 0x1e5ff, 0x1e5ff; 0x1e95e, 0x1e95f] - let ps = Sedlex_utils.Cset.of_list + let ps = Sedlex_cset.of_list [0x28, 0x28; 0x5b, 0x5b; 0x7b, 0x7b; 0xf3a, 0xf3a; 0xf3c, 0xf3c; 0x169b, 0x169b; 0x201a, 0x201a; 0x201e, 0x201e; 0x2045, 0x2045; 0x207d, 0x207d; 0x208d, 0x208d; 0x2308, 0x2308; 0x230a, 0x230a; 0x2329, 0x2329; 0x2768, 0x2768; @@ -823,14 +823,14 @@ module Categories = struct 0xfe47, 0xfe47; 0xfe59, 0xfe59; 0xfe5b, 0xfe5b; 0xfe5d, 0xfe5d; 0xff08, 0xff08; 0xff3b, 0xff3b; 0xff5b, 0xff5b; 0xff5f, 0xff5f; 0xff62, 0xff62] - let sc = Sedlex_utils.Cset.of_list + let sc = Sedlex_cset.of_list [0x24, 0x24; 0xa2, 0xa5; 0x58f, 0x58f; 0x60b, 0x60b; 0x7fe, 0x7ff; 0x9f2, 0x9f3; 0x9fb, 0x9fb; 0xaf1, 0xaf1; 0xbf9, 0xbf9; 0xe3f, 0xe3f; 0x17db, 0x17db; 0x20a0, 0x20c0; 0xa838, 0xa838; 0xfdfc, 0xfdfc; 0xfe69, 0xfe69; 0xff04, 0xff04; 0xffe0, 0xffe1; 0xffe5, 0xffe6; 0x11fdd, 0x11fe0; 0x1e2ff, 0x1e2ff; 0x1ecb0, 0x1ecb0] - let sk = Sedlex_utils.Cset.of_list + let sk = Sedlex_cset.of_list [0x5e, 0x5e; 0x60, 0x60; 0xa8, 0xa8; 0xaf, 0xaf; 0xb4, 0xb4; 0xb8, 0xb8; 0x2c2, 0x2c5; 0x2d2, 0x2df; 0x2e5, 0x2eb; 0x2ed, 0x2ed; 0x2ef, 0x2ff; 0x375, 0x375; 0x384, 0x385; 0x888, 0x888; 0x1fbd, 0x1fbd; @@ -839,7 +839,7 @@ module Categories = struct 0xab6a, 0xab6b; 0xfbb2, 0xfbc2; 0xff3e, 0xff3e; 0xff40, 0xff40; 0xffe3, 0xffe3; 0x1f3fb, 0x1f3ff] - let sm = Sedlex_utils.Cset.of_list + let sm = Sedlex_cset.of_list [0x2b, 0x2b; 0x3c, 0x3e; 0x7c, 0x7c; 0x7e, 0x7e; 0xac, 0xac; 0xb1, 0xb1; 0xd7, 0xd7; 0xf7, 0xf7; 0x3f6, 0x3f6; 0x606, 0x608; 0x2044, 0x2044; 0x2052, 0x2052; 0x207a, 0x207c; 0x208a, 0x208c; 0x2118, 0x2118; @@ -854,7 +854,7 @@ module Categories = struct 0x1d6db, 0x1d6db; 0x1d6fb, 0x1d6fb; 0x1d715, 0x1d715; 0x1d735, 0x1d735; 0x1d74f, 0x1d74f; 0x1d76f, 0x1d76f; 0x1d789, 0x1d789; 0x1d7a9, 0x1d7a9; 0x1d7c3, 0x1d7c3; 0x1eef0, 0x1eef1] - let so = Sedlex_utils.Cset.of_list + let so = Sedlex_cset.of_list [0xa6, 0xa6; 0xa9, 0xa9; 0xae, 0xae; 0xb0, 0xb0; 0x482, 0x482; 0x58d, 0x58e; 0x60e, 0x60f; 0x6de, 0x6de; 0x6e9, 0x6e9; 0x6fd, 0x6fe; 0x7f6, 0x7f6; 0x9fa, 0x9fa; 0xb70, 0xb70; 0xbf3, 0xbf8; 0xbfa, 0xbfa; @@ -894,13 +894,13 @@ module Categories = struct 0x1fa80, 0x1fa89; 0x1fa8f, 0x1fac6; 0x1face, 0x1fadc; 0x1fadf, 0x1fae9; 0x1faf0, 0x1faf8; 0x1fb00, 0x1fb92; 0x1fb94, 0x1fbef] - let zl = Sedlex_utils.Cset.of_list + let zl = Sedlex_cset.of_list [0x2028, 0x2028] - let zp = Sedlex_utils.Cset.of_list + let zp = Sedlex_cset.of_list [0x2029, 0x2029] - let zs = Sedlex_utils.Cset.of_list + let zs = Sedlex_cset.of_list [0x20, 0x20; 0xa0, 0xa0; 0x1680, 0x1680; 0x2000, 0x200a; 0x202f, 0x202f; 0x205f, 0x205f; 0x3000, 0x3000] @@ -941,7 +941,7 @@ end module Properties = struct - let alphabetic = Sedlex_utils.Cset.of_list + let alphabetic = Sedlex_cset.of_list [0x41, 0x5a; 0x61, 0x7a; 0xaa, 0xaa; 0xb5, 0xb5; 0xba, 0xba; 0xc0, 0xd6; 0xd8, 0xf6; 0xf8, 0x2c1; 0x2c6, 0x2d1; 0x2e0, 0x2e4; 0x2ec, 0x2ec; 0x2ee, 0x2ee; 0x345, 0x345; 0x363, 0x374; 0x376, 0x377; @@ -1095,14 +1095,14 @@ module Properties = struct 0x2b740, 0x2b81d; 0x2b820, 0x2cea1; 0x2ceb0, 0x2ebe0; 0x2ebf0, 0x2ee5d; 0x2f800, 0x2fa1d; 0x30000, 0x3134a; 0x31350, 0x323af] - let ascii_hex_digit = Sedlex_utils.Cset.of_list + let ascii_hex_digit = Sedlex_cset.of_list [0x30, 0x39; 0x41, 0x46; 0x61, 0x66] - let hex_digit = Sedlex_utils.Cset.of_list + let hex_digit = Sedlex_cset.of_list [0x30, 0x39; 0x41, 0x46; 0x61, 0x66; 0xff10, 0xff19; 0xff21, 0xff26; 0xff41, 0xff46] - let id_continue = Sedlex_utils.Cset.of_list + let id_continue = Sedlex_cset.of_list [0x30, 0x39; 0x41, 0x5a; 0x5f, 0x5f; 0x61, 0x7a; 0xaa, 0xaa; 0xb5, 0xb5; 0xb7, 0xb7; 0xba, 0xba; 0xc0, 0xd6; 0xd8, 0xf6; 0xf8, 0x2c1; 0x2c6, 0x2d1; 0x2e0, 0x2e4; 0x2ec, 0x2ec; 0x2ee, 0x2ee; @@ -1263,7 +1263,7 @@ module Properties = struct 0x2b740, 0x2b81d; 0x2b820, 0x2cea1; 0x2ceb0, 0x2ebe0; 0x2ebf0, 0x2ee5d; 0x2f800, 0x2fa1d; 0x30000, 0x3134a; 0x31350, 0x323af; 0xe0100, 0xe01ef] - let id_start = Sedlex_utils.Cset.of_list + let id_start = Sedlex_cset.of_list [0x41, 0x5a; 0x61, 0x7a; 0xaa, 0xaa; 0xb5, 0xb5; 0xba, 0xba; 0xc0, 0xd6; 0xd8, 0xf6; 0xf8, 0x2c1; 0x2c6, 0x2d1; 0x2e0, 0x2e4; 0x2ec, 0x2ec; 0x2ee, 0x2ee; 0x370, 0x374; 0x376, 0x377; 0x37a, 0x37d; @@ -1401,7 +1401,7 @@ module Properties = struct 0x2b740, 0x2b81d; 0x2b820, 0x2cea1; 0x2ceb0, 0x2ebe0; 0x2ebf0, 0x2ee5d; 0x2f800, 0x2fa1d; 0x30000, 0x3134a; 0x31350, 0x323af] - let lowercase = Sedlex_utils.Cset.of_list + let lowercase = Sedlex_cset.of_list [0x61, 0x7a; 0xaa, 0xaa; 0xb5, 0xb5; 0xba, 0xba; 0xdf, 0xf6; 0xf8, 0xff; 0x101, 0x101; 0x103, 0x103; 0x105, 0x105; 0x107, 0x107; 0x109, 0x109; 0x10b, 0x10b; 0x10d, 0x10d; 0x10f, 0x10f; 0x111, 0x111; @@ -1538,7 +1538,7 @@ module Properties = struct 0x1d770, 0x1d788; 0x1d78a, 0x1d78f; 0x1d7aa, 0x1d7c2; 0x1d7c4, 0x1d7c9; 0x1d7cb, 0x1d7cb; 0x1df00, 0x1df09; 0x1df0b, 0x1df1e; 0x1df25, 0x1df2a; 0x1e030, 0x1e06d; 0x1e922, 0x1e943] - let math = Sedlex_utils.Cset.of_list + let math = Sedlex_cset.of_list [0x2b, 0x2b; 0x3c, 0x3e; 0x5e, 0x5e; 0x7c, 0x7c; 0x7e, 0x7e; 0xac, 0xac; 0xb1, 0xb1; 0xd7, 0xd7; 0xf7, 0xf7; 0x3d0, 0x3d2; 0x3d5, 0x3d5; 0x3f0, 0x3f1; 0x3f4, 0x3f6; 0x606, 0x608; 0x2016, 0x2016; @@ -1568,7 +1568,7 @@ module Properties = struct 0x1ee74, 0x1ee77; 0x1ee79, 0x1ee7c; 0x1ee7e, 0x1ee7e; 0x1ee80, 0x1ee89; 0x1ee8b, 0x1ee9b; 0x1eea1, 0x1eea3; 0x1eea5, 0x1eea9; 0x1eeab, 0x1eebb; 0x1eef0, 0x1eef1] - let other_alphabetic = Sedlex_utils.Cset.of_list + let other_alphabetic = Sedlex_cset.of_list [0x345, 0x345; 0x363, 0x36f; 0x5b0, 0x5bd; 0x5bf, 0x5bf; 0x5c1, 0x5c2; 0x5c4, 0x5c5; 0x5c7, 0x5c7; 0x610, 0x61a; 0x64b, 0x657; 0x659, 0x65f; 0x670, 0x670; 0x6d6, 0x6dc; 0x6e1, 0x6e4; 0x6e7, 0x6e8; 0x6ed, 0x6ed; @@ -1620,7 +1620,7 @@ module Properties = struct 0x1e000, 0x1e006; 0x1e008, 0x1e018; 0x1e01b, 0x1e021; 0x1e023, 0x1e024; 0x1e026, 0x1e02a; 0x1e08f, 0x1e08f; 0x1e947, 0x1e947; 0x1f130, 0x1f149; 0x1f150, 0x1f169; 0x1f170, 0x1f189] - let other_lowercase = Sedlex_utils.Cset.of_list + let other_lowercase = Sedlex_cset.of_list [0xaa, 0xaa; 0xba, 0xba; 0x2b0, 0x2b8; 0x2c0, 0x2c1; 0x2e0, 0x2e4; 0x345, 0x345; 0x37a, 0x37a; 0x10fc, 0x10fc; 0x1d2c, 0x1d6a; 0x1d78, 0x1d78; 0x1d9b, 0x1dbf; 0x2071, 0x2071; 0x207f, 0x207f; 0x2090, 0x209c; 0x2170, 0x217f; @@ -1628,7 +1628,7 @@ module Properties = struct 0xa7f8, 0xa7f9; 0xab5c, 0xab5f; 0xab69, 0xab69; 0x10780, 0x10780; 0x10783, 0x10785; 0x10787, 0x107b0; 0x107b2, 0x107ba; 0x1e030, 0x1e06d] - let other_math = Sedlex_utils.Cset.of_list + let other_math = Sedlex_cset.of_list [0x5e, 0x5e; 0x3d0, 0x3d2; 0x3d5, 0x3d5; 0x3f0, 0x3f1; 0x3f4, 0x3f5; 0x2016, 0x2016; 0x2032, 0x2034; 0x2040, 0x2040; 0x2061, 0x2064; 0x207d, 0x207e; 0x208d, 0x208e; 0x20d0, 0x20dc; 0x20e1, 0x20e1; 0x20e5, 0x20e6; 0x20eb, 0x20ef; @@ -1657,10 +1657,10 @@ module Properties = struct 0x1ee6c, 0x1ee72; 0x1ee74, 0x1ee77; 0x1ee79, 0x1ee7c; 0x1ee7e, 0x1ee7e; 0x1ee80, 0x1ee89; 0x1ee8b, 0x1ee9b; 0x1eea1, 0x1eea3; 0x1eea5, 0x1eea9; 0x1eeab, 0x1eebb] - let other_uppercase = Sedlex_utils.Cset.of_list + let other_uppercase = Sedlex_cset.of_list [0x2160, 0x216f; 0x24b6, 0x24cf; 0x1f130, 0x1f149; 0x1f150, 0x1f169; 0x1f170, 0x1f189] - let uppercase = Sedlex_utils.Cset.of_list + let uppercase = Sedlex_cset.of_list [0x41, 0x5a; 0xc0, 0xd6; 0xd8, 0xde; 0x100, 0x100; 0x102, 0x102; 0x104, 0x104; 0x106, 0x106; 0x108, 0x108; 0x10a, 0x10a; 0x10c, 0x10c; 0x10e, 0x10e; 0x110, 0x110; 0x112, 0x112; 0x114, 0x114; 0x116, 0x116; @@ -1794,11 +1794,11 @@ module Properties = struct 0x1d790, 0x1d7a8; 0x1d7ca, 0x1d7ca; 0x1e900, 0x1e921; 0x1f130, 0x1f149; 0x1f150, 0x1f169; 0x1f170, 0x1f189] - let white_space = Sedlex_utils.Cset.of_list + let white_space = Sedlex_cset.of_list [0x9, 0xd; 0x20, 0x20; 0x85, 0x85; 0xa0, 0xa0; 0x1680, 0x1680; 0x2000, 0x200a; 0x2028, 0x2029; 0x202f, 0x202f; 0x205f, 0x205f; 0x3000, 0x3000] - let xid_continue = Sedlex_utils.Cset.of_list + let xid_continue = Sedlex_cset.of_list [0x30, 0x39; 0x41, 0x5a; 0x5f, 0x5f; 0x61, 0x7a; 0xaa, 0xaa; 0xb5, 0xb5; 0xb7, 0xb7; 0xba, 0xba; 0xc0, 0xd6; 0xd8, 0xf6; 0xf8, 0x2c1; 0x2c6, 0x2d1; 0x2e0, 0x2e4; 0x2ec, 0x2ec; 0x2ee, 0x2ee; @@ -1960,7 +1960,7 @@ module Properties = struct 0x20000, 0x2a6df; 0x2a700, 0x2b739; 0x2b740, 0x2b81d; 0x2b820, 0x2cea1; 0x2ceb0, 0x2ebe0; 0x2ebf0, 0x2ee5d; 0x2f800, 0x2fa1d; 0x30000, 0x3134a; 0x31350, 0x323af; 0xe0100, 0xe01ef] - let xid_start = Sedlex_utils.Cset.of_list + let xid_start = Sedlex_cset.of_list [0x41, 0x5a; 0x61, 0x7a; 0xaa, 0xaa; 0xb5, 0xb5; 0xba, 0xba; 0xc0, 0xd6; 0xd8, 0xf6; 0xf8, 0x2c1; 0x2c6, 0x2d1; 0x2e0, 0x2e4; 0x2ec, 0x2ec; 0x2ee, 0x2ee; 0x370, 0x374; 0x376, 0x377; 0x37b, 0x37d;