Templates: Update x.type to x.datatype

This is to match the variable name in the code now.  It might be
necessary to do another update of templates in combination with the next
iteration of the parser, a.k.a. "data driven" parser.

templates/sds-bamm-macros.tpl

@@ -86,8 +86,6 @@
      {% else -%}
      {% if member.datatype and not member.datatype.endswith("_t") %}
      bamm:dataType {{ _render_datatype(member.datatype) }} .
-     {% elif member.type and not member.type.endswith("_t") %}
-     bamm:dataType {{ _render_datatype(member.type) }} .
      {% else %}
      bamm:dataType {{ _render_characteristic_type(member) }} .
      {% endif %}
@@ -113,7 +111,7 @@ a bamm-c:RangeConstraint ;
 {% endmacro -%}
 
 {% macro _render_characteristic_definition(member) %}
-{% set type = member.type if member.type else member.datatype -%}
+{% set type = member.datatype -%}
 {% if member.datatype and (member.min or member.max) %}
     {{- "bamm-c:Trait" -}}
 {% elif type.endswith("[]") %}
@@ -176,18 +174,12 @@ a bamm-c:RangeConstraint ;
 {{ member.name }}
 {%- elif member.datatype and member.datatype.endswith("_t") -%}
 Characteristic{{ snake_to_camel(member.datatype.capitalize()) }}
-{%- elif member.type and member.type.endswith("_t") -%}
-Characteristic{{ snake_to_camel(member.type.capitalize()) }}
 {%- else -%}
 Characteristic{{ snake_to_camel(member.name.capitalize()) }}
 {%- endif -%}
 {%- endmacro -%}
 
 {# Render characteristic datatype #}
 {%- macro _render_characteristic_type(member) -%}
-{%- if member.datatype -%}
 :{{ snake_to_camel(member.datatype.capitalize()) }}
-{%- else -%}
-:{{ snake_to_camel(member.type.capitalize()) }}
-{%- endif -%}
-{%- endmacro -%}
+{%- endmacro -%}

templates/simple_overview.tpl

@@ -11,7 +11,7 @@ Header
          Struct: {{ x.name }}
          -> {{ x.description }}
          {% for x in x.members %}
-            member: {{ x.name }} (of type {{x.type}}) 
+            member: {{ x.name }} (of type {{x.datatype}}) 
          {% endfor %}
       {% endfor %}
       {% for x in n.typedefs %}
@@ -32,24 +32,23 @@ Header
          Method: {{ x.name }}
          -> {{ x.description }}
          {% for x in x.in_arguments %}
-            in: {{ x.name }} (of type {{x.type}}) 
+            in: {{ x.name }} (of type {{x.datatype}}) 
          {% endfor %}
          {% for x in x.out_arguments %}
-            out: {{ x.name }} (of type {{x.type}}) 
+            out: {{ x.name }} (of type {{x.datatype}}) 
          {% endfor %}
       {% endfor %}
       {% for x in n.events %}
          Event: {{ x.name }}
          -> {{ x.description }}
          {% for x in x.in_arguments %}
-            in: {{ x.name }} (of type {{x.type}}) 
+            in: {{ x.name }} (of type {{x.datatype}}) 
          {% endfor %}
       {% endfor %}
       {% for x in n.properties %}
          Property: {{ x.name }}
          -> {{ x.description }}
-         -> Type: {{ x.type }}
-         -> Datatype: {{ x.datatype }}
+         -> Type: {{ x.datatype }}
       {% endfor %}
    {% endfor %}
 {% endfor %}