decls = new Hashtable ();
}
- DoubleHash decl_ns_name = new DoubleHash ();
-
- public void RecordDecl (string name, DeclSpace ds)
+ public void RecordDecl (Namespace ns, MemberName name, DeclSpace ds)
{
- DeclSpace other = (DeclSpace) decls [name];
- if (other != null){
- PartialContainer other_pc = other as PartialContainer;
- if ((ds is TypeContainer) && (other_pc != null)) {
- Report.Error (
- 260, ds.Location, "Missing partial modifier " +
- "on declaration of type `{0}'; another " +
- "partial implementation of this type exists",
- name);
-
- Report.LocationOfPreviousError (other.Location);
- return;
- }
-
- Report.SymbolRelatedToPreviousError (
- other.Location, other.GetSignatureForError ());
-
- Report.Error (
- 101, ds.Location,
- "There is already a definition for `" + name + "'");
- return;
- }
-
- ds.RecordDecl ();
+ // This is recorded for tracking inner partial classes only
+ decls [name] = ds;
- int p = name.LastIndexOf ('.');
- if (p == -1)
- decl_ns_name.Insert ("", name, ds);
- else {
- decl_ns_name.Insert (name.Substring (0, p), name.Substring (p+1), ds);
- }
-
- decls.Add (name, ds);
- }
-
- public DeclSpace LookupByNamespace (string ns, string name)
- {
- object res;
-
- decl_ns_name.Lookup (ns, name, out res);
- return (DeclSpace) res;
+ if (ds.Parent == root_types)
+ ns.AddDeclSpace (name.Basename, ds);
}
//
// FIXME: Why are we using Types?
//
public TypeContainer Types {
- get {
- return root_types;
- }
+ get { return root_types; }
}
- public Hashtable Decls {
- get {
- return decls;
- }
+ public DeclSpace GetDecl (MemberName name)
+ {
+ return (DeclSpace) decls [name];
+ }
+
+ public Hashtable AllDecls {
+ get { return decls; }
}
}
- public class RootTypes : TypeContainer
+ public sealed class RootTypes : TypeContainer
{
public RootTypes ()
- : base (null, null, MemberName.Null, null, Kind.Root, Location.Null)
+ : base (null, null, MemberName.Null, null, Kind.Root)
{
ec = new EmitContext (null, this, Location.Null, null, null, 0, false);
}
- public override void Register ()
- {
- throw new InvalidOperationException ();
- }
-
public override PendingImplementation GetPendingImplementations ()
{
throw new InvalidOperationException ();
}
- public override bool IsClsCompliaceRequired (DeclSpace ds)
+ public override bool IsClsComplianceRequired (DeclSpace ds)
{
return true;
}
+ public override string GetSignatureForError ()
+ {
+ return "";
+ }
+
+ protected override bool AddToTypeContainer (DeclSpace ds)
+ {
+ return AddToContainer (ds, ds.Name);
+ }
}
}