Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 {% macro encode(field, value) %} | 1 {% macro encode(field, value) %} |
| 2 {% if field.is_bit_field -%} | 2 {% if field.is_bit_field -%} |
| 3 static_cast<unsigned>({{value}}) | 3 static_cast<unsigned>({{value}}) |
| 4 {%- else -%} | 4 {%- else -%} |
| 5 {{value}} | 5 {{value}} |
| 6 {%- endif %} | 6 {%- endif %} |
| 7 {% endmacro %} | 7 {% endmacro %} |
| 8 | 8 |
| 9 {% macro decode(field, value) %} | 9 {% macro decode(field, value) %} |
| 10 {% if field.is_bit_field -%} | 10 {% if field.is_bit_field -%} |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 80 {{subgroup.member_name}} = other.{{subgroup.member_name}}; | 80 {{subgroup.member_name}} = other.{{subgroup.member_name}}; |
| 81 {% elif subgroup.fields|select("in", fields_to_copy)|list|length > 0 -%} | 81 {% elif subgroup.fields|select("in", fields_to_copy)|list|length > 0 -%} |
| 82 {{fieldwise_copy(subgroup, fields_to_copy)}} | 82 {{fieldwise_copy(subgroup, fields_to_copy)}} |
| 83 {% endif %} | 83 {% endif %} |
| 84 {% endfor %} | 84 {% endfor %} |
| 85 {% for field in group.fields|select("in", fields_to_copy) -%} | 85 {% for field in group.fields|select("in", fields_to_copy) -%} |
| 86 {{setter_expression(field)}} = other.{{getter_expression(field)}}; | 86 {{setter_expression(field)}} = other.{{getter_expression(field)}}; |
| 87 {% endfor %} | 87 {% endfor %} |
| 88 {% endmacro %} | 88 {% endmacro %} |
| 89 | 89 |
| 90 {% macro fieldwise_diff(group, fields_to_diff) %} | 90 {% macro fieldwise_diff(groups_to_diff) %} |
|
shend
2017/05/11 05:00:59
Would this be easier if you took in a single group
nainar
2017/05/11 06:00:08
Done.
| |
| 91 {% for subgroup in group.subgroups %} | 91 {% for group in groups_to_diff %} |
| 92 {% if subgroup.all_fields|select("in", fields_to_diff)|list|length > 0 -%} | 92 if ({{group.group_name}}.Get() != other.{{group.group_name}}.Get()) { |
| 93 if ({{subgroup.member_name}}.Get() != other.{{subgroup.member_name}}.Get()) { | 93 {% if group.subgroups %} |
| 94 {{fieldwise_diff(subgroup, fields_to_diff)|indent(2, true)}} | 94 {{fieldwise_diff(group.subgroups)|indent(2, true)}} |
| 95 {% endif %} | |
| 96 {% for expression in group.expressions %} | |
| 97 if ({{expression}} != other.{{expression}}) | |
| 98 return true; | |
| 99 {% endfor %} | |
| 95 } | 100 } |
| 96 {% endif -%} | |
| 97 {% endfor %} | |
| 98 {% for field in group.fields|select("in", fields_to_diff) %} | |
| 99 if ({{getter_expression(field)}} != other.{{getter_expression(field)}}) | |
| 100 return true; | |
| 101 {% endfor %} | 101 {% endfor %} |
| 102 {% endmacro %} | 102 {% endmacro %} |
| OLD | NEW |