Skip to content

Commit de56d84

Browse files
fsgitfsgit
committed
integrate fsharp/fsharp master
2 parents d253f95 + 2a8ee31 commit de56d84

File tree

11 files changed

+15
-35
lines changed

11 files changed

+15
-35
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ packages
6464
docs/output
6565
*.bak
6666
temp/
67-
src/fsharp/fsi/FSIStrings.fs
67+
src/fsharp/fsi/FSIStrings.fs

‎samples/FscExe/Fsc.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
</Compile>
3232
<None Include="fsc.exe.config">
3333
<Link>Driver/fsc.exe.config</Link>
34+
<Link>fsc.exe.config</Link>
3435
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3536
</None>
3637
</ItemGroup>

‎src/absil/illib.fs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -972,6 +972,7 @@ module Shim =
972972
abstract FileDelete: fileName:string -> unit
973973
abstract AssemblyLoadFrom: fileName:string -> System.Reflection.Assembly
974974
abstract AssemblyLoad: assemblyName:System.Reflection.AssemblyName -> System.Reflection.Assembly
975+
975976
#if SILVERLIGHT
976977
open System.IO.IsolatedStorage
977978
open System.Windows

‎src/all-vs2012.sln‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2012
33
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Service", "fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj", "{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
44
EndProject
5-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.PowerPack.Metadata", "fsharp\FSharp.PowerPack.Metadata\FSharp.PowerPack.Metadata.fsproj", "{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}"
6-
EndProject
75
Global
86
GlobalSection(SolutionConfigurationPlatforms) = preSolution
97
Debug|Any CPU = Debug|Any CPU
@@ -23,16 +21,6 @@ Global
2321
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Mixed Platforms.ActiveCfg = Release|x86
2422
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Mixed Platforms.Build.0 = Release|x86
2523
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|x86.ActiveCfg = Release|x86
26-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
29-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
30-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Debug|x86.ActiveCfg = Debug|Any CPU
31-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Release|Any CPU.Build.0 = Release|Any CPU
33-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
34-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
35-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Release|x86.ActiveCfg = Release|Any CPU
3624
EndGlobalSection
3725
GlobalSection(SolutionProperties) = preSolution
3826
HideSolutionNode = FALSE

‎src/all-vs2013.sln‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ VisualStudioVersion = 12.0.21005.1
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Service", "fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj", "{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
66
EndProject
7-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.PowerPack.Metadata", "fsharp\FSharp.PowerPack.Metadata\FSharp.PowerPack.Metadata.fsproj", "{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}"
8-
EndProject
97
Global
108
GlobalSection(SolutionConfigurationPlatforms) = preSolution
119
Debug|Any CPU = Debug|Any CPU
@@ -25,16 +23,6 @@ Global
2523
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Mixed Platforms.ActiveCfg = Release|x86
2624
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Mixed Platforms.Build.0 = Release|x86
2725
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|x86.ActiveCfg = Release|x86
28-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
30-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
31-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
32-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Debug|x86.ActiveCfg = Debug|Any CPU
33-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
34-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Release|Any CPU.Build.0 = Release|Any CPU
35-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
36-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
37-
{0057B83F-130E-4E7C-B60C-9B4935D8BEE9}.Release|x86.ActiveCfg = Release|Any CPU
3826
EndGlobalSection
3927
GlobalSection(SolutionProperties) = preSolution
4028
HideSolutionNode = FALSE

‎src/fsharp/build.fs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1965,6 +1965,8 @@ type TcConfigBuilder =
19651965

19661966
/// if true - every expression in quotations will be augmented with full debug info (filename, location in file)
19671967
mutable emitDebugInfoInQuotations : bool
1968+
1969+
mutable exename : string option
19681970
}
19691971

19701972

@@ -2109,6 +2111,7 @@ type TcConfigBuilder =
21092111
sqmNumOfSourceFiles = 0
21102112
sqmSessionStartedTime = System.DateTime.Now.Ticks
21112113
emitDebugInfoInQuotations = false
2114+
exename = None
21122115
}
21132116

21142117
member tcConfigB.ResolveSourceFile(m,nm,pathLoadedFrom) =
@@ -3125,7 +3128,7 @@ let ParseInput (lexer,errorLogger:ErrorLogger,lexbuf:UnicodeLexing.Lexbuf,defaul
31253128
// - if you have a #line directive, e.g.
31263129
// # 1000 "Line01.fs"
31273130
// then it also asserts. But these are edge cases that can be fixed later, e.g. in bug 4651.
3128-
//System.Diagnostics.Debug.Assert(FileSystem.IsPathRootedShim(filename), sprintf "should be absolute: '%s'" filename)
3131+
//System.Diagnostics.Debug.Assert(System.IO.Path.IsPathRooted(filename), sprintf "should be absolute: '%s'" filename)
31293132
let lower = String.lowercase filename
31303133
// Delay sending errors and warnings until after the file is parsed. This gives us a chance to scrape the
31313134
// #nowarn declarations for the file

‎src/fsharp/build.fsi‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,8 @@ type TcConfigBuilder =
317317
mutable sqmSessionGuid : System.Guid option
318318
mutable sqmNumOfSourceFiles : int
319319
sqmSessionStartedTime : int64
320-
mutable emitDebugInfoInQuotations : bool }
320+
mutable emitDebugInfoInQuotations : bool
321+
mutable exename : string option }
321322

322323
static member CreateNew :
323324
defaultFSharpBinariesDir: string *

‎src/fsharp/fscopts.fs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@ let vsSpecificFlags (tcConfigB: TcConfigBuilder) =
461461
CompilerOption("flaterrors", tagNone, OptionUnit (fun () -> tcConfigB.flatErrors <- true), None, None);
462462
CompilerOption("sqmsessionguid", tagNone, OptionString (fun s -> tcConfigB.sqmSessionGuid <- try System.Guid(s) |> Some with e -> None), None, None);
463463
CompilerOption("gccerrors", tagNone, OptionUnit (fun () -> tcConfigB.errorStyle <- ErrorStyle.GccErrors), None, None);
464+
CompilerOption("exename", tagNone, OptionString (fun s -> tcConfigB.exename <- Some(s)), None, None);
464465
CompilerOption("maxerrors", tagInt, OptionInt (fun n -> tcConfigB.maxErrors <- n), None, None); ]
465466

466467

‎src/fsharp/fsi/fsi.fs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -552,8 +552,10 @@ type internal FsiCommandLineOptions(fsiConfig: FsiEvaluationSessionHostConfig, a
552552
#if SILVERLIGHT
553553
"fsi.exe"
554554
#else
555-
let currentProcess = System.Diagnostics.Process.GetCurrentProcess()
556-
Path.GetFileName(currentProcess.MainModule.FileName)
555+
match tcConfigB.exename with
556+
|Some(s) -> s
557+
|None -> let currentProcess = System.Diagnostics.Process.GetCurrentProcess()
558+
Path.GetFileName(currentProcess.MainModule.FileName)
557559
#endif
558560

559561

@@ -2773,7 +2775,6 @@ type FsiEvaluationSession with
27732775
static member GetDefaultConfiguration() =
27742776
FsiEvaluationSession.GetDefaultConfiguration(BuiltinFsiObjectImpl.BuiltinFsiObject, false)
27752777

2776-
27772778
/// Defines a read-only input stream used to feed content to the hosted F# Interactive dynamic compiler.
27782779
[<AllowNullLiteral>]
27792780
type CompilerInputStream() =

‎src/fsharp/vs/SimpleServices.fs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,6 @@ namespace Microsoft.FSharp.Compiler.SimpleSourceCodeServices
8686
async { let! items = results.GetDeclarations(Some info, line, col, source.[int line], qualifyingNames, partialName, hasChangedSinceLastTypeCheck)
8787
return [| for i in items.Items -> SimpleDeclaration(i.Name, (fun () -> formatTip i.DescriptionText xmlCommentRetriever)) |] }
8888

89-
member x.GetRawDeclarations(line, col, names, residue, formatter:ToolTipText->string[]) =
90-
async { let! items = results.GetDeclarations(Some info, line, col, source.[line], names, residue, hasChangedSinceLastTypeCheck)
91-
return [| for i in items.Items -> i.Name, (fun() -> formatter i.DescriptionText), i.Glyph |] }
92-
9389
/// Get the Visual Studio F1-help keyword for the item at the given position
9490
member x.GetF1Keyword(line, col, names) =
9591
results.GetF1Keyword(line, col, source.[int line], names)

0 commit comments

Comments
 (0)