Skip to content

Commit

Permalink
Suggested namespace rename (#6248)
Browse files Browse the repository at this point in the history
* Microsoft.FSharp.Comiler --> FSharp.Compiler

* Microsoft.FSharp.Build --> FSharp.Build

* fix small mistakes

* fix build

* fix flakey test (?)
  • Loading branch information
dsyme authored Feb 20, 2019
1 parent ec04e47 commit a26d32a
Show file tree
Hide file tree
Showing 342 changed files with 1,853 additions and 1,814 deletions.
4 changes: 2 additions & 2 deletions benchmarks/CompilerServiceBenchmarks/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
open System.IO
open BenchmarkDotNet.Attributes
open BenchmarkDotNet.Running
open Microsoft.FSharp.Compiler.ErrorLogger
open Microsoft.FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.ErrorLogger
open FSharp.Compiler.SourceCodeServices
open System.Text

[<ClrJob(baseline = true)>]
Expand Down
4 changes: 2 additions & 2 deletions fcs/FSharp.Compiler.Service.ProjectCracker/ProjectCracker.fs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Microsoft.FSharp.Compiler.SourceCodeServices
namespace FSharp.Compiler.SourceCodeServices

#if !NETSTANDARD1_6
open System.Runtime.Serialization.Json
Expand Down Expand Up @@ -69,7 +69,7 @@ type ProjectCracker =
yield v
|]

let ret, opts = Microsoft.FSharp.Compiler.SourceCodeServices.ProjectCrackerTool.ProjectCrackerTool.crackOpen arguments
let ret, opts = FSharp.Compiler.SourceCodeServices.ProjectCrackerTool.ProjectCrackerTool.crackOpen arguments
ignore ret
#else
let arguments = new StringBuilder()
Expand Down
2 changes: 1 addition & 1 deletion fcs/FSharp.Compiler.Service.ProjectCrackerTool/Program.fs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Microsoft.FSharp.Compiler.SourceCodeServices.ProjectCrackerTool
namespace FSharp.Compiler.SourceCodeServices.ProjectCrackerTool

open System
open System.Reflection
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Microsoft.FSharp.Compiler.SourceCodeServices.ProjectCrackerTool
namespace FSharp.Compiler.SourceCodeServices.ProjectCrackerTool

[<CLIMutable>]
type ProjectOptions =
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Microsoft.FSharp.Compiler.SourceCodeServices.ProjectCrackerTool
namespace FSharp.Compiler.SourceCodeServices.ProjectCrackerTool

open System
open System.IO
Expand Down
6 changes: 3 additions & 3 deletions fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@
<LogicalName>FSStrings.resources</LogicalName>
</EmbeddedResource>
<FsYacc Include="$(FSharpSourcesRoot)\absil\ilpars.fsy">
<OtherFlags>--module Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser --open Microsoft.FSharp.Compiler.AbstractIL --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing</OtherFlags>
<OtherFlags>--module FSharp.Compiler.AbstractIL.Internal.AsciiParser --open FSharp.Compiler.AbstractIL --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing</OtherFlags>
<Link>ilpars.fsy</Link>
</FsYacc>
<FsYacc Include="$(FSharpSourcesRoot)\fsharp\pars.fsy">
<OtherFlags>--module Microsoft.FSharp.Compiler.Parser --open Microsoft.FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing</OtherFlags>
<OtherFlags>--module FSharp.Compiler.Parser --open FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing</OtherFlags>
<Link>pars.fsy</Link>
</FsYacc>
<Compile Include="$(FSharpSourcesRoot)/fsharp/Logger.fsi">
Expand Down Expand Up @@ -294,7 +294,7 @@
<Link>ParserAndUntypedAST/pplex.fsl</Link>
</FsLex>
<FsYacc Include="$(FSharpSourcesRoot)\fsharp\pppars.fsy">
<OtherFlags>--module Microsoft.FSharp.Compiler.PPParser --open Microsoft.FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing</OtherFlags>
<OtherFlags>--module FSharp.Compiler.PPParser --open FSharp.Compiler --internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing</OtherFlags>
<Link>ParserAndUntypedAST/pppars.fsy</Link>
</FsYacc>
<Compile Include="$(FSharpSourcesRoot)/fsharp/UnicodeLexing.fsi">
Expand Down
2 changes: 1 addition & 1 deletion fcs/docsrc/content/compiler.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ First, we need to reference the libraries that contain F# interactive service:

#r "FSharp.Compiler.Service.dll"
open System.IO
open Microsoft.FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.SourceCodeServices

// Create an interactive checker instance
let checker = FSharpChecker.Create()
Expand Down
4 changes: 2 additions & 2 deletions fcs/docsrc/content/editor.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ of `InteractiveChecker`:
#r "FSharp.Compiler.Service.dll"

open System
open Microsoft.FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.SourceCodeServices

// Create an interactive checker instance
let checker = FSharpChecker.Create()
Expand Down Expand Up @@ -127,7 +127,7 @@ identifier (the other option lets you get tooltip with full assembly location wh
*)
// Get tag of the IDENT token to be used as the last argument
open Microsoft.FSharp.Compiler
open FSharp.Compiler
let identToken = FSharpTokenTag.Identifier

// Get tool tip at the specified location
Expand Down
4 changes: 2 additions & 2 deletions fcs/docsrc/content/filesystem.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ open System
open System.IO
open System.Collections.Generic
open System.Text
open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library
open FSharp.Compiler.AbstractIL.Internal.Library

let defaultFileSystem = Shim.FileSystem

Expand Down Expand Up @@ -90,7 +90,7 @@ Doing a compilation with the FileSystem
---------------------------------------
*)
open Microsoft.FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.SourceCodeServices

let checker = FSharpChecker.Create()

Expand Down
6 changes: 3 additions & 3 deletions fcs/docsrc/content/interactive.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ First, we need to reference the libraries that contain F# interactive service:
*)

#r "FSharp.Compiler.Service.dll"
open Microsoft.FSharp.Compiler.SourceCodeServices
open Microsoft.FSharp.Compiler.Interactive.Shell
open FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.Interactive.Shell

(**
To communicate with F# interactive, we need to create streams that represent input and
Expand Down Expand Up @@ -225,7 +225,7 @@ based on the declarations executed so far.
You can also request declaration list information, tooltip text and symbol resolution:
*)
open Microsoft.FSharp.Compiler
open FSharp.Compiler

// get a tooltip
checkResults.GetToolTipTextAlternate(1, 2, "xxx + xx", ["xxx"], FSharpTokenTag.IDENT)
Expand Down
2 changes: 1 addition & 1 deletion fcs/docsrc/content/ja/compiler.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*)

#r "FSharp.Compiler.Service.dll"
open Microsoft.FSharp.Compiler.SimpleSourceCodeServices
open FSharp.Compiler.SimpleSourceCodeServices
open System.IO

let scs = SimpleSourceCodeServices()
Expand Down
4 changes: 2 additions & 2 deletions fcs/docsrc/content/ja/editor.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#r "FSharp.Compiler.Service.dll"

open System
open Microsoft.FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.SourceCodeServices

// インタラクティブチェッカーのインスタンスを作成
let checker = FSharpChecker.Create()
Expand Down Expand Up @@ -137,7 +137,7 @@ match checkFileAnswer with
*)
// 最後の引数に指定する、IDENTトークンのタグを取得
open Microsoft.FSharp.Compiler
open FSharp.Compiler
let identToken = Parser.tagOfToken(Parser.token.IDENT(""))

// 特定の位置におけるツールチップを取得
Expand Down
4 changes: 2 additions & 2 deletions fcs/docsrc/content/ja/filesystem.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ open System
open System.IO
open System.Collections.Generic
open System.Text
open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library
open FSharp.Compiler.AbstractIL.Internal.Library

let defaultFileSystem = Shim.FileSystem

Expand Down Expand Up @@ -90,7 +90,7 @@ FileSystemによるコンパイルの実行
--------------------------------
*)
open Microsoft.FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.SourceCodeServices

let checker = FSharpChecker.Create()
let projectOptions =
Expand Down
6 changes: 3 additions & 3 deletions fcs/docsrc/content/ja/interactive.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ F# Interactiveの開始
*)

#r "FSharp.Compiler.Service.dll"
open Microsoft.FSharp.Compiler.SourceCodeServices
open Microsoft.FSharp.Compiler.Interactive.Shell
open FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.Interactive.Shell

(**
F# Interactiveとやりとりするには、入出力を表すストリームを作成する必要があります。
Expand Down Expand Up @@ -243,7 +243,7 @@ checkResults.Errors.Length // 1
要求することもできます:
*)
open Microsoft.FSharp.Compiler
open FSharp.Compiler

// ツールチップを取得する
checkResults.GetToolTipTextAlternate(1, 2, "xxx + xx", ["xxx"], FSharpTokenTag.IDENT)
Expand Down
2 changes: 1 addition & 1 deletion fcs/docsrc/content/ja/project.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

open System
open System.Collections.Generic
open Microsoft.FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.SourceCodeServices

// インタラクティブチェッカーのインスタンスを作成
let checker = FSharpChecker.Create()
Expand Down
2 changes: 1 addition & 1 deletion fcs/docsrc/content/ja/symbols.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

open System
open System.IO
open Microsoft.FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.SourceCodeServices

// インタラクティブチェッカーのインスタンスを作成
let checker = FSharpChecker.Create()
Expand Down
2 changes: 1 addition & 1 deletion fcs/docsrc/content/ja/tokenizer.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ F#のソースコードに対して、トークナイザは
`SourceCodeServices` 名前空間をオープンします:
*)
#r "FSharp.Compiler.Service.dll"
open Microsoft.FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.SourceCodeServices
(**
すると `FSharpSourceTokenizer` のインスタンスを作成できるようになります。
このクラスには2つの引数を指定します。
Expand Down
4 changes: 2 additions & 2 deletions fcs/docsrc/content/ja/untypedtree.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*)
#r "FSharp.Compiler.Service.dll"
open System
open Microsoft.FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.SourceCodeServices
(**
### 型無しパースの実行
Expand Down Expand Up @@ -101,7 +101,7 @@ ASTを理解するには
ASTに関連する要素は以下の名前空間に含まれています:
*)
open Microsoft.FSharp.Compiler.Ast
open FSharp.Compiler.Ast
(**
ASTを処理する場合、異なる文法的要素に対するパターンマッチを行うような
Expand Down
2 changes: 1 addition & 1 deletion fcs/docsrc/content/project.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ of `InteractiveChecker`:

open System
open System.Collections.Generic
open Microsoft.FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.SourceCodeServices

// Create an interactive checker instance
let checker = FSharpChecker.Create()
Expand Down
2 changes: 1 addition & 1 deletion fcs/docsrc/content/symbols.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ of `FSharpChecker`:

open System
open System.IO
open Microsoft.FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.SourceCodeServices

// Create an interactive checker instance
let checker = FSharpChecker.Create()
Expand Down
2 changes: 1 addition & 1 deletion fcs/docsrc/content/tokenizer.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ To use the tokenizer, reference `FSharp.Compiler.Service.dll` and open the
`SourceCodeServices` namespace:
*)
#r "FSharp.Compiler.Service.dll"
open Microsoft.FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.SourceCodeServices
(**
Now you can create an instance of `FSharpSourceTokenizer`. The class takes two
arguments - the first is the list of defined symbols and the second is the
Expand Down
2 changes: 1 addition & 1 deletion fcs/docsrc/content/typedtree.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ To use the interactive checker, reference `FSharp.Compiler.Service.dll` and open
#r "FSharp.Compiler.Service.dll"
open System
open System.IO
open Microsoft.FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.SourceCodeServices
(**
### Checking code
Expand Down
4 changes: 2 additions & 2 deletions fcs/docsrc/content/untypedtree.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ To use the interactive checker, reference `FSharp.Compiler.Service.dll` and open
*)
#r "FSharp.Compiler.Service.dll"
open System
open Microsoft.FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.SourceCodeServices
(**
### Performing untyped parse
Expand Down Expand Up @@ -83,7 +83,7 @@ code](https://github.com/fsharp/fsharp/blob/master/src/fsharp/ast.fs#L464).
The relevant parts are in the following namespace:
*)
open Microsoft.FSharp.Compiler.Ast
open FSharp.Compiler.Ast
(**
When processing the AST, you will typically write a number of mutually recursive functions
Expand Down
6 changes: 3 additions & 3 deletions fcs/samples/EditorService/Program.fs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Open the namespace with InteractiveChecker type
open System
open Microsoft.FSharp.Compiler
open Microsoft.FSharp.Compiler.SourceCodeServices
open Microsoft.FSharp.Compiler.QuickParse
open FSharp.Compiler
open FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.QuickParse

// Create an interactive checker instance (ignore notifications)
let checker = FSharpChecker.Create()
Expand Down
16 changes: 8 additions & 8 deletions fcs/samples/FscExe/FscMain.fs
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.

module internal Microsoft.FSharp.Compiler.CommandLineMain
module internal FSharp.Compiler.CommandLineMain

open System
open System.Diagnostics
open System.IO
open System.Reflection
open System.Runtime.CompilerServices
open Microsoft.FSharp.Compiler
open Microsoft.FSharp.Compiler.SourceCodeServices
open Microsoft.FSharp.Compiler.AbstractIL.IL // runningOnMono
open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library
open Microsoft.FSharp.Compiler.ErrorLogger
open Microsoft.FSharp.Compiler.Range
open FSharp.Compiler
open FSharp.Compiler.SourceCodeServices
open FSharp.Compiler.AbstractIL.IL // runningOnMono
open FSharp.Compiler.AbstractIL.Internal.Library
open FSharp.Compiler.ErrorLogger
open FSharp.Compiler.Range

#if RESIDENT_COMPILER
type TypeInThisAssembly() = member x.Dummy = 1
Expand Down Expand Up @@ -307,5 +307,5 @@ let main(argv) =
try
Driver.main(Array.append [| "fsc.exe" |] argv);
with e ->
errorRecovery e Microsoft.FSharp.Compiler.Range.range0;
errorRecovery e FSharp.Compiler.Range.range0;
1
2 changes: 1 addition & 1 deletion fcs/samples/FsiExe/console.fs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.

namespace Microsoft.FSharp.Compiler.Interactive
namespace FSharp.Compiler.Interactive

open System
open System.Text
Expand Down
12 changes: 6 additions & 6 deletions fcs/samples/FsiExe/fsimain.fs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
//----------------------------------------------------------------------------


module internal Sample.Microsoft.FSharp.Compiler.Interactive.Main
module internal Sample.FSharp.Compiler.Interactive.Main

open System
open System.Globalization
Expand All @@ -22,9 +22,9 @@ open System.Reflection
open System.Threading
open System.Windows.Forms

open Microsoft.FSharp.Compiler.Interactive.Shell
open Microsoft.FSharp.Compiler.Interactive
open Microsoft.FSharp.Compiler
open FSharp.Compiler.Interactive.Shell
open FSharp.Compiler.Interactive
open FSharp.Compiler

#nowarn "55"

Expand Down Expand Up @@ -53,7 +53,7 @@ let WinFormsEventLoop(lcid : int option) =
do mainForm.DoCreateHandle();
// Set the default thread exception handler
let restart = ref false
{ new Microsoft.FSharp.Compiler.Interactive.IEventLoop with
{ new FSharp.Compiler.Interactive.IEventLoop with
member x.Run() =
restart := false
Application.Run()
Expand Down Expand Up @@ -151,7 +151,7 @@ let MainMain argv =
#endif

try
let console = new Microsoft.FSharp.Compiler.Interactive.ReadLineConsole()
let console = new FSharp.Compiler.Interactive.ReadLineConsole()
let getConsoleReadLine (probeToSeeIfConsoleWorks) =
let consoleIsOperational =
if probeToSeeIfConsoleWorks then
Expand Down
2 changes: 1 addition & 1 deletion fcs/samples/FsiExe/fsiserver.fs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.

//[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>] // avoid calling the type "Shared" which is keyword in some languages
namespace Microsoft.FSharp.Compiler.Server.Shared
namespace FSharp.Compiler.Server.Shared

// For FSI VS plugin, require FSI to provide services:
// e.g.
Expand Down
Loading

0 comments on commit a26d32a

Please sign in to comment.