Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bias generated chars (#99) #116

Merged
merged 2 commits into from
Jan 27, 2016
Merged

Bias generated chars (#99) #116

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52c775a
Bias generated `char`s (#99)
vi Dec 13, 2015
cd742cd
Arbitrary char: Simplify a line according to a comment
vi Dec 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 64 additions & 1 deletion src/arbitrary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,70 @@ impl Arbitrary for String {
}

impl Arbitrary for char {
fn arbitrary<G: Gen>(g: &mut G) -> char { g.gen() }
fn arbitrary<G: Gen>(g: &mut G) -> char {
let mode = g.gen_range(0, 100);
match mode {
0...49 => {
// ASCII + some control characters
char::from_u32(g.gen_range(0, 0xB0)).expect("I except all characters with codepoints 0 to 255 to be valid")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can use the cast from u8 to char to skip both from_u32 and the expect.

}
50...59 => {
// Unicode BMP characters
loop {
if let Some(x) = char::from_u32(g.gen_range(0, 0x10000)) {
return x
}
// ignore surrogate pairs
}
}
60...84 => {
// Characters often used in programming languages
*g.choose(&[
' ', ' ', ' ',
'\t',
'\n',
'~', '`', '!', '@', '#', '$', '%', '^', '&', '*', '(', ')',
'_', '-', '=', '+','[', ']', '{', '}',':',';','\'','"','\\',
'|',',','<','>','.','/','?',
'0', '1','2','3','4','5','6','7','8','9',
]).unwrap()
}
85...89 => {
// Tricky Unicode, part 1
*g.choose(&[
'\u{0149}', // a deprecated character
'\u{fff0}', // some of "Other, format" category:
'\u{fff1}','\u{fff2}','\u{fff3}','\u{fff4}','\u{fff5}',
'\u{fff6}','\u{fff7}','\u{fff8}','\u{fff9}','\u{fffA}',
'\u{fffB}','\u{fffC}','\u{fffD}','\u{fffE}','\u{fffF}',
'\u{0600}','\u{0601}','\u{0602}','\u{0603}',
'\u{0604}','\u{0605}','\u{061C}',
'\u{06DD}','\u{070F}','\u{180E}',
'\u{110BD}', '\u{1D173}',
'\u{e0001}', // tag
'\u{e0020}',// tag space
'\u{e000}', '\u{e001}', '\u{ef8ff}', // private use
'\u{f0000}', '\u{ffffd}','\u{ffffe}', '\u{fffff}',
'\u{100000}','\u{10FFFD}','\u{10FFFE}','\u{10FFFF}',
// "Other, surrogate" characters are so that very special
// that they are not even allowed in safe Rust,
//so omitted here
'\u{3000}', // ideographic space
'\u{1680}',
// other space characters are already covered by two next branches
]).unwrap()
}
90...94 => {
// Tricky unicode, part 2
char::from_u32(g.gen_range(0x2000, 0x2070)).unwrap()
}
95...99 => {
// Completely arbitrary characters
g.gen()
}
_ => unreachable!()
}
}

fn shrink(&self) -> Box<Iterator<Item=char>> {
Box::new((*self as u32).shrink().filter_map(char::from_u32))
Expand Down