Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf125901

Browse files
committed
merged with upstream
2 parentsc70d57d +a443cf5 commitf125901

File tree

34 files changed

+753
-541
lines changed

34 files changed

+753
-541
lines changed

‎src/fsharp.sln‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
3+
# Visual Studio 2013
4+
VisualStudioVersion =12.0.30110.0
5+
MinimumVisualStudioVersion =10.0.40219.1
46
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Solution Items","Solution Items","{D78E3B57-DAD1-4FE1-9DC8-84F7847B0C77}"
57
ProjectSection(SolutionItems) =preProject
68
fsharp-compiler-build.proj=fsharp-compiler-build.proj
@@ -35,46 +37,44 @@ Global
3537
Release|Any CPU=Release|Any CPU
3638
EndGlobalSection
3739
GlobalSection(ProjectConfigurationPlatforms) =postSolution
40+
{C94C257C-3C0A-4858-B5D8-D746498D1F08}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
41+
{C94C257C-3C0A-4858-B5D8-D746498D1F08}.Debug|Any CPU.Build.0=Debug|Any CPU
42+
{C94C257C-3C0A-4858-B5D8-D746498D1F08}.Release|Any CPU.ActiveCfg=Release|Any CPU
43+
{C94C257C-3C0A-4858-B5D8-D746498D1F08}.Release|Any CPU.Build.0=Release|Any CPU
3844
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
3945
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Debug|Any CPU.Build.0=Debug|Any CPU
4046
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Any CPU.ActiveCfg=Release|Any CPU
4147
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Any CPU.Build.0=Release|Any CPU
42-
{649FA588-F02E-457C-9FCF-87E46407481E}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
43-
{649FA588-F02E-457C-9FCF-87E46407481E}.Debug|Any CPU.Build.0=Debug|Any CPU
44-
{649FA588-F02E-457C-9FCF-87E46407481E}.Release|Any CPU.ActiveCfg=Release|Any CPU
45-
{649FA588-F02E-457C-9FCF-87E46407481E}.Release|Any CPU.Build.0=Release|Any CPU
48+
{DED3BBD7-53F4-428A-8C9F-27968E768605}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
49+
{DED3BBD7-53F4-428A-8C9F-27968E768605}.Debug|Any CPU.Build.0=Debug|Any CPU
50+
{DED3BBD7-53F4-428A-8C9F-27968E768605}.Release|Any CPU.ActiveCfg=Release|Any CPU
51+
{DED3BBD7-53F4-428A-8C9F-27968E768605}.Release|Any CPU.Build.0=Release|Any CPU
4652
{702A7979-BCF9-4C41-853E-3ADFC9897890}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
4753
{702A7979-BCF9-4C41-853E-3ADFC9897890}.Debug|Any CPU.Build.0=Debug|Any CPU
4854
{702A7979-BCF9-4C41-853E-3ADFC9897890}.Release|Any CPU.ActiveCfg=Release|Any CPU
4955
{702A7979-BCF9-4C41-853E-3ADFC9897890}.Release|Any CPU.Build.0=Release|Any CPU
50-
{88E2D422-6852-46E3-A740-83E391DC7973}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
51-
{88E2D422-6852-46E3-A740-83E391DC7973}.Debug|Any CPU.Build.0=Debug|Any CPU
52-
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|Any CPU.ActiveCfg=Release|Any CPU
53-
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|Any CPU.Build.0=Release|Any CPU
54-
{C94C257C-3C0A-4858-B5D8-D746498D1F08}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
55-
{C94C257C-3C0A-4858-B5D8-D746498D1F08}.Debug|Any CPU.Build.0=Debug|Any CPU
56-
{C94C257C-3C0A-4858-B5D8-D746498D1F08}.Release|Any CPU.ActiveCfg=Release|Any CPU
57-
{C94C257C-3C0A-4858-B5D8-D746498D1F08}.Release|Any CPU.Build.0=Release|Any CPU
58-
{D0E98C0D-490B-4C61-9329-0862F6E87645}.Debug|Any CPU.ActiveCfg=Debug|x86
59-
{D0E98C0D-490B-4C61-9329-0862F6E87645}.Debug|Any CPU.Build.0=Debug|x86
60-
{D0E98C0D-490B-4C61-9329-0862F6E87645}.Release|Any CPU.ActiveCfg=Release|x86
61-
{D0E98C0D-490B-4C61-9329-0862F6E87645}.Release|Any CPU.Build.0=Release|x86
56+
{D0E98C0D-490B-4C61-9329-0862F6E87645}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
57+
{D0E98C0D-490B-4C61-9329-0862F6E87645}.Debug|Any CPU.Build.0=Debug|Any CPU
58+
{D0E98C0D-490B-4C61-9329-0862F6E87645}.Release|Any CPU.ActiveCfg=Release|Any CPU
59+
{D0E98C0D-490B-4C61-9329-0862F6E87645}.Release|Any CPU.Build.0=Release|Any CPU
60+
{649FA588-F02E-457C-9FCF-87E46407481E}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
61+
{649FA588-F02E-457C-9FCF-87E46407481E}.Debug|Any CPU.Build.0=Debug|Any CPU
62+
{649FA588-F02E-457C-9FCF-87E46407481E}.Release|Any CPU.ActiveCfg=Release|Any CPU
63+
{649FA588-F02E-457C-9FCF-87E46407481E}.Release|Any CPU.Build.0=Release|Any CPU
6264
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
6365
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Debug|Any CPU.Build.0=Debug|Any CPU
6466
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Release|Any CPU.ActiveCfg=Release|Any CPU
6567
{D5870CF0-ED51-4CBC-B3D7-6F56DA84AC06}.Release|Any CPU.Build.0=Release|Any CPU
66-
{DED3BBD7-53F4-428A-8C9F-27968E768605}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
67-
{DED3BBD7-53F4-428A-8C9F-27968E768605}.Debug|Any CPU.Build.0=Debug|Any CPU
68-
{DED3BBD7-53F4-428A-8C9F-27968E768605}.Release|Any CPU.ActiveCfg=Release|Any CPU
69-
{DED3BBD7-53F4-428A-8C9F-27968E768605}.Release|Any CPU.Build.0=Release|Any CPU
68+
{88E2D422-6852-46E3-A740-83E391DC7973}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
69+
{88E2D422-6852-46E3-A740-83E391DC7973}.Debug|Any CPU.Build.0=Debug|Any CPU
70+
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|Any CPU.ActiveCfg=Release|Any CPU
71+
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|Any CPU.Build.0=Release|Any CPU
7072
{CB7D20C4-6506-406D-9144-5342C3595F03}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
7173
{CB7D20C4-6506-406D-9144-5342C3595F03}.Debug|Any CPU.Build.0=Debug|Any CPU
7274
{CB7D20C4-6506-406D-9144-5342C3595F03}.Release|Any CPU.ActiveCfg=Release|Any CPU
7375
{CB7D20C4-6506-406D-9144-5342C3595F03}.Release|Any CPU.Build.0=Release|Any CPU
74-
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
75-
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}.Debug|Any CPU.Build.0=Debug|Any CPU
76-
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}.Release|Any CPU.ActiveCfg=Release|Any CPU
77-
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}.Release|Any CPU.Build.0=Release|Any CPU
76+
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}.Debug|Any CPU.ActiveCfg=Debug|x86
77+
{8B3E283D-B5FE-4055-9D80-7E3A32F3967B}.Release|Any CPU.ActiveCfg=Release|x86
7878
EndGlobalSection
7979
GlobalSection(SolutionProperties) =preSolution
8080
HideSolutionNode =FALSE

‎src/fsharp/csolve.fs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1910,16 +1910,11 @@ and ArgsMustSubsumeOrConvert
19101910
(callerArg:CallerArg<'T>)=
19111911

19121912
letg= csenv.g
1913-
letamap= csenv.amap
19141913
letm= callerArg.Range
19151914
letcalledArgTy= AdjustCalledArgType csenv.InfoReader isConstraint calledArg callerArg
19161915
SolveTypSubsumesTypWithReport csenv ndeep m trace calledArgTy callerArg.Type++(fun()->
19171916

1918-
if calledArg.IsParamArray&&
1919-
isAppTy g calledArgTy&&
1920-
(let_,tinstf= destAppTy g calledArgTy
1921-
tinstf.Length=1&&
1922-
TypesFeasiblyEquiv ndeep g amap m(List.head tinstf) callerArg.Type)
1917+
if calledArg.IsParamArray&&(isArray1DTy g calledArgTy)&&not(isArray1DTy g callerArg.Type)
19231918
then
19241919
ErrorD(Error(FSComp.SR.csMethodExpectsParams(),m))
19251920
else

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp