decls = new Hashtable ();
}
- // TODO: Move this check to current_container.Add..... method
- // I guess we can save cpu&mem
public void RecordDecl (Namespace ns, MemberName name, DeclSpace ds)
{
- DeclSpace other = (DeclSpace) decls [name];
- if (other != null){
- Report.SymbolRelatedToPreviousError (other);
+ // This is recorded for tracking inner partial classes only
+ decls [name] = ds;
- PartialContainer other_pc = other as PartialContainer;
- if (ds is TypeContainer && other_pc != null) {
- Report.SymbolRelatedToPreviousError (other);
- Report.Error (260, ds.Location,
- "Missing partial modifier on declaration of type `{0}'. Another partial declaration of this type exists",
- name);
- }
- else
- Report.Error (101, ds.Location,
- "The namespace `{0}' already contains a definition for `{1}'", ns.GetSignatureForError (), name.Name);
- return;
- }
-
- decls.Add (name, ds);
-
- if (ds.Parent == Types)
- ns.DefineName (name.Basename, ds);
+ 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 DeclSpace GetDecl (MemberName name)
}
public Hashtable AllDecls {
- get {
- return decls;
- }
+ 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);
}
return "";
}
-
+ protected override bool AddToTypeContainer (DeclSpace ds)
+ {
+ return AddToContainer (ds, ds.Name);
+ }
}
}