X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=idlcomp%2Fnamespace.cc;h=a2fe015b0ffad9cf59b32a8dc2044c47d35147b4;hp=8929f82f4c9677702c34328d1839274f3b94a4fa;hb=eec2efc14a0d624d475dc89e2bcb962e7c081df5;hpb=7da27a216a7f4bb3331fe315cdbec69bfcf2c762

diff --git a/idlcomp/namespace.cc b/idlcomp/namespace.cc
index 8929f82..a2fe015 100644
--- a/idlcomp/namespace.cc
+++ b/idlcomp/namespace.cc
@@ -1,7 +1,16 @@
-/* namespace.cc -- Code to maintain and search namespaces
- *
- * Written by Scott Wood <scott@buserror.net>
- */
+// Code to maintain and search namespaces
+//
+// This software is copyright (c) 2006 Scott Wood <scott@buserror.net>.
+// 
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors or contributors be held liable for any damages
+// arising from the use of this software.
+// 
+// Permission is hereby granted to everyone, free of charge, to use, copy,
+// modify, prepare derivative works of, publish, distribute, perform,
+// sublicense, and/or sell copies of the Software, provided that the above
+// copyright notice and disclaimer of warranty be included in all copies or
+// substantial portions of this software.
 
 #include <idlc.h>
 #include <parser.h>
@@ -264,7 +273,10 @@ void NameSpace::add_import(Symbol *sym, const char *filename)
 
 Symbol::~Symbol()
 {
-	if (ns && !ns->dying) {
+	if (lang_priv)
+		lang_priv->release();
+
+	if (ns) {
 		try {
 			ns->del(this);
 		}
@@ -275,6 +287,29 @@ Symbol::~Symbol()
 	}
 }
 
+NameSpace::~NameSpace()
+{
+	tbl_type::iterator i = tbl.begin();
+	while (i != tbl.end()) {
+		Symbol *sym = (*i).second;
+		++i;
+		
+		try {
+			del(sym);
+		}
+
+		catch (SymbolNotFound) {
+			fprintf(stderr, "SymbolNotFound in NameSpace::~NameSpace(), cannot propagate\n");
+		}
+
+		catch (InternalError &e) {
+			fprintf(stderr, "InternalError %s:%d in NameSpace::~NameSpace(), cannot propagate\n", e.file, e.line);
+		}
+	}
+	
+	assert(tbl.empty());
+}
+
 StrList *Symbol::get_fq_name(const char *append, bool not_last) const
 {
 	StrList *ret;