Rob Shearman : widl: Factor out the finding of a registered type to reduce code duplication.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 50e54c0c1539dd1adc37805ec618909cea7e94cc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=50e54c0c1539dd1adc37805ec6...

Author: Rob Shearman 
Date:   Mon Jun 23 22:27:53 2008 +0100

widl: Factor out the finding of a registered type to reduce code duplication.

---

tools/widl/parser.y |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/tools/widl/parser.y b/tools/widl/parser.y
index 6846368..ba909bc 100644
--- a/tools/widl/parser.y
+++ b/tools/widl/parser.y
@@ -1900,16 +1900,22 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at
   return type;
 }

-type_t *find_type(const char *name, int t)
+static type_t *find_type_helper(const char *name, int t)
 {
   struct rtype *cur = type_hash[hash_ident(name)];
   while (cur && (cur->t != t || strcmp(cur->name, name)))
     cur = cur->next;
-  if (!cur) {
+  return cur ? cur->type : NULL;
+}
+
+type_t *find_type(const char *name, int t)
+{
+  type_t *type = find_type_helper(name, t);
+  if (!type) {
     error_loc("type '%s' not found\n", name);
     return NULL;
   }
-  return cur->type;
+  return type;
 }

static type_t *find_type2(char *name, int t)
@@ -1921,25 +1927,18 @@ static type_t *find_type2(char *name, int t)

int is_type(const char *name)
 {
-  struct rtype *cur = type_hash[hash_ident(name)];
-  while (cur && (cur->t || strcmp(cur->name, name)))
-    cur = cur->next;
-  if (cur) return TRUE;
-  return FALSE;
+  return find_type_helper(name, 0) != NULL;
 }

static type_t *get_type(unsigned char type, char *name, int t)
 {
-  struct rtype *cur = NULL;
   type_t *tp;
   if (name) {
-    cur = type_hash[hash_ident(name)];
-    while (cur && (cur->t != t || strcmp(cur->name, name)))
-      cur = cur->next;
-  }
-  if (cur) {
-    free(name);
-    return cur->type;
+    tp = find_type_helper(name, t);
+    if (tp) {
+      free(name);
+      return tp;
+    }
   }
   tp = make_type(type, NULL);
   tp->name = name;