Merge pull request #1568 from WalterBright/b40

refactor type_enum
dlang · Jan 28, 2013 · d219ea1 · d219ea1
2 parents 1658755 + 54946b4
commit d219ea1
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/src/backend/type.c b/src/backend/type.c
@@ -445,6 +445,30 @@ type *type_function(tym_t tyf, type **ptypes, size_t nparams, bool variadic, typ
     return t;
 }
 
+/***************************************
+ * Create an enum type.
+ * Input:
+ *      name    name of enum
+ *      tbase   "base" type of enum
+ * Returns:
+ *      Tcount already incremented
+ */
+type *type_enum(const char *name, type *tbase)
+{
+    Symbol *s = symbol_calloc(name);
+    s->Sclass = SCenum;
+    s->Senum = (enum_t *) MEM_PH_CALLOC(sizeof(enum_t));
+    s->Senum->SEflags |= SENforward;        // forward reference
+    slist_add(s);
+
+    type *t = type_allocn(TYenum, tbase);
+    t->Ttag = (Classsym *)s;            // enum tag name
+    t->Tcount++;
+    s->Stype = t;
+    t->Tcount++;
+    return t;
+}
+
 /*****************************
  * Free up data type.
  */

diff --git a/src/backend/type.h b/src/backend/type.h
@@ -210,6 +210,7 @@ type *type_static_array(unsigned long long dim, type *tnext);
 type *type_assoc_array(type *tkey, type *tvalue);
 type *type_delegate(type *tnext);
 type *type_function(tym_t tyf, type **ptypes, size_t nparams, bool variadic, type *tret);
+type *type_enum(const char *name, type *tbase);
 
 
 #endif
diff --git a/src/toctype.c b/src/toctype.c
@@ -265,19 +265,7 @@ type *TypeEnum::toCtype()
     }
     else if (sym->memtype->toBasetype()->ty == Tint32)
     {
-        Symbol *s = symbol_calloc(sym->toPrettyChars());
-        s->Sclass = SCenum;
-        s->Senum = (enum_t *) MEM_PH_CALLOC(sizeof(enum_t));
-        s->Senum->SEflags |= SENforward;        // forward reference
-        slist_add(s);
-
-        t = type_alloc(TYenum);
-        t->Ttag = (Classsym *)s;            // enum tag name
-        t->Tcount++;
-        t->Tnext = sym->memtype->toCtype();
-        t->Tnext->Tcount++;
-        s->Stype = t;
-        slist_add(s);
+        t = type_enum(sym->toPrettyChars(), sym->memtype->toCtype());
         tm->ctype = t;
         ctype = t;
     }