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

Handle enum classes for clonable properties.

Browse source
This commit is contained in:
Bobby Holley 2016-08-10 11:58:53 -07:00
parent 7afe037625
commit 1cd76c2917
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/style/properties/data.py
View file

@ -58,6 +58,9 @@ class Keyword(object):
def needs_cast(self): def needs_cast(self):
return self.gecko_enum_prefix is None return self.gecko_enum_prefix is None
def maybe_cast(self, type_str):
return "as " + type_str if self.needs_cast() else ""
class Longhand(object): class Longhand(object):
def __init__(self, style_struct, name, animatable=None, derived_from=None, keyword=None, def __init__(self, style_struct, name, animatable=None, derived_from=None, keyword=None,

10
components/style/properties/gecko.mako.rs
View file

@ -220,11 +220,7 @@ def set_gecko_property(ffi_name, expr):
// FIXME(bholley): Align binary representations and ditch |match| for cast + static_asserts // FIXME(bholley): Align binary representations and ditch |match| for cast + static_asserts
let result = match v { let result = match v {
% for value in keyword.values_for('gecko'): % for value in keyword.values_for('gecko'):
% if keyword.needs_cast(): Keyword::${to_rust_ident(value)} => structs::${keyword.gecko_constant(value)} ${keyword.maybe_cast("u8")},
Keyword::${to_rust_ident(value)} => structs::${keyword.gecko_constant(value)} as u8,
% else:
Keyword::${to_rust_ident(value)} => structs::${keyword.gecko_constant(value)},
% endif
% endfor % endfor
}; };
${set_gecko_property(gecko_ffi_name, "result")} ${set_gecko_property(gecko_ffi_name, "result")}
@ -236,11 +232,11 @@ def set_gecko_property(ffi_name, expr):
pub fn clone_${ident}(&self) -> longhands::${ident}::computed_value::T { pub fn clone_${ident}(&self) -> longhands::${ident}::computed_value::T {
use properties::longhands::${ident}::computed_value::T as Keyword; use properties::longhands::${ident}::computed_value::T as Keyword;
// FIXME(bholley): Align binary representations and ditch |match| for cast + static_asserts // FIXME(bholley): Align binary representations and ditch |match| for cast + static_asserts
match ${get_gecko_property(gecko_ffi_name)} as u32 { match ${get_gecko_property(gecko_ffi_name)} ${keyword.maybe_cast("u32")} {
% for value in keyword.values_for('gecko'): % for value in keyword.values_for('gecko'):
structs::${keyword.gecko_constant(value)} => Keyword::${to_rust_ident(value)}, structs::${keyword.gecko_constant(value)} => Keyword::${to_rust_ident(value)},
% endfor % endfor
x => panic!("Found unexpected value in style struct for ${ident} property: {}", x), x => panic!("Found unexpected value in style struct for ${ident} property: {:?}", x),
} }
} }
</%def> </%def>