Mirrors/libyaml-safer
2
0
Fork 0
mirror of https://github.com/simonask/libyaml-safer synced 2024-11-26 21:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Factor out IS_BLANK_AT macro

Browse source
This commit is contained in:
David Tolnay 2022-07-21 00:49:07 -07:00
parent f3bd6b6376
commit ee0a40afc5
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/macros.rs
View file

@ -1,16 +1,21 @@
macro_rules! IS_BLANK_AT {
($string:expr, $offset:expr) => {
*$string.pointer.wrapping_offset($offset as isize) as libc::c_int
== ' ' as i32 as yaml_char_t as libc::c_int
|| *$string.pointer.wrapping_offset($offset as isize) as libc::c_int
== '\t' as i32 as yaml_char_t as libc::c_int
};
}
macro_rules! IS_BLANK { macro_rules! IS_BLANK {
($string:expr) => { ($string:expr) => {
*$string.pointer as libc::c_int == ' ' as i32 as yaml_char_t as libc::c_int IS_BLANK_AT!($string, 0)
|| *$string.pointer as libc::c_int == '\t' as i32 as yaml_char_t as libc::c_int
}; };
} }
macro_rules! IS_BLANKZ_AT { macro_rules! IS_BLANKZ_AT {
($string:expr, $offset:expr) => { ($string:expr, $offset:expr) => {
(*$string.pointer.wrapping_offset($offset as isize) as libc::c_int IS_BLANK_AT!($string, $offset)
== ' ' as i32 as yaml_char_t as libc::c_int
|| *$string.pointer.wrapping_offset($offset as isize) as libc::c_int
== '\t' as i32 as yaml_char_t as libc::c_int
|| (*$string.pointer.wrapping_offset($offset as isize) as libc::c_int || (*$string.pointer.wrapping_offset($offset as isize) as libc::c_int
== '\r' as i32 as yaml_char_t as libc::c_int == '\r' as i32 as yaml_char_t as libc::c_int
|| *$string.pointer.wrapping_offset($offset as isize) as libc::c_int || *$string.pointer.wrapping_offset($offset as isize) as libc::c_int
@ -32,7 +37,7 @@ macro_rules! IS_BLANKZ_AT {
&& *$string.pointer.wrapping_offset($offset as isize + 2) as libc::c_int && *$string.pointer.wrapping_offset($offset as isize + 2) as libc::c_int
== -87i32 as yaml_char_t as libc::c_int == -87i32 as yaml_char_t as libc::c_int
|| *$string.pointer.wrapping_offset($offset as isize) as libc::c_int || *$string.pointer.wrapping_offset($offset as isize) as libc::c_int
== '\0' as i32 as yaml_char_t as libc::c_int)) == '\0' as i32 as yaml_char_t as libc::c_int)
}; };
} }

5
src/scanner.rs
View file

@ -476,10 +476,7 @@ unsafe fn yaml_parser_fetch_next_token(parser: *mut yaml_parser_t) -> libc::c_in
|| *((*parser).buffer.pointer) as libc::c_int == '@' as i32 as yaml_char_t as libc::c_int || *((*parser).buffer.pointer) as libc::c_int == '@' as i32 as yaml_char_t as libc::c_int
|| *((*parser).buffer.pointer) as libc::c_int == '`' as i32 as yaml_char_t as libc::c_int) || *((*parser).buffer.pointer) as libc::c_int == '`' as i32 as yaml_char_t as libc::c_int)
|| *((*parser).buffer.pointer) as libc::c_int == '-' as i32 as yaml_char_t as libc::c_int || *((*parser).buffer.pointer) as libc::c_int == '-' as i32 as yaml_char_t as libc::c_int
&& !(*((*parser).buffer.pointer).wrapping_offset(1_isize) as libc::c_int && !IS_BLANK_AT!((*parser).buffer, 1)
== ' ' as i32 as yaml_char_t as libc::c_int
|| *((*parser).buffer.pointer).wrapping_offset(1_isize) as libc::c_int
== '\t' as i32 as yaml_char_t as libc::c_int)
|| (*parser).flow_level == 0 || (*parser).flow_level == 0
&& (*((*parser).buffer.pointer) as libc::c_int && (*((*parser).buffer.pointer) as libc::c_int
== '?' as i32 as yaml_char_t as libc::c_int == '?' as i32 as yaml_char_t as libc::c_int