Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-20 23:28:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #10627 - bholley:mako_kwargs, r=SimonSapin

Browse source 
Use kwargs in mako to reduce all the parameters

This should keep things more manageable.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10627)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-15 22:39:48 +05:30
commit a96b98f85b
1 changed files with 33 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

100
components/style/properties.mako.rs
View file

@ -51,7 +51,7 @@ def to_camel_case(ident):
class Keyword(object): class Keyword(object):
def __init__(self, name, values, gecko_constant_prefix=None, def __init__(self, name, values, gecko_constant_prefix=None,
extra_gecko_values=None, extra_servo_values=None): extra_gecko_values=None, extra_servo_values=None, **kwargs):
self.name = name self.name = name
self.values = values self.values = values
self.gecko_constant_prefix = gecko_constant_prefix or "NS_STYLE_" + self.name.upper().replace("-", "_") self.gecko_constant_prefix = gecko_constant_prefix or "NS_STYLE_" + self.name.upper().replace("-", "_")
@ -74,7 +74,7 @@ class Keyword(object):
class Longhand(object): class Longhand(object):
def __init__(self, name, derived_from=None, keyword=None, def __init__(self, name, derived_from=None, keyword=None,
custom_cascade=False, experimental=False, internal=False, custom_cascade=False, experimental=False, internal=False,
gecko_ffi_name=None): gecko_ffi_name=None, **kwargs):
self.name = name self.name = name
self.keyword = keyword self.keyword = keyword
self.ident = to_rust_ident(name) self.ident = to_rust_ident(name)
@ -84,10 +84,7 @@ class Longhand(object):
self.custom_cascade = custom_cascade self.custom_cascade = custom_cascade
self.internal = internal self.internal = internal
self.gecko_ffi_name = gecko_ffi_name or "m" + self.camel_case self.gecko_ffi_name = gecko_ffi_name or "m" + self.camel_case
if derived_from is None: self.derived_from = (derived_from or "").split()
self.derived_from = None
else:
self.derived_from = [ to_rust_ident(name) for name in derived_from ]
class Shorthand(object): class Shorthand(object):
def __init__(self, name, sub_properties, experimental=False, internal=False): def __init__(self, name, sub_properties, experimental=False, internal=False):
@ -179,34 +176,25 @@ pub mod longhands {
use parser::ParserContext; use parser::ParserContext;
use values::specified; use values::specified;
<%def name="raw_longhand(name, keyword=None, derived_from=None, products='gecko,servo', <%def name="raw_longhand(name, **kwargs)">
custom_cascade=False, experimental=False, internal=False,
gecko_ffi_name=None)">
<% <%
if not CONFIG['product'] in products: products = kwargs.pop("products", "gecko,servo")
if not CONFIG["product"] in products:
return "" return ""
if derived_from is not None:
derived_from = derived_from.split()
property = Longhand(name, property = Longhand(name, **kwargs)
derived_from=derived_from,
keyword=keyword,
custom_cascade=custom_cascade,
experimental=experimental,
internal=internal,
gecko_ffi_name=gecko_ffi_name)
property.style_struct = THIS_STYLE_STRUCT property.style_struct = THIS_STYLE_STRUCT
THIS_STYLE_STRUCT.longhands.append(property) THIS_STYLE_STRUCT.longhands.append(property)
LONGHANDS.append(property) LONGHANDS.append(property)
LONGHANDS_BY_NAME[name] = property LONGHANDS_BY_NAME[name] = property
if derived_from is not None: for derived in property.derived_from:
for name in derived_from: DERIVED_LONGHANDS.setdefault(derived, []).append(property)
DERIVED_LONGHANDS.setdefault(name, []).append(property)
%> %>
pub mod ${property.ident} { pub mod ${property.ident} {
#![allow(unused_imports)] #![allow(unused_imports)]
% if derived_from is None: % if not property.derived_from:
use cssparser::Parser; use cssparser::Parser;
use parser::ParserContext; use parser::ParserContext;
use properties::{CSSWideKeyword, DeclaredValue, Shorthand}; use properties::{CSSWideKeyword, DeclaredValue, Shorthand};
@ -238,7 +226,7 @@ pub mod longhands {
} }
_ => panic!("entered the wrong cascade_property() implementation"), _ => panic!("entered the wrong cascade_property() implementation"),
}; };
% if property.derived_from is None: % if not property.derived_from:
if seen.get_${property.ident}() { if seen.get_${property.ident}() {
return return
} }
@ -275,7 +263,7 @@ pub mod longhands {
); );
} }
% if custom_cascade: % if property.custom_cascade:
cascade_property_custom(declaration, cascade_property_custom(declaration,
inherited_style, inherited_style,
context, context,
@ -287,7 +275,7 @@ pub mod longhands {
// Do not allow stylesheets to set derived properties. // Do not allow stylesheets to set derived properties.
% endif % endif
} }
% if derived_from is None: % if not property.derived_from:
pub fn parse_declared(context: &ParserContext, input: &mut Parser) pub fn parse_declared(context: &ParserContext, input: &mut Parser)
-> Result<DeclaredValue<SpecifiedValue>, ()> { -> Result<DeclaredValue<SpecifiedValue>, ()> {
match input.try(CSSWideKeyword::parse) { match input.try(CSSWideKeyword::parse) {
@ -322,34 +310,20 @@ pub mod longhands {
} }
</%def> </%def>
<%def name="longhand(name, derived_from=None, keyword=None, products='gecko,servo', <%def name="longhand(name, **kwargs)">
custom_cascade=False, experimental=False, internal=False, <%call expr="raw_longhand(name, **kwargs)">
gecko_ffi_name=None)">
<%self:raw_longhand name="${name}" derived_from="${derived_from}" keyword="${keyword}"
products="${products}" custom_cascade="${custom_cascade}"
experimental="${experimental}" internal="${internal}"
gecko_ffi_name="${gecko_ffi_name}">
${caller.body()} ${caller.body()}
% if derived_from is None: % if not LONGHANDS_BY_NAME[name].derived_from:
pub fn parse_specified(context: &ParserContext, input: &mut Parser) pub fn parse_specified(context: &ParserContext, input: &mut Parser)
-> Result<DeclaredValue<SpecifiedValue>, ()> { -> Result<DeclaredValue<SpecifiedValue>, ()> {
parse(context, input).map(DeclaredValue::Value) parse(context, input).map(DeclaredValue::Value)
} }
% endif % endif
</%self:raw_longhand> </%call>
</%def> </%def>
<%def name="single_keyword_computed(name, values, products='gecko,servo', <%def name="single_keyword_computed(name, values, **kwargs)">
extra_gecko_values=None, extra_servo_values=None, <%call expr="longhand(name, keyword=Keyword(name, values.split(), **kwargs), **kwargs)">
custom_cascade=False, experimental=False, internal=False,
gecko_constant_prefix=None, gecko_ffi_name=None)">
<%self:longhand name="${name}" keyword="${Keyword(name, values.split(),
gecko_constant_prefix=gecko_constant_prefix,
extra_gecko_values=extra_gecko_values,
extra_servo_values=extra_servo_values)}"
products="${products}" custom_cascade="${custom_cascade}"
experimental="${experimental}" internal="${internal}",
gecko_ffi_name="${gecko_ffi_name}">
pub use self::computed_value::T as SpecifiedValue; pub use self::computed_value::T as SpecifiedValue;
${caller.body()} ${caller.body()}
pub mod computed_value { pub mod computed_value {
@ -366,22 +340,14 @@ pub mod longhands {
-> Result<SpecifiedValue, ()> { -> Result<SpecifiedValue, ()> {
computed_value::T::parse(input) computed_value::T::parse(input)
} }
</%self:longhand> </%call>
</%def> </%def>
<%def name="single_keyword(name, values, products='gecko,servo', <%def name="single_keyword(name, values, **kwargs)">
experimental=False, internal=False, <%call expr="single_keyword_computed(name, values, **kwargs)">
gecko_constant_prefix=None, gecko_ffi_name=None)">
<%self:single_keyword_computed name="${name}"
values="${values}"
products="${products}"
experimental="${experimental}"
internal="${internal}",
gecko_constant_prefix="${gecko_constant_prefix}"
gecko_ffi_name="${gecko_ffi_name}">
use values::computed::ComputedValueAsSpecified; use values::computed::ComputedValueAsSpecified;
impl ComputedValueAsSpecified for SpecifiedValue {} impl ComputedValueAsSpecified for SpecifiedValue {}
</%self:single_keyword_computed> </%call>
</%def> </%def>
<%def name="predefined_type(name, type, initial_value, parse_method='parse', products='gecko,servo')"> <%def name="predefined_type(name, type, initial_value, parse_method='parse', products='gecko,servo')">
@ -5803,7 +5769,7 @@ mod property_bit_field {
self.storage[bit / 32] |= 1 << (bit % 32) self.storage[bit / 32] |= 1 << (bit % 32)
} }
% for i, property in enumerate(LONGHANDS): % for i, property in enumerate(LONGHANDS):
% if property.derived_from is None: % if not property.derived_from:
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[inline] #[inline]
pub fn get_${property.ident}(&self) -> bool { pub fn get_${property.ident}(&self) -> bool {
@ -5820,7 +5786,7 @@ mod property_bit_field {
} }
% for property in LONGHANDS: % for property in LONGHANDS:
% if property.derived_from is None: % if not property.derived_from:
#[allow(non_snake_case)] #[allow(non_snake_case)]
fn substitute_variables_${property.ident}<F>( fn substitute_variables_${property.ident}<F>(
value: &DeclaredValue<longhands::${property.ident}::SpecifiedValue>, value: &DeclaredValue<longhands::${property.ident}::SpecifiedValue>,
@ -5991,7 +5957,7 @@ fn deduplicate_property_declarations(declarations: Vec<PropertyDeclaration>)
match declaration { match declaration {
% for property in LONGHANDS: % for property in LONGHANDS:
PropertyDeclaration::${property.camel_case}(..) => { PropertyDeclaration::${property.camel_case}(..) => {
% if property.derived_from is None: % if not property.derived_from:
if seen.get_${property.ident}() { if seen.get_${property.ident}() {
continue continue
} }
@ -6150,7 +6116,7 @@ impl PropertyDeclaration {
match *self { match *self {
% for property in LONGHANDS: % for property in LONGHANDS:
PropertyDeclaration::${property.camel_case}(..) => PropertyDeclaration::${property.camel_case}(..) =>
% if property.derived_from is None: % if not property.derived_from:
PropertyDeclarationName::Longhand("${property.name}"), PropertyDeclarationName::Longhand("${property.name}"),
% else: % else:
PropertyDeclarationName::Internal, PropertyDeclarationName::Internal,
@ -6166,7 +6132,7 @@ impl PropertyDeclaration {
match *self { match *self {
% for property in LONGHANDS: % for property in LONGHANDS:
PropertyDeclaration::${property.camel_case} PropertyDeclaration::${property.camel_case}
% if property.derived_from is None: % if not property.derived_from:
(ref value) => value.to_css_string(), (ref value) => value.to_css_string(),
% else: % else:
(_) => panic!("unsupported property declaration: ${property.name}"), (_) => panic!("unsupported property declaration: ${property.name}"),
@ -6215,7 +6181,7 @@ impl PropertyDeclaration {
match *self { match *self {
% for property in LONGHANDS: % for property in LONGHANDS:
PropertyDeclaration::${property.camel_case}(..) => PropertyDeclaration::${property.camel_case}(..) =>
% if property.derived_from is None: % if not property.derived_from:
name.eq_ignore_ascii_case("${property.name}"), name.eq_ignore_ascii_case("${property.name}"),
% else: % else:
false, false,
@ -6244,7 +6210,7 @@ impl PropertyDeclaration {
} }
match_ignore_ascii_case! { name, match_ignore_ascii_case! { name,
% for property in LONGHANDS: % for property in LONGHANDS:
% if property.derived_from is None: % if not property.derived_from:
"${property.name}" => { "${property.name}" => {
% if property.internal: % if property.internal:
if context.stylesheet_origin != Origin::UserAgent { if context.stylesheet_origin != Origin::UserAgent {
@ -6857,7 +6823,7 @@ fn cascade_with_cached_declarations<C: ComputedValues>(
match *declaration { match *declaration {
% for style_struct in active_style_structs(): % for style_struct in active_style_structs():
% for property in style_struct.longhands: % for property in style_struct.longhands:
% if property.derived_from is None: % if not property.derived_from:
PropertyDeclaration::${property.camel_case}(ref PropertyDeclaration::${property.camel_case}(ref
${'_' if not style_struct.inherited else ''}declared_value) ${'_' if not style_struct.inherited else ''}declared_value)
=> { => {
@ -7363,7 +7329,7 @@ macro_rules! css_properties_accessors {
($macro_name: ident) => { ($macro_name: ident) => {
$macro_name! { $macro_name! {
% for property in SHORTHANDS + LONGHANDS: % for property in SHORTHANDS + LONGHANDS:
% if property.derived_from is None and not property.internal: % if not property.derived_from and not property.internal:
% if '-' in property.name: % if '-' in property.name:
[${property.ident.capitalize()}, Set${property.ident.capitalize()}, "${property.name}"], [${property.ident.capitalize()}, Set${property.ident.capitalize()}, "${property.name}"],
% endif % endif