[svn] r6315: nemerle/trunk/ncc: external/LibrariesLoader.n
generation/HierarchyEmitter.n generation/Implem...
malekith
svnadmin at nemerle.org
Sun May 21 18:01:27 CEST 2006
Log:
Rename Manager fields in TypeBuilder and LibReference.
Author: malekith
Date: Sun May 21 18:01:26 2006
New Revision: 6315
Modified:
nemerle/trunk/ncc/external/LibrariesLoader.n
nemerle/trunk/ncc/generation/HierarchyEmitter.n
nemerle/trunk/ncc/generation/ImplementsWrapperMaker.n
nemerle/trunk/ncc/hierarchy/ClassMembers.n
nemerle/trunk/ncc/hierarchy/TypeBuilder.n
Modified: nemerle/trunk/ncc/external/LibrariesLoader.n
==============================================================================
--- nemerle/trunk/ncc/external/LibrariesLoader.n (original)
+++ nemerle/trunk/ncc/external/LibrariesLoader.n Sun May 21 18:01:26 2006
@@ -49,7 +49,7 @@
/**
- * Manager for the referenced libraries
+ * LibRefManager for the referenced libraries
*/
class LibraryReferenceManager
{
@@ -488,7 +488,7 @@
internal mutable _is_generated_by_nemerle : bool;
- internal Manager : LibraryReferenceManager;
+ internal LibRefManager : LibraryReferenceManager;
// a little hack to prevent AddBuildins() calling in NetType
internal static mutable add_buildins : bool = false;
@@ -498,7 +498,7 @@
*/
internal this (mgr : LibraryReferenceManager, assembly : SR.Assembly)
{
- Manager = mgr;
+ LibRefManager = mgr;
_library = assembly;
_location = Location (Location.GetFileIndex (assembly.Location), 0, 0);
@@ -507,8 +507,8 @@
_library.GetCustomAttributes (typeof (SR.AssemblyConfigurationAttribute), false))
_is_generated_by_nemerle = _is_generated_by_nemerle || x.Configuration == "ContainsNemerleTypes";
- Manager.LoadTypesFrom (this);
- Manager.LoadMacrosFrom (_library);
+ LibRefManager.LoadTypesFrom (this);
+ LibRefManager.LoadMacrosFrom (_library);
}
@@ -572,7 +572,7 @@
internal TypeInfoOfType (framework_type : System.Type) : TypeInfo
{
def (ns_node, path_to_type) =
- Manager.framework_nesting (framework_type);
+ LibRefManager.framework_nesting (framework_type);
def ns_node = ns_node.Path (path_to_type);
match (ns_node.LookupType ([], framework_type.GetGenericArguments ().Length)) {
@@ -613,7 +613,7 @@
if (st == null)
None ()
else {
- def (ns_node, path_to_type) = Manager.framework_nesting (st);
+ def (ns_node, path_to_type) = LibRefManager.framework_nesting (st);
def ns = ns_node.Path (path_to_type);
Some (LibraryReferenceManager.GetInternalType (this, st, ns))
}
@@ -704,8 +704,8 @@
when (LibraryReference.add_buildins) AddBuiltins ();
// else Message.Debug ($"omiititng $FullName");
- decode_extension_methods (lib.Manager, SystemType.ExtensionAttribute);
- decode_extension_methods (lib.Manager, SystemType.SQ_ExtensionAttribute);
+ decode_extension_methods (lib.LibRefManager, SystemType.ExtensionAttribute);
+ decode_extension_methods (lib.LibRefManager, SystemType.SQ_ExtensionAttribute);
}
#region Special numeric overloads
Modified: nemerle/trunk/ncc/generation/HierarchyEmitter.n
==============================================================================
--- nemerle/trunk/ncc/generation/HierarchyEmitter.n (original)
+++ nemerle/trunk/ncc/generation/HierarchyEmitter.n Sun May 21 18:01:26 2006
@@ -459,7 +459,7 @@
/* create the type builder for a top-level or nested class declaration */
type_builder =
if (!is_nested)
- Manager._module_builder.DefineType (FullName + generic_mark_suffix, attrs)
+ TyManager._module_builder.DefineType (FullName + generic_mark_suffix, attrs)
else {
def containing_builder = (DeclaringType :> TypeBuilder).GetTypeBuilder ();
containing_builder.DefineNestedType (Name + generic_mark_suffix, attrs)
@@ -476,12 +476,12 @@
}
when (custom_attribute != null) {
- Manager.contains_nemerle_specifics = true;
+ TyManager.contains_nemerle_specifics = true;
type_builder.SetCustomAttribute (custom_attribute);
}
when (extension_patterns.Count > 0)
- Manager.contains_nemerle_specifics = true;
+ TyManager.contains_nemerle_specifics = true;
// Structs with no fields need to have at least one byte.
// The right thing would be to set the PackingSize in a DefineType
@@ -736,7 +736,7 @@
emit_parameter_attributes ();
unless (fun_kind is FunKind.Constructor)
- setup_method (declaring_type.Manager);
+ setup_method (declaring_type.TyManager);
declaring_type.DoBeforeFinalization2 (fun () {
// Message.Debug ($"making il generator for $meth");
Modified: nemerle/trunk/ncc/generation/ImplementsWrapperMaker.n
==============================================================================
--- nemerle/trunk/ncc/generation/ImplementsWrapperMaker.n (original)
+++ nemerle/trunk/ncc/generation/ImplementsWrapperMaker.n Sun May 21 18:01:26 2006
@@ -158,7 +158,7 @@
def t4 = Typer4 (meth);
t4.Run ();
- DeclaringType.Manager.MaybeCompile (declaring_type, meth);
+ DeclaringType.TyManager.MaybeCompile (declaring_type, meth);
}
}
}
Modified: nemerle/trunk/ncc/hierarchy/ClassMembers.n
==============================================================================
--- nemerle/trunk/ncc/hierarchy/ClassMembers.n (original)
+++ nemerle/trunk/ncc/hierarchy/ClassMembers.n Sun May 21 18:01:26 2006
@@ -380,7 +380,7 @@
modifiers.macro_attrs ::= (TypesManager.AttributeMacroExpansion.Suffix (MacroTarget, MacroPhase.WithTypedMembers), expr);
def expansion = TypesManager.AttributeMacroExpansion (MacroTarget, MacroPhase.WithTypedMembers, expr,
MacroSelfParams, declaring_type, null);
- declaring_type.Manager.AddMacroExpansion (expansion);
+ declaring_type.TyManager.AddMacroExpansion (expansion);
}
internal virtual ProcessMacroAttributes () : void {
Modified: nemerle/trunk/ncc/hierarchy/TypeBuilder.n
==============================================================================
--- nemerle/trunk/ncc/hierarchy/TypeBuilder.n (original)
+++ nemerle/trunk/ncc/hierarchy/TypeBuilder.n Sun May 21 18:01:26 2006
@@ -85,7 +85,7 @@
/// Marker for [TypeBuilder.Iter].
internal mutable phase : int;
- public Manager : TypesManager;
+ public TyManager : TypesManager;
/**
* Defining type if any and transitive closure of base types of this type.
@@ -100,7 +100,7 @@
{
base (ns_node);
- this.Manager = manager;
+ this.TyManager = manager;
Stats.AllTypeBuilders++;
@@ -396,7 +396,7 @@
set { is_finalized = value }
}
- [Nemerle.Assertions.Requires (Manager.run_phase <= 2)]
+ [Nemerle.Assertions.Requires (TyManager.run_phase <= 2)]
public AddImplementedInterface (t : PT.PExpr) : void
{
match (pt_tydecl) {
@@ -456,10 +456,10 @@
else {
try {
def mem = bind_and_add_member (f);
- when (Manager.IsEmitting) {
- Manager.EnsureEmitProgress (this);
+ when (TyManager.IsEmitting) {
+ TyManager.EnsureEmitProgress (this);
when (IsFinalized)
- Manager.MaybeCompile (this, mem);
+ TyManager.MaybeCompile (this, mem);
}
mem
} catch {
@@ -494,7 +494,7 @@
cannot_finalize = false;
- when (Manager.run_phase >= 5) {
+ when (TyManager.run_phase >= 5) {
// Message.Debug ($"comp: $this");
add_constant_variant_ctors ();
when (Attributes %&& NemerleAttributes.SpecialName)
@@ -504,14 +504,14 @@
check_ctor_constraints ();
}
- when (Manager.IsEmitting) {
+ when (TyManager.IsEmitting) {
// Message.Debug ($"emitimpl: $this -- $(GetDirectMembers ())");
this.CreateEmitDeclarations ();
}
Passes.Solver.Enqueue (fun () {
- when (Manager.run_phase >= 5) {
- when (Manager.IsEmitting) {
+ when (TyManager.run_phase >= 5) {
+ when (TyManager.IsEmitting) {
// Message.Debug ($"emitimpl: $this -- $(GetDirectMembers ())");
this.EmitImplementation ();
}
@@ -1995,7 +1995,7 @@
Util.locate (loc, process_macro_attributes (MacroPhase.BeforeInheritance));
- def run_phase = Manager.run_phase;
+ def run_phase = TyManager.run_phase;
when (run_phase >= 1)
make_tyenvs ();
@@ -2011,8 +2011,8 @@
add_members ();
when (run_phase >= 7) {
process_macro_attributes (MacroPhase.WithTypedMembers);
- when (Manager.IsEmitting)
- Manager.EnsureEmitProgress (this);
+ when (TyManager.IsEmitting)
+ TyManager.EnsureEmitProgress (this);
}
}
@@ -2306,7 +2306,7 @@
foreach ((_, expr) in macro_attrs)
{
def expansion = TypesManager.AttributeMacroExpansion (target, stage, expr, self_parm, this, meth);
- Manager.AddMacroExpansion (expansion);
+ TyManager.AddMacroExpansion (expansion);
};
}
@@ -2359,7 +2359,7 @@
| _ => Util.ice ("cannot run macros processing with none phase")
}
- Manager.ExpandMacros();
+ TyManager.ExpandMacros();
}
More information about the svn
mailing list