X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=idlcomp%2Fidlc.h;h=a4ca39ab0f7ebd7fa12faa4051006dc55d994843;hp=84c28aee61f4126a43eaa04f790ae4eef393108a;hb=eec2efc14a0d624d475dc89e2bcb962e7c081df5;hpb=77bf9a95a836b14a243953e1fbd28c7c1106c59a

diff --git a/idlcomp/idlc.h b/idlcomp/idlc.h
index 84c28ae..a4ca39a 100644
--- a/idlcomp/idlc.h
+++ b/idlcomp/idlc.h
@@ -43,7 +43,7 @@ using std::vector;
 int yylex();
 int idl_lex();
 #define cdl_lex idl_lex
-void idl_error(char *s);
+void idl_error(const char *s);
 
 #define cdl_error idl_error
 
@@ -447,6 +447,8 @@ typedef Ref<IDList> IDListRef;
 class NameSpace;
 class LangCallback;
 
+typedef Ref<NameSpace> NameSpaceRef;
+
 // This is incremented when a chain of symbols is traversed to reset
 // detection of already-visited symbols.  It is assumed that this
 // will not have to happen billions of times.
@@ -456,6 +458,14 @@ extern int traversal;
 class Symbol : public RefCountable<Symbol> {
 	NameSpace *ns;
 	
+	void init()
+	{
+		ns = NULL;
+		external = false;
+		priv = false;
+		lang_priv = NULL;
+	}
+	
 public:
 	StringRef name;
 
@@ -470,31 +480,17 @@ public:
 	
 	bool priv;
 	
-	// This is set to ::traversal when this symbol is visited along a chain.
-	// If a target needs more than 8 simultaneous chains, increase the size
-	// of the array.  These traversals are reserved for language binding use.
-	
-	int traversed[8];
+	// Reserved for language binding use.
+	Releasable *lang_priv;
 
 	Symbol()
 	{
-		ns = NULL;
-		external = false;
-		priv = false;
-		
-		memset(traversed, 0, sizeof(traversed));
+		init();
 	}
 	
 	Symbol(const String *_name) : name(_name)
 	{
-		if (_name)
-			name->retain();
-
-		ns = NULL;
-		external = false;
-		priv = false;
-
-		memset(traversed, 0, sizeof(traversed));
+		init();
 	}
 
 	virtual ~Symbol();
@@ -588,8 +584,6 @@ struct InvalidArgument {
 struct UserError {
 };
 
-typedef Ref<NameSpace> NameSpaceRef;
-
 class NameSpace : public virtual Symbol {
 protected:
 	// Filesystem path to the external symbol storage, or NULL
@@ -620,23 +614,15 @@ protected:
 	list<NameSpaceRef> imports;
 
 public:
-	// This is set in the destructor, so the contents of the namespace
-	// don't try to remove themselves from the namespace when destructed
-	// due to the destruction of map.
-	int dying;
-	
 	// This is a counter for generating unique names for anonymous
 	// members of the namespace.
 	int anon;
 	
- 	NameSpace() : dying(0), anon(0)
+ 	NameSpace() : anon(0)
 	{
 	}
 	
-	virtual ~NameSpace()
-	{
-		dying = 1;
-	}
+	virtual ~NameSpace();
 	
 	// Return a description of the type of namespace, for
 	// error messages.
@@ -707,13 +693,12 @@ public:
 	// SymbolNotFound is thrown if sym is not in this namespace.
 	virtual void del(Symbol *sym)
 	{
-		fprintf(stderr, "Removing symbol %s\n",
-		        sym->get_fq_name()->flatten()->c_str());
-	
-		if (tbl.erase(sym->name) == 0)
+		if (sym->ns != this)
 			throw SymbolNotFound();
-		
+
 		sym->ns = NULL;
+		int ret = tbl.erase(sym->name);
+		assert(ret != 0);
 	}
 
 private:	
@@ -1283,7 +1268,7 @@ public:
 
 class Struct;
 typedef Ref<Struct> StructRef;
-extern Struct *System_VStruct;
+extern StructRef System_VStruct;
 
 // FIXME: typedefed superstructs
 class Struct : public NameSpace, public Type, public Def {
@@ -1292,6 +1277,9 @@ class Struct : public NameSpace, public Type, public Def {
 	SymbolRef supersym;
 	StrListRef supername;
 	bool attrs_resolved;
+
+	// 0 = unknown, 1 = yes, 2 = no
+	int plain_data;
 	
 	void add_elem(Datum *d);
 
@@ -1465,6 +1453,10 @@ public:
 		def.guid[0] = guid[0];
 		def.guid[1] = guid[1];
 	}
+
+	// A struct is "plain data" if it contains no object references,
+	// no non-inline arrays or structs, and no inline non-plain structs.
+ 	bool is_plain_data();
 };
 
 class Param : public Symbol, public Def {
@@ -1647,7 +1639,7 @@ typedef Ref<Method> MethodRef;
 class Interface;
 typedef Ref<Interface> InterfaceRef;
 
-extern Interface *System_Object;
+extern InterfaceRef System_Object;
 
 // FIXME: typedefed superinterfaces
 class Interface : public NameSpace, public Type, public Def {