Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Minor clean-ups to border shorthand parsing

Browse source 
This doesn't change behavior.

Differential Revision: https://phabricator.services.mozilla.com/D180465
This commit is contained in:
Emilio Cobos Álvarez 2023-06-10 23:23:35 +00:00 • committed by Martin Robinson
parent 7c8cf00033
commit cf3d31038c
1 changed files with 49 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

112
components/style/properties/shorthands/border.mako.rs
View file

@ -90,13 +90,10 @@ pub fn parse_border<'i, 't>(
} }
break break
} }
if any { if !any {
Ok((color.unwrap_or_else(|| Color::currentcolor()), return Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError))
style.unwrap_or(BorderStyle::None),
width.unwrap_or(BorderSideWidth::Medium)))
} else {
Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError))
} }
Ok((color.unwrap_or(Color::CurrentColor), style.unwrap_or(BorderStyle::None), width.unwrap_or(BorderSideWidth::Medium)))
} }
% for side, logical in ALL_SIDES: % for side, logical in ALL_SIDES:
@ -297,75 +294,64 @@ pub fn parse_border<'i, 't>(
input: &mut Parser<'i, 't>, input: &mut Parser<'i, 't>,
) -> Result<Longhands, ParseError<'i>> { ) -> Result<Longhands, ParseError<'i>> {
% for name in "outset repeat slice source width".split(): % for name in "outset repeat slice source width".split():
let mut border_image_${name} = border_image_${name}::get_initial_specified_value(); let mut ${name} = border_image_${name}::get_initial_specified_value();
% endfor % endfor
let mut any = false;
let mut parsed_slice = false;
let mut parsed_source = false;
let mut parsed_repeat = false;
loop {
if !parsed_slice {
if let Ok(value) = input.try_parse(|input| border_image_slice::parse(context, input)) {
parsed_slice = true;
any = true;
slice = value;
// Parse border image width and outset, if applicable.
let maybe_width_outset: Result<_, ParseError> = input.try_parse(|input| {
input.expect_delim('/')?;
let result: Result<_, ParseError> = input.try_parse(|input| { // Parse border image width, if applicable.
% for name in "outset repeat slice source width".split(): let w = input.try_parse(|input| border_image_width::parse(context, input)).ok();
let mut ${name} = None;
% endfor // Parse border image outset if applicable.
loop { let o = input.try_parse(|input| {
if slice.is_none() {
if let Ok(value) = input.try_parse(|input| border_image_slice::parse(context, input)) {
slice = Some(value);
// Parse border image width and outset, if applicable.
let maybe_width_outset: Result<_, ParseError> = input.try_parse(|input| {
input.expect_delim('/')?; input.expect_delim('/')?;
border_image_outset::parse(context, input)
// Parse border image width, if applicable. }).ok();
let w = input.try_parse(|input| if w.is_none() && o.is_none() {
border_image_width::parse(context, input)).ok(); return Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError))
}
// Parse border image outset if applicable. Ok((w, o))
let o = input.try_parse(|input| { });
input.expect_delim('/')?; if let Ok((w, o)) = maybe_width_outset {
border_image_outset::parse(context, input) if let Some(w) = w {
}).ok();
if w.is_none() && o.is_none() {
Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError))
}
else {
Ok((w, o))
}
});
if let Ok((w, o)) = maybe_width_outset {
width = w; width = w;
}
if let Some(o) = o {
outset = o; outset = o;
} }
}
continue;
}
}
% for name in "source repeat".split():
if !parsed_${name} {
if let Ok(value) = input.try_parse(|input| border_image_${name}::parse(context, input)) {
${name} = value;
parsed_${name} = true;
any = true;
continue continue
} }
} }
% for name in "source repeat".split():
if ${name}.is_none() {
if let Ok(value) = input.try_parse(|input| border_image_${name}::parse(context, input)) {
${name} = Some(value);
continue
}
}
% endfor
break
}
let mut any = false;
% for name in "outset repeat slice source width".split():
any = any || ${name}.is_some();
% endfor % endfor
if any { break
% for name in "outset repeat slice source width".split(): }
if let Some(b_${name}) = ${name} { if !any {
border_image_${name} = b_${name}; return Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError))
} }
% endfor
Ok(())
} else {
Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError))
}
});
result?;
Ok(expanded! { Ok(expanded! {
% for name in "outset repeat slice source width".split(): % for name in "outset repeat slice source width".split():
border_image_${name}: border_image_${name}, border_image_${name}: ${name},
% endfor % endfor
}) })
} }