OLD | NEW |
1 {% from 'fields/field.tmpl' import encode, decode, const_ref, nonconst_ref %} | 1 {% from 'fields/field.tmpl' import encode, decode, const_ref, nonconst_ref, gett
er_expression, setter_expression %} |
2 | 2 |
3 {% macro decl_initial_method(field) -%} | 3 {% macro decl_initial_method(field) -%} |
4 inline static {{field.type_name}} {{field.initial_method_name}}() { | 4 inline static {{field.type_name}} {{field.initial_method_name}}() { |
5 return {{field.default_value}}; | 5 return {{field.default_value}}; |
6 } | 6 } |
7 {%- endmacro %} | 7 {%- endmacro %} |
8 | 8 |
9 {% macro decl_getter_method(field) -%} | 9 {% macro decl_getter_method(field) -%} |
10 {{const_ref(field)}} {{field.getter_method_name}}() const { | 10 {{const_ref(field)}} {{field.getter_method_name}}() const { |
11 return {{decode(field, field.name)}}; | 11 return {{decode(field, getter_expression(field))}}; |
12 } | 12 } |
13 {%- endmacro %} | 13 {%- endmacro %} |
14 | 14 |
15 {% macro decl_setter_method(field) -%} | 15 {% macro decl_setter_method(field) -%} |
16 void {{field.setter_method_name}}({{const_ref(field)}} v) { | 16 void {{field.setter_method_name}}({{const_ref(field)}} v) { |
17 {{field.name}} = {{encode(field, "v")}}; | 17 {{setter_expression(field)}} = {{encode(field, "v")}}; |
18 } | 18 } |
19 {%- endmacro %} | 19 {%- endmacro %} |
20 | 20 |
21 {% macro decl_resetter_method(field) -%} | 21 {% macro decl_resetter_method(field) -%} |
22 inline void {{field.resetter_method_name}}() { | 22 inline void {{field.resetter_method_name}}() { |
23 {{field.name}} = {{encode(field, field.default_value)}}; | 23 {{setter_expression(field)}} = {{encode(field, field.default_value)}}; |
24 } | 24 } |
25 {%- endmacro %} | 25 {%- endmacro %} |
26 | 26 |
27 {% macro decl_mutable_method(field) -%} | 27 {% macro decl_mutable_method(field) -%} |
28 {{nonconst_ref(field)}} {{field.mutable_method_name}}() const { | 28 {{nonconst_ref(field)}} {{field.mutable_method_name}}() const { |
29 return {{decode(field, field.name)}}; | 29 return {{decode(field, getter_expression(field))}}; |
30 } | 30 } |
31 {%- endmacro %} | 31 {%- endmacro %} |
32 | 32 |
33 {% macro decl_internal_getter_method(field) -%} | 33 {% macro decl_internal_getter_method(field) -%} |
34 {{const_ref(field)}} {{field.internal_getter_method_name}}() const { | 34 {{const_ref(field)}} {{field.internal_getter_method_name}}() const { |
35 return {{decode(field, field.name)}}; | 35 return {{decode(field, getter_expression(field))}}; |
36 } | 36 } |
37 {%- endmacro %} | 37 {%- endmacro %} |
38 | 38 |
39 {% macro decl_internal_setter_method(field) -%} | 39 {% macro decl_internal_setter_method(field) -%} |
40 void {{field.internal_setter_method_name}}({{const_ref(field)}} v) { | 40 void {{field.internal_setter_method_name}}({{const_ref(field)}} v) { |
41 {{field.name}} = {{encode(field, "v")}}; | 41 {{setter_expression(field)}} = {{encode(field, "v")}}; |
42 } | 42 } |
43 {%- endmacro %} | 43 {%- endmacro %} |
OLD | NEW |