Skip to content

Commit

Permalink
syntax: simplify Hir::dot constructors
Browse files Browse the repository at this point in the history
This also likely avoids a spurious alloc or two, although
it assuredly doesn't matter in practice.
  • Loading branch information
Lucretiel authored May 6, 2024
1 parent b12a276 commit 9c139f4
Showing 1 changed file with 24 additions and 28 deletions.
52 changes: 24 additions & 28 deletions regex-syntax/src/hir/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -658,34 +658,30 @@ impl Hir {
#[inline]
pub fn dot(dot: Dot) -> Hir {
match dot {
Dot::AnyChar => {
let mut cls = ClassUnicode::empty();
cls.push(ClassUnicodeRange::new('\0', '\u{10FFFF}'));
Hir::class(Class::Unicode(cls))
}
Dot::AnyByte => {
let mut cls = ClassBytes::empty();
cls.push(ClassBytesRange::new(b'\0', b'\xFF'));
Hir::class(Class::Bytes(cls))
}
Dot::AnyChar => Hir::class(Class::Unicode(ClassUnicode::new([
ClassUnicodeRange::new('\0', '\u{10FFFF}'),
]))),
Dot::AnyByte => Hir::class(Class::Bytes(ClassBytes::new([
ClassBytesRange::new(b'\0', b'\xFF'),
]))),
Dot::AnyCharExcept(ch) => {
let mut cls =
ClassUnicode::new([ClassUnicodeRange::new(ch, ch)]);
cls.negate();
Hir::class(Class::Unicode(cls))
}
Dot::AnyCharExceptLF => {
let mut cls = ClassUnicode::empty();
cls.push(ClassUnicodeRange::new('\0', '\x09'));
cls.push(ClassUnicodeRange::new('\x0B', '\u{10FFFF}'));
Hir::class(Class::Unicode(cls))
Hir::class(Class::Unicode(ClassUnicode::new([
ClassUnicodeRange::new('\0', '\x09'),
ClassUnicodeRange::new('\x0B', '\u{10FFFF}'),
])))
}
Dot::AnyCharExceptCRLF => {
let mut cls = ClassUnicode::empty();
cls.push(ClassUnicodeRange::new('\0', '\x09'));
cls.push(ClassUnicodeRange::new('\x0B', '\x0C'));
cls.push(ClassUnicodeRange::new('\x0E', '\u{10FFFF}'));
Hir::class(Class::Unicode(cls))
Hir::class(Class::Unicode(ClassUnicode::new([
ClassUnicodeRange::new('\0', '\x09'),
ClassUnicodeRange::new('\x0B', '\x0C'),
ClassUnicodeRange::new('\x0E', '\u{10FFFF}'),
])))
}
Dot::AnyByteExcept(byte) => {
let mut cls =
Expand All @@ -694,17 +690,17 @@ impl Hir {
Hir::class(Class::Bytes(cls))
}
Dot::AnyByteExceptLF => {
let mut cls = ClassBytes::empty();
cls.push(ClassBytesRange::new(b'\0', b'\x09'));
cls.push(ClassBytesRange::new(b'\x0B', b'\xFF'));
Hir::class(Class::Bytes(cls))
Hir::class(Class::Bytes(ClassBytes::new([
ClassBytesRange::new(b'\0', b'\x09'),
ClassBytesRange::new(b'\x0B', b'\xFF'),
])))
}
Dot::AnyByteExceptCRLF => {
let mut cls = ClassBytes::empty();
cls.push(ClassBytesRange::new(b'\0', b'\x09'));
cls.push(ClassBytesRange::new(b'\x0B', b'\x0C'));
cls.push(ClassBytesRange::new(b'\x0E', b'\xFF'));
Hir::class(Class::Bytes(cls))
Hir::class(Class::Bytes(ClassBytes::new([
ClassBytesRange::new(b'\0', b'\x09'),
ClassBytesRange::new(b'\x0B', b'\x0C'),
ClassBytesRange::new(b'\x0E', b'\xFF'),
])))
}
}
}
Expand Down

0 comments on commit 9c139f4

Please sign in to comment.