From c17ad6d71df77b32a5a43c8585142cb58b23603e Mon Sep 17 00:00:00 2001
From: Dave Beazley <dave-swig@dabeaz.com>
Date: Tue, 15 Aug 2000 21:29:46 +0000
Subject: [PATCH] Bug fixes.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@661 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 SWIG/Source/Swig/stype.c   | 19 ++++++++++++++-----
 SWIG/Source/Swig/typemap.c |  5 +++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/SWIG/Source/Swig/stype.c b/SWIG/Source/Swig/stype.c
index 823ffd7f1..62dd07542 100644
--- a/SWIG/Source/Swig/stype.c
+++ b/SWIG/Source/Swig/stype.c
@@ -597,12 +597,20 @@ void SwigType_array_setdim(SwigType *t, int n, String_or_char *rep) {
  *
  * ----------------------------------------------------------------------------- */
 
+static Hash *default_cache = 0;
+
 SwigType *SwigType_default(SwigType *t) {
   String *r1, *def;
-  String *r = NewString(t);
+  String *r = 0;
 
+  if (!default_cache) default_cache = NewHash();
+  
+  r = Getattr(default_cache,t);
+  if (r) return Copy(r);
+  
+  r = t;
   while ((r1 = SwigType_typedef_resolve(r))) {
-    Delete(r);
+    if (r != t) Delete(r);
     r = r1;
   }
   if (SwigType_ispointer(r)) {
@@ -614,7 +622,8 @@ SwigType *SwigType_default(SwigType *t) {
   } else {
     def = NewString("SWIGTYPE");
   }
-  Delete(r);
+  if (r != t) Delete(r);
+  Setattr(default_cache,t,Copy(def));
   return def;
 }
 
@@ -1037,6 +1046,8 @@ int SwigType_typedef(SwigType *type, String_or_char *name) {
   init_scopes();
   if (Getattr(scopes[scope_level],name)) return -1;
   Setattr(scopes[scope_level],name,type);
+  if (default_cache)
+    Delattr(default_cache,type);
   return 0;
 }
 
@@ -1554,8 +1565,6 @@ SwigType_emit_type_table(File *f_forward, File *f_table) {
       Delete(ckey);
     }
     Delete(el);
-    /*    Printv(types, "{\"", key, "\",0},", 0); */
-    /*    Printv(types, check_equivalent((DataType *)GetVoid(remembered,key)), "};\n", 0);*/
     Printf(types,"{0,0}};\n");
     Printv(table, "_swigt_", key, ", \n", 0);
     key = Nextkey(r_mangled);
diff --git a/SWIG/Source/Swig/typemap.c b/SWIG/Source/Swig/typemap.c
index 1b73278ff..3c9ac1be7 100644
--- a/SWIG/Source/Swig/typemap.c
+++ b/SWIG/Source/Swig/typemap.c
@@ -416,6 +416,11 @@ char *Swig_typemap_lookup(char *op, SwigType *type, String_or_char *pname, Strin
   Replace(s,"$source",source,DOH_REPLACE_ANY);
   Replace(s,"$target",target,DOH_REPLACE_ANY);
   Replace(s,"$type",SwigType_str(type,0),DOH_REPLACE_ANY);
+  {
+    SwigType *ltype = SwigType_ltype(type);
+    Replace(s,"$ltype",SwigType_str(ltype,0), DOH_REPLACE_ANY);
+    Delete(ltype);
+  }
   Replace(s,"$parmname",pname, DOH_REPLACE_ANY);
 
   /* Print base type (without any pointers) */