cleanup in the FCS vs\... service API implementation

Author: dsyme

src/fsharp/fsi/fsi.fs

@@ -8,7 +8,6 @@ module Microsoft.FSharp.Compiler.Interactive.Shell
 [<assembly: System.CLSCompliant(true)>]  
 do()
 
-open Internal.Utilities
 
 module Tc = Microsoft.FSharp.Compiler.TypeChecker
 
@@ -17,15 +16,12 @@ open System.Collections.Generic
 open System.Diagnostics
 open System.Globalization
 open System.Runtime.InteropServices
-open System.Runtime.CompilerServices
 open System.IO
 open System.Text
 open System.Threading
 open System.Reflection
-
 open Microsoft.FSharp.Compiler
 open Microsoft.FSharp.Compiler.AbstractIL
-open Microsoft.FSharp.Compiler.AbstractIL.IL
 open Microsoft.FSharp.Compiler.AbstractIL.Internal
 open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library
 open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX
@@ -42,16 +38,13 @@ open Microsoft.FSharp.Compiler.TypeChecker
 open Microsoft.FSharp.Compiler.Tast
 open Microsoft.FSharp.Compiler.Infos
 open Microsoft.FSharp.Compiler.Tastops
-open Microsoft.FSharp.Compiler.Optimizer
 open Microsoft.FSharp.Compiler.TcGlobals
 open Microsoft.FSharp.Compiler.CompileOps
 open Microsoft.FSharp.Compiler.Lexhelp
 open Microsoft.FSharp.Compiler.Layout
 open Microsoft.FSharp.Compiler.NameResolution
-open Microsoft.FSharp.Compiler.PostTypeCheckSemanticChecks
 open Microsoft.FSharp.Compiler.SourceCodeServices
-
-open Internal.Utilities.Collections
+open Internal.Utilities
 open Internal.Utilities.StructuredFormat
 
 //----------------------------------------------------------------------------
@@ -91,7 +84,6 @@ module internal Utilities =
 
     let ignoreAllErrors f = try f() with _ -> ()
 
-let referencedAssemblies = Dictionary<string, DateTime>()
 
 //----------------------------------------------------------------------------
 // Timing support
@@ -1679,6 +1671,8 @@ type internal FsiInteractionProcessor
                              lexResourceManager : LexResourceManager,
                              initialInteractiveState) = 
 
+    let referencedAssemblies = Dictionary<string, DateTime>()
+
     let mutable currState = initialInteractiveState
     let event = Event<unit>()
     let setCurrState s = currState <- s; event.Trigger()

src/fsharp/lib.fs

@@ -23,6 +23,8 @@ let condition _s =
     try (System.Environment.GetEnvironmentVariable(_s) <> null) with _ -> false
 #endif    
 
+let GetEnvInteger e dflt = match System.Environment.GetEnvironmentVariable(e) with null -> dflt | t -> try int t with _ -> dflt
+
 let dispose (x:System.IDisposable) = match x with null -> () | x -> x.Dispose()
 
 //-------------------------------------------------------------------------

src/fsharp/vs/Exprs.fs

@@ -1,17 +1,7 @@
-//----------------------------------------------------------------------------
-// Copyright (c) 2002-2012 Microsoft Corporation. 
-//
-// This source code is subject to terms and conditions of the Apache License, Version 2.0. A 
-// copy of the license can be found in the License.html file at the root of this distribution. 
-// By using this source code in any fashion, you are agreeing to be bound 
-// by the terms of the Apache License, Version 2.0.
-//
-// You must not remove this notice, or any other, from this software.
-//----------------------------------------------------------------------------
+// Copyright (c) Microsoft Corpration, Inc.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 namespace Microsoft.FSharp.Compiler.SourceCodeServices
 
-open Internal.Utilities
 open Microsoft.FSharp.Compiler
 open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library
 open Microsoft.FSharp.Compiler.AbstractIL.IL
@@ -23,6 +13,7 @@ open Microsoft.FSharp.Compiler.TcGlobals
 open Microsoft.FSharp.Compiler.Tastops
 open Microsoft.FSharp.Compiler.QuotationTranslator
 open Microsoft.FSharp.Compiler.TypeRelations
+open Internal.Utilities
 
 
 [<AutoOpen>]

src/fsharp/vs/Exprs.fsi

@@ -1,13 +1,4 @@
-//----------------------------------------------------------------------------
-// Copyright (c) 2002-2012 Microsoft Corporation. 
-//
-// This source code is subject to terms and conditions of the Apache License, Version 2.0. A 
-// copy of the license can be found in the License.html file at the root of this distribution. 
-// By using this source code in any fashion, you are agreeing to be bound 
-// by the terms of the Apache License, Version 2.0.
-//
-// You must not remove this notice, or any other, from this software.
-//----------------------------------------------------------------------------
+// Copyright (c) Microsoft Corpration, Inc.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 namespace Microsoft.FSharp.Compiler.SourceCodeServices