[svn] r6316: nemerle/trunk: boot/Nemerle.Compiler.dll
boot/Nemerle.Macros.dll boot/Nemerle.dll boot/ncc.ex...
malekith
svnadmin at nemerle.org
Sun May 21 18:34:26 CEST 2006
Log:
Rename Passes to Manager.
Author: malekith
Date: Sun May 21 18:33:55 2006
New Revision: 6316
Modified:
nemerle/trunk/boot/Nemerle.Compiler.dll
nemerle/trunk/boot/Nemerle.Macros.dll
nemerle/trunk/boot/Nemerle.dll
nemerle/trunk/boot/ncc.exe
nemerle/trunk/macros/Logging.n
nemerle/trunk/ncc/codedom/NemerleCodeCompiler.n
nemerle/trunk/ncc/completion/CodeCompletionEngine.n
nemerle/trunk/ncc/generation/DecisionTreeCompiler.n
nemerle/trunk/ncc/generation/HierarchyEmitter.n
nemerle/trunk/ncc/generation/Typer4.n
nemerle/trunk/ncc/hierarchy/ClassMembers.n
nemerle/trunk/ncc/hierarchy/GlobalEnv.n
nemerle/trunk/ncc/hierarchy/NamespaceTree.n
nemerle/trunk/ncc/hierarchy/TypeBuilder.n
nemerle/trunk/ncc/main.n
nemerle/trunk/ncc/parsing/MainParser.n
nemerle/trunk/ncc/parsing/Utility.n
nemerle/trunk/ncc/passes.n
nemerle/trunk/ncc/testsuite/test.n
nemerle/trunk/ncc/typing/MType.n
nemerle/trunk/ncc/typing/Macros.n
nemerle/trunk/ncc/typing/OverloadPossibility.n
nemerle/trunk/ncc/typing/Subst.n
nemerle/trunk/ncc/typing/TyVar.n
nemerle/trunk/ncc/typing/TyVarEnv.n
nemerle/trunk/ncc/typing/TypedTree.n
nemerle/trunk/ncc/typing/Typer-DelayedTyping.n
nemerle/trunk/ncc/typing/Typer-OverloadSelection.n
nemerle/trunk/ncc/typing/Typer-PatternTyper.n
nemerle/trunk/ncc/typing/Typer.n
nemerle/trunk/ncc/typing/Typer2.n
Modified: nemerle/trunk/boot/Nemerle.Compiler.dll
==============================================================================
Binary files. No diff available.
Modified: nemerle/trunk/boot/Nemerle.Macros.dll
==============================================================================
Binary files. No diff available.
Modified: nemerle/trunk/boot/Nemerle.dll
==============================================================================
Binary files. No diff available.
Modified: nemerle/trunk/boot/ncc.exe
==============================================================================
Binary files. No diff available.
Modified: nemerle/trunk/macros/Logging.n
==============================================================================
--- nemerle/trunk/macros/Logging.n (original)
+++ nemerle/trunk/macros/Logging.n Sun May 21 18:33:55 2006
@@ -60,7 +60,7 @@
this ()
{
- Passes.OnInit += Init;
+ Manager.OnInit += Init;
FlagsToFunctions [""] = <[ System.Console.WriteLine ]>;
Init ();
}
Modified: nemerle/trunk/ncc/codedom/NemerleCodeCompiler.n
==============================================================================
--- nemerle/trunk/ncc/codedom/NemerleCodeCompiler.n (original)
+++ nemerle/trunk/ncc/codedom/NemerleCodeCompiler.n Sun May 21 18:33:55 2006
@@ -156,7 +156,7 @@
Message.Error ("need at least one file to compile");
else {
Options.Sources = files + List.FromArray (fileNames);
- Passes.Run ();
+ Manager.Run ();
succeeded = !failed;
}
}
Modified: nemerle/trunk/ncc/completion/CodeCompletionEngine.n
==============================================================================
--- nemerle/trunk/ncc/completion/CodeCompletionEngine.n (original)
+++ nemerle/trunk/ncc/completion/CodeCompletionEngine.n Sun May 21 18:33:55 2006
@@ -203,8 +203,8 @@
Defines = DefineCollection ();
References = ReferenceCollection ();
Sources = SourceCollection ();
- Passes.ParsingPipeline = MainParser.Parse;
- Passes.ScanningPipeline = ScanTypeHierarchy.ProcessDeclaration;
+ Manager.ParsingPipeline = MainParser.Parse;
+ Manager.ScanningPipeline = ScanTypeHierarchy.ProcessDeclaration;
textWriter = null;
Message.MessageOccured += Message.MessageEventHandler (process_error_message);
}
@@ -218,24 +218,24 @@
Message.InitOutput (textWriter);
MacroColorizer.Clear ();
MacroRegistry.Init ();
- Passes.LibrariesManager = LibraryReferenceManager (Options.LibraryPaths);
+ Manager.LibrariesManager = LibraryReferenceManager (Options.LibraryPaths);
NamespaceTree.Init ();
NamespaceTree.namespace_tree.Clear ();
Util.Init ();
- Passes.Solver = Solver ();
+ Manager.Solver = Solver ();
Options.Clear();
Options.GreedyReferences = true;
Options.ColorMessages = false;
Options.IgnoreConfusion = true;
- Passes.LibrariesManager.AddLibrary ("mscorlib");
- Passes.LibrariesManager.AddLibrary ("System");
- Passes.LibrariesManager.AddLibrary ("Nemerle");
+ Manager.LibrariesManager.AddLibrary ("mscorlib");
+ Manager.LibrariesManager.AddLibrary ("System");
+ Manager.LibrariesManager.AddLibrary ("Nemerle");
SystemType.Init ();
InternalType.InitSystemTypes ();
InternalType.InitNemerleTypes ();
- Passes.LibrariesManager.LoadMacrosFrom ("Nemerle.Macros");
+ Manager.LibrariesManager.LoadMacrosFrom ("Nemerle.Macros");
Sources.set_unparsed_state ();
GlobalEnv.Init();
@@ -245,10 +245,10 @@
public LesserInit() : void
{
- Passes.LibrariesManager = LibraryReferenceManager (Options.LibraryPaths);
+ Manager.LibrariesManager = LibraryReferenceManager (Options.LibraryPaths);
NamespaceTree.Init ();
Util.Init ();
- Passes.Solver = Solver ();
+ Manager.Solver = Solver ();
GlobalEnv.Init();
}
@@ -565,8 +565,8 @@
foreach (references in References.references.Values)
{
- | Library as l => Passes.LibrariesManager.AddLibrary (l.path);
- | Assembly as a => Passes.LibrariesManager.AddAssembly (a.assembly);
+ | Library as l => Manager.LibrariesManager.AddLibrary (l.path);
+ | Assembly as a => Manager.LibrariesManager.AddAssembly (a.assembly);
}
System.Console.WriteLine ("just before lexing");
@@ -582,7 +582,7 @@
| NotParsed as np =>
def contents = np.code;
def lexer = LexerString (contents, Location (Location.GetFileIndex (filename), 1, 1));
- def decls = Passes.ParsingPipeline (lexer);
+ def decls = Manager.ParsingPipeline (lexer);
Sources.sources[filename] = ParsedFile.Parsed (decls, contents);
trees ::= decls;
| Parsed as p => trees ::= p.decls;
@@ -599,14 +599,14 @@
}
System.Console.WriteLine ("just before TypesManager");
- Passes.Hierarchy = TypesManager ();
+ Manager.Hierarchy = TypesManager ();
// create N.C.TypeBuilders for all parsed types and add them to namespace hierarchy
System.Console.WriteLine ("just before parsing");
try
{
foreach (group in trees) {
- List.Iter (group, Passes.ScanningPipeline);
+ List.Iter (group, Manager.ScanningPipeline);
}
}
catch
@@ -621,7 +621,7 @@
System.Console.WriteLine ("just before building the hierarchy");
try
{
- Passes.Hierarchy.Run();
+ Manager.Hierarchy.Run();
}
catch
{
Modified: nemerle/trunk/ncc/generation/DecisionTreeCompiler.n
==============================================================================
--- nemerle/trunk/ncc/generation/DecisionTreeCompiler.n (original)
+++ nemerle/trunk/ncc/generation/DecisionTreeCompiler.n Sun May 21 18:33:55 2006
@@ -98,7 +98,7 @@
def disable_warnings = mcs.Exists (fun (mc) { mc.disable_warnings == true });
- when (!disable_warnings && Passes.Solver.CurrentMessenger.NeedMessage)
+ when (!disable_warnings && Manager.Solver.CurrentMessenger.NeedMessage)
builder.CheckMatching();
List.Iter (mcs, Typer.FixupMatchCase);
Modified: nemerle/trunk/ncc/generation/HierarchyEmitter.n
==============================================================================
--- nemerle/trunk/ncc/generation/HierarchyEmitter.n (original)
+++ nemerle/trunk/ncc/generation/HierarchyEmitter.n Sun May 21 18:33:55 2006
@@ -81,7 +81,7 @@
def delegate_ = resolve_hack : System.ResolveEventHandler;
System.AppDomain.CurrentDomain.TypeResolve += delegate_;
// we need to later remove it to avoid garbage
- Passes.CleanupOnce.Push (fun () {
+ Manager.CleanupOnce.Push (fun () {
System.AppDomain.CurrentDomain.TypeResolve -= delegate_;
});
@@ -207,7 +207,7 @@
*/
public EmitDecls () : void
{
- Passes.Solver.Enqueue (fun () {
+ Manager.Solver.Enqueue (fun () {
compile_all_tyinfos (false);
foreach (x in AttributeCompiler.GetCompiledAssemblyAttributes (assembly_attributes))
_assembly_builder.SetCustomAttribute (x);
@@ -318,7 +318,7 @@
def emit_impl (ti : TypeBuilder) {
when (allow_it (ti)) {
//Message.Debug ("generating code for " + ti.FullName);
- Passes.MarkTypeBuilderCompiled ();
+ Manager.MarkTypeBuilderCompiled ();
ti.EmitImplementation ()
}
};
Modified: nemerle/trunk/ncc/generation/Typer4.n
==============================================================================
--- nemerle/trunk/ncc/generation/Typer4.n (original)
+++ nemerle/trunk/ncc/generation/Typer4.n Sun May 21 18:33:55 2006
@@ -56,7 +56,7 @@
{
current_fun = meth.GetHeader ();
the_method = meth;
- messenger = Passes.Solver.CurrentMessenger;
+ messenger = Manager.Solver.CurrentMessenger;
current_type = meth.DeclaringType;
}
@@ -152,7 +152,7 @@
static mutable current_t4 : Typer4;
static CheckSTV (t : TyVar) : void
{
- if (Passes.Solver.CanEnterPossiblyLooping ())
+ if (Manager.Solver.CanEnterPossiblyLooping ())
try {
match (t.Fix ()) {
| Class (_, args)
@@ -190,12 +190,12 @@
{}
}
} finally {
- Passes.Solver.LeavePossiblyLooping ()
+ Manager.Solver.LeavePossiblyLooping ()
}
else {
- ReportError (Passes.Solver.CurrentMessenger,
+ ReportError (Manager.Solver.CurrentMessenger,
$ "CheckSTV for $t failed");
- when (Passes.Solver.CurrentMessenger.NeedMessage)
+ when (Manager.Solver.CurrentMessenger.NeedMessage)
Message.MaybeBailout ();
}
}
Modified: nemerle/trunk/ncc/hierarchy/ClassMembers.n
==============================================================================
--- nemerle/trunk/ncc/hierarchy/ClassMembers.n (original)
+++ nemerle/trunk/ncc/hierarchy/ClassMembers.n Sun May 21 18:33:55 2006
@@ -1032,7 +1032,7 @@
public AddAsExtensionMethod () : void
{
- Passes.LibrariesManager.AddExtensionMethod (this);
+ Manager.LibrariesManager.AddExtensionMethod (this);
}
public BuiltinKind : BuiltinMethodKind
Modified: nemerle/trunk/ncc/hierarchy/GlobalEnv.n
==============================================================================
--- nemerle/trunk/ncc/hierarchy/GlobalEnv.n (original)
+++ nemerle/trunk/ncc/hierarchy/GlobalEnv.n Sun May 21 18:33:55 2006
@@ -168,7 +168,7 @@
| None =>
def suff = if (args_count > 0) "`" + args_count.ToString () + "'"
else "'";
- ReportError (Passes.Solver.CurrentMessenger,
+ ReportError (Manager.Solver.CurrentMessenger,
"unbound type name `" + name.ToString (".") + suff);
InternalType.Object_tc
}
@@ -227,9 +227,9 @@
| (TypeDeclaration.Alias (MType.Class (tc, _)), _) when tc.Equals (y) => Some (y)
| (_, TypeDeclaration.Alias (MType.Class (tc, _))) when tc.Equals (x) => Some (x)
| _ =>
- ReportError (Passes.Solver.CurrentMessenger,
+ ReportError (Manager.Solver.CurrentMessenger,
"type name `" + name.ToString (".") + "' is ambiguous, it could be:");
- when (Passes.Solver.CurrentMessenger.NeedMessage) {
+ when (Manager.Solver.CurrentMessenger.NeedMessage) {
Message.Error (x.Location, $" this declaration `$x'");
Message.Error (y.Location, $" or this declaration `$y'");
}
Modified: nemerle/trunk/ncc/hierarchy/NamespaceTree.n
==============================================================================
--- nemerle/trunk/ncc/hierarchy/NamespaceTree.n (original)
+++ nemerle/trunk/ncc/hierarchy/NamespaceTree.n Sun May 21 18:33:55 2006
@@ -425,7 +425,7 @@
Message.Error (newdecl.loc, "redefinition of external type `" +
x.FullName + "'");
Message.Error (x.Location, "first defined here");
- builder = Passes.Hierarchy.CreateTypeBuilder (par, newdecl, ns_node);
+ builder = Manager.Hierarchy.CreateTypeBuilder (par, newdecl, ns_node);
builder :: acc
}
else
@@ -433,7 +433,7 @@
});
when (builder == null) {
- builder = Passes.Hierarchy.CreateTypeBuilder (par, newdecl, ns_node);
+ builder = Manager.Hierarchy.CreateTypeBuilder (par, newdecl, ns_node);
all ::= builder;
}
@@ -586,7 +586,7 @@
{
_N_MacroContexts.serialized = $(LiftMacroContexts ());
_N_MacroContexts.contexts = array ($(macro_context : int));
- Passes.OnInit += Clear;
+ Manager.OnInit += Clear;
}
]>));
ty.CannotFinalize = false;
Modified: nemerle/trunk/ncc/hierarchy/TypeBuilder.n
==============================================================================
--- nemerle/trunk/ncc/hierarchy/TypeBuilder.n (original)
+++ nemerle/trunk/ncc/hierarchy/TypeBuilder.n Sun May 21 18:33:55 2006
@@ -135,7 +135,7 @@
| PT.TopDeclaration.Enum => is_enum = true;
| _ => ()
};
- ++Passes.tyinfo_counter;
+ ++Manager.tyinfo_counter;
when (pt_tydecl.typarms != null)
typarms_count = pt_tydecl.typarms.tyvars.Length;
@@ -509,7 +509,7 @@
this.CreateEmitDeclarations ();
}
- Passes.Solver.Enqueue (fun () {
+ Manager.Solver.Enqueue (fun () {
when (TyManager.run_phase >= 5) {
when (TyManager.IsEmitting) {
// Message.Debug ($"emitimpl: $this -- $(GetDirectMembers ())");
@@ -517,7 +517,7 @@
}
}
- Passes.MarkTypeBuilderCompiled ();
+ Manager.MarkTypeBuilderCompiled ();
})
}
@@ -2668,7 +2668,7 @@
static messenger : Messenger
{
- get { Passes.Solver.CurrentMessenger }
+ get { Manager.Solver.CurrentMessenger }
}
}
Modified: nemerle/trunk/ncc/main.n
==============================================================================
--- nemerle/trunk/ncc/main.n (original)
+++ nemerle/trunk/ncc/main.n Sun May 21 18:33:55 2006
@@ -29,7 +29,7 @@
/*
* This is the main compiler file. But all it does it setting options
* for compilation (CompilerOptions.n) and transferring control to
- * Passes.Run function (from passes.n).
+ * Manager.Run function (from passes.n).
*
* Main file also catches some exceptions.
*/
@@ -78,7 +78,7 @@
(System.Uri (typeof (MainClass).Assembly.CodeBase).LocalPath);
// run compilation with already created options
- Passes.Run ()
+ Manager.Run ()
} catch {
| e is System.IO.FileNotFoundException =>
Message.Error (e.Message)
@@ -105,7 +105,7 @@
bomb (e : System.Exception, msg : string) : void
{
- Passes.KillProgressBar ();
+ Manager.KillProgressBar ();
Message.MaybeBailout (true);
Message.Error (sprintf ("internal compiler error: %s\n%s\n", msg, e.StackTrace));
System.Environment.Exit (2);
Modified: nemerle/trunk/ncc/parsing/MainParser.n
==============================================================================
--- nemerle/trunk/ncc/parsing/MainParser.n (original)
+++ nemerle/trunk/ncc/parsing/MainParser.n Sun May 21 18:33:55 2006
@@ -156,11 +156,11 @@
PreParserIndent (lex)
else
PreParser (lex);
- preparser.DocComments = Passes.DocComments;
+ preparser.DocComments = Manager.DocComments;
mutable result = [];
mutable topstream = preparser.ParseTopLevel ().Child :> Token.LooseGroup;
- Passes.DocComments = preparser.DocComments;
+ Manager.DocComments = preparser.DocComments;
def parser = MainParser (GlobalEnv.Core);
def iter () {
@@ -512,7 +512,7 @@
take_attributes_out (ref assembly_custom, System.AttributeTargets.Assembly,
true, mods);
foreach (cust in mods.custom_attrs)
- Passes.Hierarchy.AddAssemblyAttribute (env, cust);
+ Manager.Hierarchy.AddAssemblyAttribute (env, cust);
tok.Child = square.Next;
eat_assembly_attributes (tok);
Modified: nemerle/trunk/ncc/parsing/Utility.n
==============================================================================
--- nemerle/trunk/ncc/parsing/Utility.n (original)
+++ nemerle/trunk/ncc/parsing/Utility.n Sun May 21 18:33:55 2006
@@ -325,7 +325,7 @@
def l =
if (l == Location.Default) Location_stack.top()
else l;
- Passes.KillProgressBar ();
+ Manager.KillProgressBar ();
def msg = l.ToString () + m;
when (MessageOccured != null) MessageOccured (l, msg);
when (output == null)
Modified: nemerle/trunk/ncc/passes.n
==============================================================================
--- nemerle/trunk/ncc/passes.n (original)
+++ nemerle/trunk/ncc/passes.n Sun May 21 18:33:55 2006
@@ -31,7 +31,7 @@
namespace Nemerle.Compiler
{
- public module Passes
+ public module Manager
{
internal mutable Solver : Solver;
public mutable Hierarchy : TypesManager;
@@ -132,7 +132,7 @@
NamespaceTree.Init ();
Util.Init ();
Options.Validate ();
- Passes.Solver = Solver ();
+ Manager.Solver = Solver ();
if (Options.XmlDocOutputFileName != null)
DocComments = Map ();
else
Modified: nemerle/trunk/ncc/testsuite/test.n
==============================================================================
--- nemerle/trunk/ncc/testsuite/test.n (original)
+++ nemerle/trunk/ncc/testsuite/test.n Sun May 21 18:33:55 2006
@@ -299,7 +299,7 @@
};
Message.InitOutput (System.IO.TextWriter.Null);
try {
- Passes.Run ()
+ Manager.Run ()
} catch {
| _ is System.IO.FileNotFoundException =>
exit_code = 1
Modified: nemerle/trunk/ncc/typing/MType.n
==============================================================================
--- nemerle/trunk/ncc/typing/MType.n (original)
+++ nemerle/trunk/ncc/typing/MType.n Sun May 21 18:33:55 2006
@@ -249,7 +249,7 @@
/** Enforce [this] to be subtype of [t]. */
public override Require (t : MType) : bool
{
- def s = Passes.Solver;
+ def s = Manager.Solver;
match ((this, t)) {
| (Void, Class) =>
@@ -368,7 +368,7 @@
| (Void, Void) => true
| _ =>
- SaveError (Passes.Solver.CurrentMessenger,
+ SaveError (Manager.Solver.CurrentMessenger,
$ "the types $(this) and $t are not compatible "
"[simple unify]");
false
@@ -873,9 +873,9 @@
public TrySigRequire (other : MType) : bool
{
- Passes.Solver.PushState ();
+ Manager.Solver.PushState ();
def res = this.SigRequire (other);
- Passes.Solver.PopState ();
+ Manager.Solver.PopState ();
res
}
Modified: nemerle/trunk/ncc/typing/Macros.n
==============================================================================
--- nemerle/trunk/ncc/typing/Macros.n (original)
+++ nemerle/trunk/ncc/typing/Macros.n Sun May 21 18:33:55 2006
@@ -530,7 +530,7 @@
| PExpr.Spliced (e) => e
- | PExpr.Wildcard => <[ Passes.Solver.FreshTyVar () ]>
+ | PExpr.Wildcard => <[ Manager.Solver.FreshTyVar () ]>
| PExpr.Ellipsis (ar) =>
<[ MType.Tuple ($(quoted_ttype (ar))) ]>
Modified: nemerle/trunk/ncc/typing/OverloadPossibility.n
==============================================================================
--- nemerle/trunk/ncc/typing/OverloadPossibility.n (original)
+++ nemerle/trunk/ncc/typing/OverloadPossibility.n Sun May 21 18:33:55 2006
@@ -40,7 +40,7 @@
public StillPossible : bool
{
get {
- def solver = Passes.Solver;
+ def solver = Manager.Solver;
solver.PushState ();
def was_error = Compile () is TExpr.Error;
solver.PopState ();
@@ -93,7 +93,7 @@
| _ when !is_ok =>
// XXX see when this happens and invent some better
// error message
- ReportError (Passes.Solver.CurrentMessenger,
+ ReportError (Manager.Solver.CurrentMessenger,
$ " $(member) is no longer present in $(ty) "
"after constraining");
TExpr.Error ()
@@ -192,7 +192,7 @@
this.expr = expr;
this.from = from;
this.member = member;
- this.solver = Passes.Solver;
+ this.solver = Manager.Solver;
this.ty = ty;
this.local_context = typer.GetLocals ();
@@ -364,7 +364,7 @@
{
assert (!overloads.IsEmpty);
- def solver = Passes.Solver;
+ def solver = Manager.Solver;
def res = List.RevFilter (overloads,
fun (o : OverloadPossibility) {
solver.PushState ();
@@ -379,7 +379,7 @@
when (res.IsEmpty) {
def hd = List.Hd (overloads);
- def solver = Passes.Solver;
+ def solver = Manager.Solver;
def messenger = solver.CurrentMessenger;
if (overloads.ForAll (fun (o) { !o.IsGeneric && o.generic_specifier != null }))
ReportError (messenger,
Modified: nemerle/trunk/ncc/typing/Subst.n
==============================================================================
--- nemerle/trunk/ncc/typing/Subst.n (original)
+++ nemerle/trunk/ncc/typing/Subst.n Sun May 21 18:33:55 2006
@@ -41,7 +41,7 @@
public this ()
{
- this.solver = Passes.Solver;
+ this.solver = Manager.Solver;
empty = true;
map = SystemMap ();
}
@@ -195,8 +195,8 @@
if (vars.IsEmpty) {
(res, [])
} else {
- // Message.Debug ($ "start copying, $(Passes.Solver.CurrentMessenger.LocalError)");
- def was_error = Passes.Solver.CurrentMessenger.LocalError;
+ // Message.Debug ($ "start copying, $(Manager.Solver.CurrentMessenger.LocalError)");
+ def was_error = Manager.Solver.CurrentMessenger.LocalError;
def vars' =
List.Map (vars, fun (v) {
def tv = Solver.FreshTyVar ();
Modified: nemerle/trunk/ncc/typing/TyVar.n
==============================================================================
--- nemerle/trunk/ncc/typing/TyVar.n (original)
+++ nemerle/trunk/ncc/typing/TyVar.n Sun May 21 18:33:55 2006
@@ -66,9 +66,9 @@
public TryRequire (t : TyVar) : bool
{
- Passes.Solver.PushState ();
+ Manager.Solver.PushState ();
def res = this.Require (t);
- Passes.Solver.PopState ();
+ Manager.Solver.PopState ();
res
}
@@ -116,9 +116,9 @@
public TryProvide (t : TyVar) : bool
{
- Passes.Solver.PushState ();
+ Manager.Solver.PushState ();
def res = this.Provide (t);
- Passes.Solver.PopState ();
+ Manager.Solver.PopState ();
res
}
@@ -148,7 +148,7 @@
/** Make sure [t] and [this] will from now on always represent the
same type. */
[ForwardThis (Self)]
- [PossiblyLooping (Passes.Solver)]
+ [PossiblyLooping (Manager.Solver)]
public Unify (t : TyVar) : bool
{
def t = t.Self;
@@ -172,9 +172,9 @@
public TryUnify (t : TyVar) : bool
{
- Passes.Solver.PushState ();
+ Manager.Solver.PushState ();
def res = this.Unify (t);
- Passes.Solver.PopState ();
+ Manager.Solver.PopState ();
res
}
@@ -344,7 +344,7 @@
def s = Self;
s.flags |= Flags.IsFromNull;
when (!CanBeNull)
- SaveError (Passes.Solver.CurrentMessenger,
+ SaveError (Manager.Solver.CurrentMessenger,
$ "the `null' literal is not a valid value of type "
"$(Option.UnSome (Hint))");
when (s.lower_tyvars != null)
@@ -376,12 +376,12 @@
| None => InternalType.Object
}
def was_local_error = LocalError;
- def cyclic_count = Passes.Solver.CyclicTypeCount;
+ def cyclic_count = Manager.Solver.CyclicTypeCount;
def res = Unify (bound);
unless (was_local_error) {
unless (res)
- Passes.Solver.CurrentMessenger.DumpSavedError ();
- when (cyclic_count != Passes.Solver.CyclicTypeCount)
+ Manager.Solver.CurrentMessenger.DumpSavedError ();
+ when (cyclic_count != Manager.Solver.CyclicTypeCount)
Message.FatalError ($ "cyclic type found: $this");
#if !VERB
def before = "";
@@ -499,7 +499,7 @@
public CurrentSolver : Solver
{
- get { Passes.Solver }
+ get { Manager.Solver }
}
@@ -533,7 +533,7 @@
public DeepFix () : MType
{
- if (Passes.Solver.CanEnterPossiblyLooping ())
+ if (Manager.Solver.CanEnterPossiblyLooping ())
try {
def t = Fix ();
match (t) {
@@ -562,12 +562,12 @@
| Void => t
}
} finally {
- Passes.Solver.LeavePossiblyLooping ()
+ Manager.Solver.LeavePossiblyLooping ()
}
else {
- ReportError (Passes.Solver.CurrentMessenger,
+ ReportError (Manager.Solver.CurrentMessenger,
"deep fixation failed");
- when (Passes.Solver.CurrentMessenger.NeedMessage)
+ when (Manager.Solver.CurrentMessenger.NeedMessage)
Message.MaybeBailout ();
InternalType.Void
}
@@ -699,7 +699,7 @@
if (tv.Self : object != this) {
if (IsFromNull && !tv.CanBeNull) {
- SaveError (Passes.Solver.CurrentMessenger,
+ SaveError (Manager.Solver.CurrentMessenger,
$ "the `null' literal is not a valid value of type $tv");
false
} else {
@@ -778,7 +778,7 @@
}
- [PossiblyLooping (Passes.Solver)]
+ [PossiblyLooping (Manager.Solver)]
static AddRelation (low : MType, high : TyVar, rev : bool) : bool
{
assert (low != null);
@@ -839,12 +839,12 @@
else
high.FixedValue.Require (low)
} else if (high.IsFree && high.IsFromNull && !low.CanBeNull) {
- SaveError (Passes.Solver.CurrentMessenger,
+ SaveError (Manager.Solver.CurrentMessenger,
$ "the `null' literal is not a valid value of type $low");
false
} else {
if (rev) {
- def new_bound = Passes.Solver.Sum (high.upper_bound, low);
+ def new_bound = Manager.Solver.Sum (high.upper_bound, low);
def high = high.Self;
if (high.IsFixed)
_ = high.Provide (new_bound);
@@ -858,7 +858,7 @@
}
}
} else {
- def new_bound = Passes.Solver.Intersect (high.lower_bound, low);
+ def new_bound = Manager.Solver.Intersect (high.lower_bound, low);
def high = high.Self;
if (high.IsFixed)
_ = high.Require (new_bound);
@@ -917,14 +917,14 @@
WillRead () : void
{
def loop (i) {
- if (i < 0 || Passes.Solver.serial_stack [i] < serial) {
+ if (i < 0 || Manager.Solver.serial_stack [i] < serial) {
when (next == null) {
def the_serial = serial;
serial = 1; // make it print
Message.Debug ($ "oops, our_serial=$the_serial, "
- "stack[0]=$(Passes.Solver.serial_stack[0]), "
- "stack[1]=$(Passes.Solver.serial_stack[1]), "
- "top=$(Passes.Solver.serial_stack_top), "
+ "stack[0]=$(Manager.Solver.serial_stack[0]), "
+ "stack[1]=$(Manager.Solver.serial_stack[1]), "
+ "top=$(Manager.Solver.serial_stack_top), "
"id=$id, this=$(this)");
assert (false);
}
@@ -932,13 +932,13 @@
CopyFrom (next);
store.next = reuse_queue;
reuse_queue = store;
- loop (Passes.Solver.serial_stack_top)
- } else if (Passes.Solver.serial_stack [i] == serial) {}
+ loop (Manager.Solver.serial_stack_top)
+ } else if (Manager.Solver.serial_stack [i] == serial) {}
else loop (i - 1)
}
- unless (Passes.Solver.top_serial == serial)
- loop (Passes.Solver.serial_stack_top)
+ unless (Manager.Solver.top_serial == serial)
+ loop (Manager.Solver.serial_stack_top)
}
@@ -972,11 +972,11 @@
WillWrite () : void
{
WillRead ();
- when (Passes.Solver.top_serial != serial) {
+ when (Manager.Solver.top_serial != serial) {
def tv = CopyTyVar (this);
next = tv;
CopyArrays ();
- serial = Passes.Solver.top_serial;
+ serial = Manager.Solver.top_serial;
}
}
@@ -1012,7 +1012,7 @@
static LocalError : bool
{
- get { Passes.Solver.CurrentMessenger.LocalError }
+ get { Manager.Solver.CurrentMessenger.LocalError }
}
#endregion
@@ -1046,7 +1046,7 @@
{
id = current_id;
++current_id;
- serial = Passes.Solver.top_serial;
+ serial = Manager.Solver.top_serial;
flags = Flags.IsFresh;
}
@@ -1057,7 +1057,7 @@
static this ()
{
- Passes.OnInit += fun () { reuse_queue = null; }
+ Manager.OnInit += fun () { reuse_queue = null; }
}
#endregion
Modified: nemerle/trunk/ncc/typing/TyVarEnv.n
==============================================================================
--- nemerle/trunk/ncc/typing/TyVarEnv.n (original)
+++ nemerle/trunk/ncc/typing/TyVarEnv.n Sun May 21 18:33:55 2006
@@ -46,14 +46,14 @@
private this (tv : Map [Name, StaticTyVar])
{
tyvars = tv;
- solver = Passes.Solver;
+ solver = Manager.Solver;
messenger = solver.CurrentMessenger;
}
public this ()
{
tyvars = Map ();
- solver = Passes.Solver;
+ solver = Manager.Solver;
messenger = solver.CurrentMessenger;
}
Modified: nemerle/trunk/ncc/typing/TypedTree.n
==============================================================================
--- nemerle/trunk/ncc/typing/TypedTree.n (original)
+++ nemerle/trunk/ncc/typing/TypedTree.n Sun May 21 18:33:55 2006
@@ -1015,7 +1015,7 @@
static this ()
{
- Passes.OnInit += fun () {
+ Manager.OnInit += fun () {
true_literal = null;
false_literal = null;
}
Modified: nemerle/trunk/ncc/typing/Typer-DelayedTyping.n
==============================================================================
--- nemerle/trunk/ncc/typing/Typer-DelayedTyping.n (original)
+++ nemerle/trunk/ncc/typing/Typer-DelayedTyping.n Sun May 21 18:33:55 2006
@@ -159,7 +159,7 @@
| _ => {}
}
- def solver = Passes.Solver;
+ def solver = Manager.Solver;
match (solver.dt_store.Find (this)) {
| Some (k') =>
Modified: nemerle/trunk/ncc/typing/Typer-OverloadSelection.n
==============================================================================
--- nemerle/trunk/ncc/typing/Typer-OverloadSelection.n (original)
+++ nemerle/trunk/ncc/typing/Typer-OverloadSelection.n Sun May 21 18:33:55 2006
@@ -141,10 +141,10 @@
def res =
try {
- Passes.Solver.PushState ();
+ Manager.Solver.PushState ();
loop (false, f1.Length - 1);
} finally {
- Passes.Solver.PopState ()
+ Manager.Solver.PopState ()
}
// Message.Debug($"X $o1==$(List.FromArray(f1)) != $o2==$(List.FromArray(f2))");
//Message.Debug ($"cmp:$o1,$o2 $(f1.Length) ==> $res");
Modified: nemerle/trunk/ncc/typing/Typer-PatternTyper.n
==============================================================================
--- nemerle/trunk/ncc/typing/Typer-PatternTyper.n (original)
+++ nemerle/trunk/ncc/typing/Typer-PatternTyper.n Sun May 21 18:33:55 2006
@@ -63,7 +63,7 @@
internal Transform (e : PT.PExpr) : PT.PExpr
{
- def messenger = Passes.Solver.CurrentMessenger;
+ def messenger = Manager.Solver.CurrentMessenger;
def is_assignment (expr) {
expr is PT.PExpr.Assign (PT.PExpr.Ref, _)
Modified: nemerle/trunk/ncc/typing/Typer.n
==============================================================================
--- nemerle/trunk/ncc/typing/Typer.n (original)
+++ nemerle/trunk/ncc/typing/Typer.n Sun May 21 18:33:55 2006
@@ -79,7 +79,7 @@
public this (m : MethodBuilder)
{
current_method_builder = m;
- solver = Passes.Solver;
+ solver = Manager.Solver;
current_type = m.DeclaringType;
parent_typer = None ();
env = current_type.GlobalEnv;
@@ -181,7 +181,7 @@
this (tb : TypeBuilder, tenv : TyVarEnv, fn : Fun_header, env : GlobalEnv)
{
- solver = Passes.Solver;
+ solver = Manager.Solver;
current_type = tb;
parent_typer = None ();
this.env = env;
@@ -2343,7 +2343,7 @@
lookup (possible_type);
}
- foreach (meth in Passes.LibrariesManager.GetExtensionMethods (name.Id, name.GetEnv (env)))
+ foreach (meth in Manager.LibrariesManager.GetExtensionMethods (name.Id, name.GetEnv (env)))
foreach (over in ConstructMethodOverload (meth, maybe_varargs = true)) {
over.ExtensionMethodObject = obj;
res ::= over;
@@ -2536,7 +2536,7 @@
meth.DeclaringType.DeclaringType.TyparmsCount =>
List.Iter2 (inferred.LastN (supplied.Length), supplied, constrain)
| _ =>
- ReportError (Passes.Solver.CurrentMessenger,
+ ReportError (Manager.Solver.CurrentMessenger,
$ "$meth takes $(inferred.Length) generic parameters, "
"while $(supplied.Length) was supplied")
}
@@ -2613,7 +2613,7 @@
List.Iter (binary, binary_operators.Add);
List.Iter (unary, unary_operators.Add);
- Passes.OnInit += Clear;
+ Manager.OnInit += Clear;
}
static Clear () : void
Modified: nemerle/trunk/ncc/typing/Typer2.n
==============================================================================
--- nemerle/trunk/ncc/typing/Typer2.n (original)
+++ nemerle/trunk/ncc/typing/Typer2.n Sun May 21 18:33:55 2006
@@ -70,7 +70,7 @@
top_level_fun = fn;
current_type = ty;
- messenger = Passes.Solver.CurrentMessenger;
+ messenger = Manager.Solver.CurrentMessenger;
inside_yielding_function = current_fun.yield_type != null;
}
@@ -144,12 +144,12 @@
else {
def is_ok =
try {
- Passes.Solver.PushState ();
+ Manager.Solver.PushState ();
List.ForAll2 (meth.GetHeader ().typarms, typarms, fun (st, tv) {
tv.Unify (MType.TyVarRef (st))
})
} finally {
- Passes.Solver.PopState ();
+ Manager.Solver.PopState ();
}
if (is_ok) {
List.Iter2 (meth.GetHeader ().typarms, typarms, fun (st, tv) {
@@ -571,7 +571,7 @@
IgnoreExpr (expr : TExpr) : TExpr
{
- def solver = Passes.Solver;
+ def solver = Manager.Solver;
solver.PushState ();
def ok = expr.Type.Unify (InternalType.Void);
solver.PopState ();
More information about the svn
mailing list