scripts: Fix some whitespace nits.

[libfirm] / scripts / gen_ir.py

diff --git a/scripts/gen_ir.py b/scripts/gen_ir.py
index 27788f4..90309ba 100755 (executable)
--- a/scripts/gen_ir.py
+++ b/scripts/gen_ir.py
@@ -278,14 +278,10 @@ ir_node *new_rd_{{node.name}}(
                {{node|nodeparameters}}
        {% endfilter %})
 {
-       ir_node *res;
-       {%- if node.arity == "dynamic" %}
-       int      i;
-       {%- endif %}
        {{node|irgassign}}
        {{node|insdecl}}
 
-       res = new_ir_node(
+       ir_node *res = new_ir_node(
                {%- filter arguments %}
                        dbgi
                        irg
@@ -295,7 +291,7 @@ ir_node *new_rd_{{node.name}}(
                        {{node|arity_and_ins}}
                {% endfilter %});
        {%- if node.arity == "dynamic" %}
-       for (i = 0; i < arity; ++i) {
+       for (int i = 0; i < arity; ++i) {
                add_irn_n(res, in[i]);
        }
        {%- endif %}
@@ -335,9 +331,8 @@ ir_node *new_d_{{node.name}}(
                        {{node|nodeparameters}}
                {% endfilter %})
 {
-       ir_node *res;
        assert(irg_is_constrained(current_ir_graph, IR_GRAPH_CONSTRAINT_CONSTRUCTION));
-       res = new_rd_{{node.name}}(
+       ir_node *res = new_rd_{{node.name}}(
                {%- filter parameters %}
                        dbgi
                        {{node|curblock}}
@@ -364,18 +359,51 @@ ir_node *new_{{node.name}}(
 irnode_h_template = env.from_string(
 '''/* Warning: automatically generated code */
 
-{%- for node in nodes|isnot('custom_is') %}
+{% for node in nodes %}
+#define is_{{node.name}}(node) is_{{node.name}}_(node)
+{%- for attr in node.attrs|hasnot("noprop") %}
+#define get_{{node.name}}_{{attr.name}}(node) get_{{node.name}}_{{attr.name}}_(node)
+#define set_{{node.name}}_{{attr.name}}(node, {{attr.name}}) set_{{node.name}}_{{attr.name}}_(node, {{attr.name}})
+{%- endfor -%}
+{%- for input in node.ins %}
+#define get_{{node.name}}_{{input[0]}}(node) get_{{node.name}}_{{input[0]}}_(node)
+#define set_{{node.name}}_{{input[0]}}(node, {{input[0]|escape_keywords}}) set_{{node.name}}_{{input[0]}}_(node, {{input[0]|escape_keywords}})
+{% endfor %}
+{%- endfor %}
+
+{%- for node in nodes %}
 static inline int is_{{node.name}}_(const ir_node *node)
 {
-       assert(node != NULL);
-       return get_irn_op_(node) == op_{{node.name}};
+       return get_irn_op(node) == op_{{node.name}};
+}
+{%  for attr in node.attrs|hasnot("noprop") %}
+static inline {{attr.type}} get_{{node.name}}_{{attr.name}}_(const ir_node *node)
+{
+       assert(is_{{node.name}}(node));
+       return node->attr.{{node.attrs_name}}.{{attr.name}};
 }
-{%- endfor -%}
 
-{% for node in nodes %}
-#define is_{{node.name}}(node)    is_{{node.name}}_(node)
-{%- endfor %}
+static inline void set_{{node.name}}_{{attr.name}}_(ir_node *node, {{attr.type}} {{attr.name}})
+{
+       assert(is_{{node.name}}(node));
+       node->attr.{{node.attrs_name}}.{{attr.name}} = {{attr.name}};
+}
+{% endfor -%}
 
+{%- for input in node.ins %}
+static inline ir_node *get_{{node.name}}_{{input[0]}}_(const ir_node *node)
+{
+       assert(is_{{node.name}}(node));
+       return get_irn_n(node, n_{{node.name}}_{{input[0]}});
+}
+
+static inline void set_{{node.name}}_{{input[0]}}_(ir_node *node, ir_node *{{input[0]|escape_keywords}})
+{
+       assert(is_{{node.name}}(node));
+       set_irn_n(node, n_{{node.name}}_{{input[0]}}, {{input[0]|escape_keywords}});
+}
+{% endfor %}
+{% endfor -%}
 ''')
 
 irnode_template = env.from_string(
@@ -385,36 +413,26 @@ int (is_{{node.name}})(const ir_node *node)
 {
        return is_{{node.name}}_(node);
 }
-{% endfor %}
-
-{%- for node in nodes %}
-{%- for attr in node.attrs|hasnot("noprop") %}
+{%  for attr in node.attrs|hasnot("noprop") %}
 {{attr.type}} (get_{{node.name}}_{{attr.name}})(const ir_node *node)
 {
-       assert(is_{{node.name}}(node));
-       return node->attr.{{node.attrs_name}}.{{attr.name}};
+       return get_{{node.name}}_{{attr.name}}_(node);
 }
 
 void (set_{{node.name}}_{{attr.name}})(ir_node *node, {{attr.type}} {{attr.name}})
 {
-       assert(is_{{node.name}}(node));
-       node->attr.{{node.attrs_name}}.{{attr.name}} = {{attr.name}};
+       set_{{node.name}}_{{attr.name}}_(node, {{attr.name}});
 }
 {% endfor -%}
-{% endfor -%}
-
-{%- for node in nodes %}
 {%- for input in node.ins %}
 ir_node *(get_{{node.name}}_{{input[0]}})(const ir_node *node)
 {
-       assert(is_{{node.name}}(node));
-       return get_irn_n(node, n_{{node.name}}_{{input[0]}});
+       return get_{{node.name}}_{{input[0]}}(node);
 }
 
 void (set_{{node.name}}_{{input[0]}})(ir_node *node, ir_node *{{input[0]|escape_keywords}})
 {
-       assert(is_{{node.name}}(node));
-       set_irn_n(node, n_{{node.name}}_{{input[0]}}, {{input[0]|escape_keywords}});
+       set_{{node.name}}_{{input[0]}}_(node, {{input[0]|escape_keywords}});
 }
 {% endfor %}
 {% endfor %}
@@ -439,6 +457,7 @@ static const proj_lookup_t proj_lut[] = {
        {%- endif %}
        {%- endfor %}
 };
+
 ''')
 
 irop_template = env.from_string(
@@ -510,7 +529,7 @@ typedef enum {
        {%- endfor %}
        n_{{node.name}}_max = n_{{node.name}}_{{node.ins[-1][0]}}
 } n_{{node.name}};
-{% endif %}
+{% endif -%}
 {% if node.outs %}
 /**
  * Projection numbers for result of {{node.name}} node (use for Proj nodes)
@@ -572,6 +591,7 @@ FIRM_API ir_node *new_{{node.name}}(
                {{node|nodeparameters}}
        {% endfilter %});
 {%- endif %}
+
 /**
  * Test if node is a {{node.name}}
  * @returns 1 if the node is a {{node.name}} node, 0 otherwise