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

Commit0a30282

Browse files
committed
Merge branch 'fsharp4' ofhttps://git01.codeplex.com/visualfsharp into auto-quote
2 parents32307ff +51d7b62 commit0a30282

File tree

243 files changed

+7499
-1766
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

243 files changed

+7499
-1766
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,11 @@ tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012
5858
obj
5959
extras
6060
ossreadme*.txt
61+
tests/fsharp/typecheck/sigs/*.exe
6162
tests/fsharp/typecheck/sigs/*.diff
6263
tests/fsharp/typecheck/sigs/*.err
6364
tests/fsharp/typecheck/sigs/*.vsdiff
65+
tests/fsharp/typecheck/sigs/*.dll
6466
tests/fsharp/typecheck/sigs/*.vserr
6567
src/fsharp/FSharp.LanguageService.Compiler/illex.*
6668
src/fsharp/FSharp.LanguageService.Compiler/ilpars.*
@@ -79,3 +81,4 @@ vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ctofiles/
7981
tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
8082
tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExprLibrary.dll
8183

84+
*.csproj.user

‎DEVGUIDE.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,9 @@ <h3>3. Full Steps Before Running Tests</h3>
399399
</pre>
400400

401401
<h3>4. [Optional] Build and Install the Visual F# IDE Tools</h3>
402+
<p>
403+
Prerequisites:<ahref="http://msdn.microsoft.com/en-us/library/bb166441.aspx">Visual Studio Software Development Kit (SDK)</a>
404+
</p>
402405
<p>
403406
To build the VS components:
404407
</p>

‎src/FSharpSource.Settings.targets‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,14 @@
1010
<LkgVersion>4.0.30319.1</LkgVersion>
1111
<FsLexUnicode>true</FsLexUnicode>
1212
<ProjectLanguageCondition="'$(ProjectLanguage)' == ''">FSharp</ProjectLanguage>
13+
<DebugSymbols>true</DebugSymbols>
14+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
15+
<WarningsAsErrors />
16+
</PropertyGroup>
17+
18+
<PropertyGroupCondition=" '$(ProjectLanguage)' == 'FSharp'">
1319
<OtherFlags>$(OtherFlags) --times</OtherFlags>
1420
<NoWarn>$(NoWarn);69;65;54;61;75</NoWarn>
15-
<DebugSymbols>true</DebugSymbols>
1621
</PropertyGroup>
1722

1823
<!-- Standard interpretations of Debug and Release configurations-->
@@ -21,7 +26,7 @@
2126
<OptimizeCondition=" '$(Optimize)' == ''">false</Optimize>
2227
<ErrorReportCondition=" '$(ErrorReport)' == ''">prompt</ErrorReport>
2328
<PlatformCondition=" '$(Platform)' == ''">AnyCPU</Platform>
24-
<OtherFlags>$(OtherFlags) --no-jit-optimize --jit-tracking</OtherFlags>
29+
<OtherFlags>$(OtherFlags) --no-jit-optimize --jit-tracking /warnon:3180</OtherFlags>
2530
<DefineConstantsCondition=" '$(ProjectLanguage)' != 'VisualBasic'">DEBUG;TRACE;CODE_ANALYSIS;$(DefineConstants)</DefineConstants>
2631
<DefineConstantsCondition=" '$(ProjectLanguage)' == 'VisualBasic'">DEBUG=True,TRACE=True,CODE_ANALYSIS=True,$(DefineConstants)</DefineConstants>
2732
<SIGN_WITH_MSFT_KEYCondition=" '$(SIGN_WITH_MSFT_KEY)' == ''">false</SIGN_WITH_MSFT_KEY>

‎src/FSharpSource.targets‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</When>
2525
<WhenCondition="'$(AssemblyName)' == 'FSharp.LanguageService' or '$(AssemblyName)' == 'FSharp.LanguageService.Compiler' or '$(AssemblyName)' == 'FSharp.LanguageService.Base' or '$(AssemblyName)' == 'FSharp.Editor' or '$(AssemblyName)' == 'FSharp.VS.FSI' or '$(AssemblyName)' == 'FSharp.ProjectSystem.FSharp'">
2626
<PropertyGroup>
27-
<OtherFlags>$(OtherFlags) --version:12.0.0.9055 --delaysign+ --keyfile:"$(FSharpSourcesRoot)\fsharp\msft.pubkey"</OtherFlags>
27+
<OtherFlags>$(OtherFlags) --version:14.0.0.9055 --delaysign+ --keyfile:"$(FSharpSourcesRoot)\fsharp\msft.pubkey"</OtherFlags>
2828
<DefineConstants>STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY;$(DefineConstants)</DefineConstants>
2929
<StrongNames>true</StrongNames>
3030
</PropertyGroup>
@@ -105,6 +105,7 @@
105105
<DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>
106106
<DefineConstants>$(DefineConstants);FX_NO_STRUCTURAL_EQUALITY</DefineConstants>
107107
<DefineConstants>$(DefineConstants);FX_NO_CANCELLATIONTOKEN_CLASSES</DefineConstants>
108+
<DefineConstants>$(DefineConstants);FX_NO_EXCEPTIONDISPATCHINFO</DefineConstants>
108109
<DefineConstants>$(DefineConstants);FX_NO_TASK</DefineConstants>
109110
<DefineConstants>$(DefineConstants);FX_NO_IOBSERVABLE</DefineConstants>
110111
<DefineConstants>$(DefineConstants);FX_NO_LAZY</DefineConstants>
@@ -113,6 +114,7 @@
113114
<DefineConstants>$(DefineConstants);FX_NO_TPL_PARALLEL</DefineConstants>
114115
<DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
115116
<DefineConstants>$(DefineConstants);FX_NO_BIGINT</DefineConstants>
117+
<DefineConstants>$(DefineConstants);FX_NO_CONDITIONAL_WEAK_TABLE</DefineConstants>
116118
<OtherFlags>$(OtherFlags) --simpleresolution</OtherFlags>
117119
</PropertyGroup>
118120

@@ -173,6 +175,7 @@
173175
<DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
174176
<DefineConstants>$(DefineConstants);FX_EVENTWAITHANDLE_NO_IDISPOSABLE</DefineConstants>
175177
<DefineConstants>$(DefineConstants);FX_NO_REGISTERED_WAIT_HANDLES</DefineConstants>
178+
<DefineConstants>$(DefineConstants);FX_NO_EXCEPTIONDISPATCHINFO</DefineConstants>
176179
<DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
177180
<DefineConstants>$(DefineConstants);FX_NO_THREAD</DefineConstants>
178181
<DefineConstants>$(DefineConstants);FX_NO_THREADPOOL</DefineConstants>
@@ -299,6 +302,7 @@
299302
<TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
300303
<DefineConstants>$(DefineConstants);SILVERLIGHT</DefineConstants>
301304
<DefineConstants>$(DefineConstants);FX_NO_CANCELLATIONTOKEN_CLASSES</DefineConstants>
305+
<DefineConstants>$(DefineConstants);FX_NO_EXCEPTIONDISPATCHINFO</DefineConstants>
302306
<DefineConstants>$(DefineConstants);FX_NO_TASK</DefineConstants>
303307
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
304308
<DefineConstants>$(DefineConstants);FX_NO_DEBUG_PROXIES</DefineConstants>
@@ -340,6 +344,7 @@
340344
<DefineConstants>$(DefineConstants);SILVERLIGHT</DefineConstants>
341345
<DefineConstants>$(DefineConstants);FX_NO_ISIN_ON_PARAMETER_INFO</DefineConstants>
342346
<DefineConstants>$(DefineConstants);FX_NO_CANCELLATIONTOKEN_CLASSES</DefineConstants>
347+
<DefineConstants>$(DefineConstants);FX_NO_EXCEPTIONDISPATCHINFO</DefineConstants>
343348
<DefineConstants>$(DefineConstants);FX_NO_TASK</DefineConstants>
344349
<DefineConstants>$(DefineConstants);FX_NO_BIGINT</DefineConstants>
345350
<DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
@@ -429,6 +434,7 @@
429434
<TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
430435
<DefineConstants>$(DefineConstants);SILVERLIGHT</DefineConstants>
431436
<DefineConstants>$(DefineConstants);FX_NO_CANCELLATIONTOKEN_CLASSES</DefineConstants>
437+
<DefineConstants>$(DefineConstants);FX_NO_EXCEPTIONDISPATCHINFO</DefineConstants>
432438
<DefineConstants>$(DefineConstants);FX_NO_TASK</DefineConstants>
433439
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
434440
<DefineConstants>$(DefineConstants);FX_NO_DEBUG_PROXIES</DefineConstants>
@@ -475,6 +481,7 @@
475481
<TargetFrameworkIdentifier>CompactFramework</TargetFrameworkIdentifier>
476482
<DefineConstants>$(DefineConstants);FX_ATLEAST_COMPACT_FRAMEWORK_20</DefineConstants>
477483
<DefineConstants>$(DefineConstants);FX_NO_CANCELLATIONTOKEN_CLASSES</DefineConstants>
484+
<DefineConstants>$(DefineConstants);FX_NO_EXCEPTIONDISPATCHINFO</DefineConstants>
478485
<DefineConstants>$(DefineConstants);FX_NO_TASK</DefineConstants>
479486
<DefineConstants>$(DefineConstants);COMPACT_FRAMEWORK</DefineConstants>
480487
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
@@ -514,6 +521,7 @@
514521
<DefineConstants>$(DefineConstants);FX_NO_LAZY</DefineConstants>
515522
<DefineConstants>$(DefineConstants);FX_NO_TUPLE</DefineConstants>
516523
<DefineConstants>$(DefineConstants);FX_NO_DELEGATE_CREATE_DELEGATE_FROM_STATIC_METHOD</DefineConstants>
524+
<DefineConstants>$(DefineConstants);FX_NO_CONDITIONAL_WEAK_TABLE</DefineConstants>
517525
<DefineConstants>$(DefineConstants)</DefineConstants>
518526
<!-- It would be better to use MSBuild resolution here, but the TargetFrameworkIdentifier etc. aren't set up quite correctly as yet-->
519527
<OtherFlags>$(OtherFlags) --simpleresolution -r:"C:\Program Files\Microsoft.NET\SDK\CompactFramework\v2.0\WindowsCE\mscorlib.dll" -r:"C:\Program Files\Microsoft.NET\SDK\CompactFramework\v2.0\WindowsCE\System.dll"</OtherFlags>
@@ -562,6 +570,7 @@
562570
<TargetFrameworkIdentifier>CompactFramework</TargetFrameworkIdentifier>
563571
<DefineConstants>$(DefineConstants);FX_ATLEAST_COMPACT_FRAMEWORK_35</DefineConstants>
564572
<DefineConstants>$(DefineConstants);FX_NO_CANCELLATIONTOKEN_CLASSES</DefineConstants>
573+
<DefineConstants>$(DefineConstants);FX_NO_EXCEPTIONDISPATCHINFO</DefineConstants>
565574
<DefineConstants>$(DefineConstants);FX_NO_TASK</DefineConstants>
566575
<DefineConstants>$(DefineConstants);COMPACT_FRAMEWORK</DefineConstants>
567576
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>

‎src/absil/il.fs‎

Lines changed: 41 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -198,15 +198,15 @@ let b3 n = ((n >>> 24) &&& 0xFF)
198198
moduleSHA1=
199199
let inline(>>>&)(x:int)(y:int)= int32(uint32 x>>> y)
200200
letf(t,b,c,d)=
201-
if t<20then(b&&& c)|||((~~~b)&&& d)else
202-
if t<40then b^^^ c^^^ delse
203-
if t<60then(b&&& c)|||(b&&& d)|||(c&&& d)else
204-
b^^^ c^^^ d
201+
if t<20then(b&&& c)|||((~~~b)&&& d)
202+
elif t<40then b^^^ c^^^ d
203+
elif t<60then(b&&& c)|||(b&&& d)|||(c&&& d)
204+
elseb^^^ c^^^ d
205205

206-
letk0to19=0x5A827999
207-
letk20to39=0x6ED9EBA1
208-
letk40to59=0x8F1BBCDC
209-
letk60to79=0xCA62C1D6
206+
let[<Literal>]k0to19=0x5A827999
207+
let[<Literal>]k20to39=0x6ED9EBA1
208+
let[<Literal>]k40to59=0x8F1BBCDC
209+
let[<Literal>]k60to79=0xCA62C1D6
210210

211211
letk t=
212212
if t<20then k0to19
@@ -223,7 +223,7 @@ module SHA1 =
223223

224224
letrot_left32 x n=(x<<< n)|||(x>>>&(32-n))
225225

226-
letsha_eof sha= sha.eof
226+
letinlinesha_eof sha= sha.eof
227227

228228
(* padding and length (in bits!) recorded at end*)
229229
letsha_after_eof sha=
@@ -260,43 +260,41 @@ module SHA1 =
260260
letres=(b0<<<24)|||(b1<<<16)|||(b2<<<8)||| b3
261261
res
262262

263-
264263
letsha1_hash sha=
265-
leth0= ref0x67452301
266-
leth1= ref0xEFCDAB89
267-
leth2= ref0x98BADCFE
268-
leth3= ref0x10325476
269-
leth4= ref0xC3D2E1F0
270-
leta= ref0
271-
letb= ref0
272-
letc= ref0
273-
letd= ref0
274-
lete= ref0
264+
letmutableh0=0x67452301
265+
letmutableh1=0xEFCDAB89
266+
letmutableh2=0x98BADCFE
267+
letmutableh3=0x10325476
268+
letmutableh4=0xC3D2E1F0
269+
letmutablea=0
270+
letmutableb=0
271+
letmutablec=0
272+
letmutabled=0
273+
letmutablee=0
275274
letw= Array.create800x00
276275
while(not(sha_eof sha))do
277-
for i=0to15do
278-
w.[i]<- sha_read32 sha
279-
for t=16to79do
280-
w.[t]<- rot_left32(w.[t-3]^^^ w.[t-8]^^^ w.[t-14]^^^ w.[t-16])1;
281-
a:=!h0;
282-
b:=!h1;
283-
c:=!h2;
284-
d:=!h3;
285-
e:=!h4;
286-
for t=0to79do
287-
lettemp=(rot_left32!a5)+ f(t,!b,!c,!d)+!e+ w.[t]+ k(t)
288-
e:=!d;
289-
d:=!c;
290-
c:= rot_left32!b30;
291-
b:=!a;
292-
a:= temp;
293-
h0:=!h0+!a;
294-
h1:=!h1+!b;
295-
h2:=!h2+!c;
296-
h3:=!h3+!d;
297-
h4:=!h4+!e
298-
done;
299-
(!h0,!h1,!h2,!h3,!h4)
276+
for i=0to15do
277+
w.[i]<- sha_read32 sha
278+
for t=16to79do
279+
w.[t]<- rot_left32(w.[t-3]^^^ w.[t-8]^^^ w.[t-14]^^^ w.[t-16])1
280+
a<- h0
281+
b<- h1
282+
c<- h2
283+
d<- h3
284+
e<- h4
285+
for t=0to79do
286+
lettemp=(rot_left32 a5)+ f(t,b,c,d)+ e+ w.[t]+ k(t)
287+
e<- d
288+
d<- c
289+
c<- rot_left32 b30
290+
b<- a
291+
a<- temp
292+
h0<- h0+ a
293+
h1<- h1+ b
294+
h2<- h2+ c
295+
h3<- h3+ d
296+
h4<- h4+ e
297+
h0,h1,h2,h3,h4
300298

301299
letsha1HashBytes s=
302300
let(_h0,_h1,_h2,h3,h4)= sha1_hash{ stream= SHABytes s; pos=0; eof=false}// the result of the SHA algorithm is stored in registers 3 and 4

‎src/absil/ilreflect.fs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,14 @@ let convFieldInit x =
601601
// This is gross. TypeBuilderInstantiation should really be a public type, since we
602602
// have to use alternative means for various Method/Field/Constructor lookups. However since
603603
// it isn't we resort to this technique...
604-
letTypeBuilderInstantiationT= Type.GetType("System.Reflection.Emit.TypeBuilderInstantiation")
604+
letTypeBuilderInstantiationT=
605+
letty=
606+
if runningOnMonothen
607+
Type.GetType("System.Reflection.MonoGenericClass")
608+
else
609+
Type.GetType("System.Reflection.Emit.TypeBuilderInstantiation")
610+
assert(not(isNull ty))
611+
ty
605612

606613
lettypeIsNotQueryable(typ:Type)=
607614
(typ:? TypeBuilder)||((typ.GetType()).Equals(TypeBuilderInstantiationT))

0 commit comments

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