ncave · alfonsogarciacaro · Oct 20, 2020 · Oct 21, 2020 · Oct 21, 2020 · Oct 21, 2020
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,18 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "${workspaceFolder}/artifacts/bin/fcs-test/Debug/netcoreapp3.1/fcs-test.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/fcs/fcs-test",
+            "console": "internalConsole",
+            "stopAtEntry": false
+        }
+    ]
+}
diff --git a/docs/compiler-guide.md b/docs/compiler-guide.md
@@ -18,8 +18,11 @@ There are several artifacts involved in the development of F#:
 
 The `FSharp.Compiler.Private` is by far the largest of these components and contains nearly all logic that `fsc` and `fsi` use. It is the primary subject of this guide.
 
-The F# compiler repositories are used to produce a range of different artifacts. For the purposes of this
-guide, the important ones are:
+## Resources for learning
+
+* Video: [Learn me some F# Compiler, an online chat with Vlad and Don](https://www.youtube.com/watch?v=-dKf15xSWPY)
+
+* Video: [Understanding the F# Optimizer, and online chat with Vlad and Don](https://www.youtube.com/watch?v=sfAe5lDue7k)
 
 ## Key data formats and representations
 
@@ -110,8 +113,10 @@ These and transformations used to build the following:
 ## Tools to help work with the compiler
 
 * [sharplab.io](https://sharplab.io/) can be used to decompile code.
+
 * [fantomas-tools](https://fsprojects.github.io/fantomas-tools/#/ast) can be used to view the Untyped & Typed Abstract Syntax Tree.
 
+
 ## Coding standards and idioms
 
 The compiler codebase uses various abbreviations. Here are some of the most common ones.

diff --git a/docs/fcs/caches.fsx b/docs/fcs/caches.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 Compiler Services: Notes on the FSharpChecker caches
 =================================================

diff --git a/docs/fcs/compiler.fsx b/docs/fcs/compiler.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 Hosted Compiler
 ===============

diff --git a/docs/fcs/corelib.fsx b/docs/fcs/corelib.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 Compiler Services: Notes on FSharp.Core.dll
 =================================================

diff --git a/docs/fcs/editor.fsx b/docs/fcs/editor.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 Compiler Services: Editor services
 ==================================
@@ -166,8 +166,7 @@ where we need to perform the completion.
 // Get declarations (autocomplete) for a location
 let decls = 
     checkFileResults.GetDeclarationListInfo
-      (Some parseFileResults, 7, inputLines.[6], PartialLongName.Empty 23, (fun () -> []), fun _ -> false)
-    |> Async.RunSynchronously
+      (Some parseFileResults, 7, inputLines.[6], PartialLongName.Empty 23, (fun () -> []))
 
 // Print the names of available items
 for item in decls.Items do
@@ -199,7 +198,6 @@ changes):
 // Get overloads of the String.Concat method
 let methods = 
     checkFileResults.GetMethods(5, 27, inputLines.[4], Some ["String"; "Concat"])
-    |> Async.RunSynchronously
 
 // Print concatenated parameter lists
 for mi in methods.Methods do

diff --git a/docs/fcs/filesystem.fsx b/docs/fcs/filesystem.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 Compiler Services: Virtualized File System
 ==========================================

diff --git a/docs/fcs/interactive.fsx b/docs/fcs/interactive.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../artifacts/bin/fcs/net461"
+#I "../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 Interactive Service: Embedding F# Interactive
 =============================================

diff --git a/docs/fcs/ja/compiler.fsx b/docs/fcs/ja/compiler.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 コンパイラの組み込み
 ====================

diff --git a/docs/fcs/ja/corelib.fsx b/docs/fcs/ja/corelib.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 コンパイラサービス: FSharp.Core.dll についてのメモ
 ==================================================

diff --git a/docs/fcs/ja/editor.fsx b/docs/fcs/ja/editor.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 コンパイラサービス: エディタサービス
 ====================================
@@ -29,6 +29,7 @@
 
 open System
 open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.Text
 
 // インタラクティブチェッカーのインスタンスを作成
 let checker = FSharpChecker.Create()
@@ -56,7 +57,7 @@ printfn "%s" msg.
 let inputLines = input.Split('\n')
 let file = "/home/user/Test.fsx"
 
-let projOptions, _errors1 = checker.GetProjectOptionsFromScript(file, input) |> Async.RunSynchronously
+let projOptions, _errors1 = checker.GetProjectOptionsFromScript(file, SourceText.ofString input) |> Async.RunSynchronously
 
 let parsingOptions, _errors2 = checker.GetParsingOptionsFromProjectOptions(projOptions)
 
@@ -73,7 +74,7 @@ let parsingOptions, _errors2 = checker.GetParsingOptionsFromProjectOptions(projO
 *)
 // パースを実行
 let parseFileResults =
-    checker.ParseFile(file, input, parsingOptions)
+    checker.ParseFile(file, SourceText.ofString input, parsingOptions)
     |> Async.RunSynchronously
 (**
 `TypeCheckResults` に備えられた興味深い機能の紹介に入る前に、
@@ -84,15 +85,15 @@ F#コードにエラーがあった場合も何らかの型チェックの結果
 
 // 型チェックを実行
 let checkFileAnswer = 
-    checker.CheckFileInProject(parseFileResults, file, 0, input, projOptions) 
+    checker.CheckFileInProject(parseFileResults, file, 0, SourceText.ofString input, projOptions) 
     |> Async.RunSynchronously
 
 (**
 あるいは `ParseAndCheckFileInProject` を使用すれば1つの操作で両方のチェックを行うことができます：
 *)
 
 let parseResults2, checkFileAnswer2 =
-    checker.ParseAndCheckFileInProject(file, 0, input, projOptions)
+    checker.ParseAndCheckFileInProject(file, 0, SourceText.ofString input, projOptions)
     |> Async.RunSynchronously
 
 (**
@@ -178,8 +179,7 @@ printfn "%A" tip
 // 特定の位置における宣言(自動補完)を取得する
 let decls = 
     checkFileResults.GetDeclarationListInfo
-      (Some parseFileResults, 7, inputLines.[6], PartialLongName.Empty 23, (fun _ -> []), fun _ -> false)
-      |> Async.RunSynchronously
+      (Some parseFileResults, 7, inputLines.[6], PartialLongName.Empty 23, (fun _ -> []))
 
 // 利用可能な項目を表示
 for item in decls.Items do
@@ -213,7 +213,7 @@ for item in decls.Items do
 *)
 //String.Concatメソッドのオーバーロードを取得する
 let methods = 
-    checkFileResults.GetMethods(5, 27, inputLines.[4], Some ["String"; "Concat"]) |> Async.RunSynchronously
+    checkFileResults.GetMethods(5, 27, inputLines.[4], Some ["String"; "Concat"])
 
 // 連結された引数リストを表示
 for mi in methods.Methods do

diff --git a/docs/fcs/ja/filesystem.fsx b/docs/fcs/ja/filesystem.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 コンパイラサービス: ファイルシステム仮想化
 ==========================================

diff --git a/docs/fcs/ja/interactive.fsx b/docs/fcs/ja/interactive.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 インタラクティブサービス: F# Interactiveの組み込み
 ==================================================
@@ -55,8 +55,8 @@ open System.IO
 open System.Text
 
 // 入出力のストリームを初期化
-let sbOut = new StringBuilder()
-let sbErr = new StringBuilder()
+let sbOut = StringBuilder()
+let sbErr = StringBuilder()
 let inStream = new StringReader("")
 let outStream = new StringWriter(sbOut)
 let errStream = new StringWriter(sbErr)

diff --git a/docs/fcs/ja/project.fsx b/docs/fcs/ja/project.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 コンパイラサービス: プロジェクトの分析
 ======================================
@@ -25,6 +25,7 @@
 open System
 open System.Collections.Generic
 open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.Text
 
 // インタラクティブチェッカーのインスタンスを作成
 let checker = FSharpChecker.Create()
@@ -157,7 +158,6 @@ let backgroundParseResults1, backgroundTypedParse1 =
 
 let xSymbol = 
     backgroundTypedParse1.GetSymbolUseAtLocation(9,9,"",["xxx"])
-    |> Async.RunSynchronously
 
 (**
 それぞれのシンボルに対して、シンボルへの参照を検索することもできます:
@@ -187,7 +187,7 @@ let allUsesOfAllSymbols = wholeProjectResults.GetAllUsesOfAllSymbols()
 
 *)
 let parseResults1, checkAnswer1 = 
-    checker.ParseAndCheckFileInProject(Inputs.fileName1, 0, Inputs.fileSource1, projectOptions) 
+    checker.ParseAndCheckFileInProject(Inputs.fileName1, 0, SourceText.ofString Inputs.fileSource1, projectOptions) 
     |> Async.RunSynchronously
 
 let checkResults1 = 
@@ -196,7 +196,7 @@ let checkResults1 =
     | _ -> failwith "想定外の終了状態です"
 
 let parseResults2, checkAnswer2 = 
-    checker.ParseAndCheckFileInProject(Inputs.fileName2, 0, Inputs.fileSource2, projectOptions)
+    checker.ParseAndCheckFileInProject(Inputs.fileName2, 0, SourceText.ofString Inputs.fileSource2, projectOptions)
     |> Async.RunSynchronously
 
 let checkResults2 = 
@@ -210,7 +210,6 @@ let checkResults2 =
 
 let xSymbol2 = 
     checkResults1.GetSymbolUseAtLocation(9,9,"",["xxx"]) 
-    |> Async.RunSynchronously
 
 let usesOfXSymbol2 = wholeProjectResults.GetUsesOfSymbol(xSymbol2.Value.Symbol)
 

diff --git a/docs/fcs/ja/symbols.fsx b/docs/fcs/ja/symbols.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 コンパイラサービス: シンボルの処理
 ==================================
@@ -22,6 +22,7 @@
 open System
 open System.IO
 open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.Text
 
 // インタラクティブチェッカーのインスタンスを作成
 let checker = FSharpChecker.Create()
@@ -77,7 +78,7 @@ type C() =
     member x.P = 1
       """
 let parseFileResults, checkFileResults = 
-    parseAndTypeCheckSingleFile(file, input2)
+    parseAndTypeCheckSingleFile(file, SourceText.ofString input2)
 
 (**
 これでコードに対する部分的なアセンブリのシグネチャが取得できるようになります:
@@ -204,7 +205,7 @@ for assembly in projectContext.GetReferencedAssemblies() do
 *)
 let parseAndCheckScript (file, input) = 
     let projOptions, errors = 
-        checker.GetProjectOptionsFromScript(file, input)
+        checker.GetProjectOptionsFromScript(file, SourceText.ofString input)
         |> Async.RunSynchronously
 
     let projResults = 

diff --git a/docs/fcs/ja/tokenizer.fsx b/docs/fcs/ja/tokenizer.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 コンパイラサービス：F#トークナイザを使用する
 ============================================

diff --git a/docs/fcs/ja/untypedtree.fsx b/docs/fcs/ja/untypedtree.fsx
@@ -1,5 +1,5 @@
 (*** hide ***)
-#I "../../../../artifacts/bin/fcs/net461"
+#I "../../../artifacts/bin/FSharp.Compiler.Service/Debug/netstandard2.0"
 (**
 コンパイラサービス：型無し構文木の処理
 ======================================
@@ -42,6 +42,7 @@
 #r "FSharp.Compiler.Service.dll"
 open System
 open FSharp.Compiler.SourceCodeServices
+open FSharp.Compiler.Text
 (**
 
 ### 型無しパースの実行
@@ -70,14 +71,14 @@ let getUntypedTree (file, input) =
   // 1つのスクリプトファイルから推測される「プロジェクト」用の
   // コンパイラオプションを取得する
   let projOptions, errors =
-      checker.GetProjectOptionsFromScript(file, input) 
+      checker.GetProjectOptionsFromScript(file, SourceText.ofString input) 
       |> Async.RunSynchronously
 
   let parsingOptions, _errors = checker.GetParsingOptionsFromProjectOptions(projOptions)
 
   // コンパイラの第1フェーズを実行する
   let untypedRes = 
-      checker.ParseFile(file, input, parsingOptions) 
+      checker.ParseFile(file, SourceText.ofString input, parsingOptions) 
       |> Async.RunSynchronously
 
   match untypedRes.ParseTree with
@@ -101,7 +102,7 @@ ASTを理解するには
 
 ASTに関連する要素は以下の名前空間に含まれています:
 *)
-open FSharp.Compiler.Ast
+open FSharp.Compiler.SyntaxTree
 (**
 
 ASTを処理する場合、異なる文法的要素に対するパターンマッチを行うような