Thanks to visit codestin.com
Credit goes to github.com

Skip to content

integrate fsharp master #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Apr 29, 2017
Merged

integrate fsharp master #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0ec9eca
Fix 2823 - don't look in mono/4.5-api for F# interactive code
dsyme Apr 29, 2017
baa98f1
remove IVT for old things (#2946)
dsyme Apr 29, 2017
d2e4570
remove incorrect use of pointer eqquality (#2945)
dsyme Apr 29, 2017
2f78fc2
Fix 2823 - don't look in mono/4.5-api for F# interactive code (#2949)
dsyme Apr 29, 2017
b260d6a
integrate visualfsharp master
dsyme Apr 29, 2017
ae3f01e
Merge branch 'master' of https://github.com/Microsoft/visualfsharp in…
dsyme Apr 29, 2017
4c57bdd
additional fix
dsyme Apr 29, 2017
f4f1408
fixes to mono paths
dsyme Apr 29, 2017
83c8427
Merge branch 'master' of https://github.com/Microsoft/visualfsharp in…
dsyme Apr 29, 2017
0e8b9d0
fix build
dsyme Apr 29, 2017
2494026
Merge branch 'master' of https://github.com/Microsoft/visualfsharp in…
dsyme Apr 29, 2017
617a3c5
Merge pull request #736 from dsyme/i7
dsyme Apr 29, 2017
c6bb2d6
Merge branch 'master' of https://github.com/fsharp/fsharp
dsyme Apr 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions src/fsharp/CompileOps.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2848,15 +2848,26 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
[ let runtimeRoot = System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()
let runtimeRootWithoutSlash = runtimeRoot.TrimEnd('/', '\\')
let api = runtimeRootWithoutSlash + "-api"
yield runtimeRoot // The default FSharp.Core is found in lib/mono/4.5
if Directory.Exists(api) then
yield api
let facades = Path.Combine(api, "Facades")
if Directory.Exists(facades) then
yield facades
let facades = Path.Combine(runtimeRoot, "Facades")
if Directory.Exists(facades) then
yield facades
let rootFacades = Path.Combine(runtimeRootWithoutSlash, "Facades")
let apiFacades = Path.Combine(api, "Facades")
match tcConfig.resolutionEnvironment with
#if !FSI_TODO_NETCORE
// For F# Interactive code we must inly reference impementation assemblies
| ReferenceResolver.RuntimeLike ->
yield runtimeRoot
if Directory.Exists(rootFacades) then
yield rootFacades // System.Runtime.dll is in /usr/lib/mono/4.5/Facades
#endif
| _ ->
// The default FSharp.Core is found in lib/mono/4.5
yield runtimeRoot
if Directory.Exists(rootFacades) then
yield rootFacades // System.Runtime.dll is in /usr/lib/mono/4.5/Facades
// It's not clear why we would need to reference the 4.5-api directory.
if Directory.Exists(api) then
yield api
if Directory.Exists(apiFacades) then
yield apiFacades
]
else
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/ConstraintSolver.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2365,7 +2365,7 @@ and ResolveOverloading
let bestMethods =
applicableMeths |> List.choose (fun candidate ->
if applicableMeths |> List.forall (fun other ->
candidate === other || // REVIEW: change this needless use of pointer equality to be an index comparison
p13 candidate === p13 other || // REVIEW: change this needless use of pointer equality to be an index comparison
let res = better candidate other
//eprintfn "\n-------\nCandidate: %s\nOther: %s\nResult: %d\n" (NicePrint.stringOfMethInfo amap m denv (fst candidate).Method) (NicePrint.stringOfMethInfo amap m denv (fst other).Method) res
res > 0) then
Expand Down