From 35fe42358429770a4a305dff991b8090736e4957 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Thu, 5 Nov 2015 23:55:20 +0000
Subject: extend IR to have a separate map for attribute types

---
 src/ir.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++-----------------
 src/ir.h |  13 ++++++--
 2 files changed, 92 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/ir.c b/src/ir.c
index 566ac17..8084c40 100644
--- a/src/ir.c
+++ b/src/ir.c
@@ -427,6 +427,84 @@ get_extended_value(struct webidl_node *node, const char *key)
         return NULL;
 }
 
+
+/**
+ * Create IR entry for a type
+ */
+static int
+type_map_new(struct webidl_node *node,
+             int *typec_out,
+             struct ir_type_entry **typev_out)
+{
+        int typec;
+        struct webidl_node *type_node;
+        struct ir_type_entry *typev;
+        struct ir_type_entry *cure;
+
+        typec = webidl_node_enumerate_type(
+                            webidl_node_getnode(node),
+                            WEBIDL_NODE_TYPE_TYPE);
+        if (typec == 0) {
+                *typec_out = 0;
+                *typev_out = NULL;
+                return 0;
+        }
+
+        typev = calloc(typec, sizeof(*typev));
+        cure = typev;
+
+        type_node = webidl_node_find_type(webidl_node_getnode(node),
+                                          NULL,
+                                          WEBIDL_NODE_TYPE_TYPE);
+
+        while (type_node != NULL) {
+                enum webidl_type *base;
+                enum webidl_type_modifier *modifier;
+
+                /* type base */
+                base = (enum webidl_type *)webidl_node_getint(
+                        webidl_node_find_type(
+                                webidl_node_getnode(type_node),
+                                NULL,
+                                WEBIDL_NODE_TYPE_TYPE_BASE));
+                if (base != NULL) {
+                        cure->base = *base;
+                }
+
+                /* type modifier */
+                modifier = (enum webidl_type_modifier *)webidl_node_getint(
+                        webidl_node_find_type(
+                                webidl_node_getnode(type_node),
+                                NULL,
+                                WEBIDL_NODE_TYPE_MODIFIER));
+                if (modifier != NULL) {
+                        cure->modifier = *modifier;
+                } else {
+                        cure->modifier = WEBIDL_TYPE_MODIFIER_NONE;
+                }
+
+                /* type name */
+                cure->name = webidl_node_gettext(
+                        webidl_node_find_type(
+                                webidl_node_getnode(type_node),
+                                NULL,
+                                WEBIDL_NODE_TYPE_IDENT));
+
+                /* next entry */
+                cure++;
+
+                type_node = webidl_node_find_type(
+                        webidl_node_getnode(node),
+                        type_node,
+                        WEBIDL_NODE_TYPE_TYPE);
+        }
+
+        *typec_out = typec;
+        *typev_out = typev;
+
+        return 0;
+}
+
 /**
  * Create a new ir entry for an attribute
  */
@@ -472,13 +550,10 @@ attribute_map_new(struct webidl_node *interface,
                         WEBIDL_NODE_TYPE_ATTRIBUTE);
 
                 while (at_node != NULL) {
-                        struct webidl_node *type_node; /* type of attribute */
-                        enum webidl_type *type_base;
+                        /* process attribute node into an entry */
 
                         enum webidl_type_modifier *modifier;
 
-                        /* process attribute node into an entry */
-
                         cure->node = at_node;
 
                         cure->name = webidl_node_gettext(
@@ -493,32 +568,8 @@ attribute_map_new(struct webidl_node *interface,
                                                GENBIND_METHOD_TYPE_GETTER,
                                                cure->name);
 
-                        /* find attributes first base type */
-                        type_node = webidl_node_find_type(
-                                webidl_node_getnode(at_node),
-                                NULL,
-                                WEBIDL_NODE_TYPE_TYPE);
-                        type_base = (enum webidl_type *)webidl_node_getint(
-                                webidl_node_find_type(
-                                        webidl_node_getnode(type_node),
-                                        NULL,
-                                        WEBIDL_NODE_TYPE_TYPE_BASE));
-                        if (type_base != NULL) {
-                                enum webidl_type_modifier *type_modifier;
-
-                                cure->base_type = *type_base;
-
-                                type_modifier = (enum webidl_type_modifier *)webidl_node_getint(
-                                        webidl_node_find_type(
-                                                webidl_node_getnode(type_node),
-                                                NULL,
-                                                WEBIDL_NODE_TYPE_MODIFIER));
-                                if (type_modifier != NULL) {
-                                        cure->type_modifier = *type_modifier;
-                                } else {
-                                        cure->type_modifier = WEBIDL_TYPE_MODIFIER_NONE;
-                                }
-                        }
+                        /* create attribute type vector */
+                        type_map_new(at_node, &cure->typec, &cure->typev);
 
 
                         /* get binding node for read/write attributes */
diff --git a/src/ir.h b/src/ir.h
index 87c72c3..d3dd5d0 100644
--- a/src/ir.h
+++ b/src/ir.h
@@ -47,6 +47,15 @@ struct ir_operation_entry {
         struct ir_operation_overload_entry *overloadv;
 };
 
+/**
+ * ir entry for type of attributes or arguments.
+ */
+struct ir_type_entry {
+        enum webidl_type base; /**< base of the type (long, short, user etc.) */
+        enum webidl_type_modifier modifier; /**< modifier for the type */
+        const char *name; /**< name of type for user types */
+};
+
 /**
  * ir entry for attributes on an interface
  */
@@ -54,8 +63,8 @@ struct ir_attribute_entry {
         const char *name; /**< attribute name */
         struct webidl_node *node; /**< AST attribute node */
 
-        enum webidl_type base_type; /**< type of attribute */
-        enum webidl_type_modifier type_modifier; /**< modifier for the type */
+        int typec; /**< number of types for attribute  */
+        struct ir_type_entry *typev; /**< types on attribute */
 
         enum webidl_type_modifier modifier; /**< modifier for the attribute intself */
         const char *putforwards; /**< putforwards attribute */
-- 
cgit v1.2.3