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

Commitc2335c0

Browse files
committed
Roll back binary breaking changes in52a7252
fixesdotnet#486closesdotnet#497commita24d85bAuthor: latkin <latkin@microsoft.com>Date: Fri Jun 12 15:24:41 2015 -0700 Revert to all old codecommit9cf81deAuthor: latkin <latkin@microsoft.com>Date: Thu Jun 11 11:52:11 2015 -0700 Add extra test case for fixed non-inline APIscommitf552478Author: latkin <latkin@microsoft.com>Date: Thu Jun 11 10:52:18 2015 -0700 Use lazy-evaluated resource string for all non-inline APIscommit76871e6Author: latkin <latkin@microsoft.com>Date: Mon Jun 8 19:54:19 2015 -0700 Add tests for multitargeting scenarioscommit3d6cfcfAuthor: latkin <latkin@microsoft.com>Date: Thu Jun 11 10:01:57 2015 -0700 Roll back52a7252
1 parent66109b7 commitc2335c0

File tree

5 files changed

+36
-14
lines changed

5 files changed

+36
-14
lines changed

‎src/fsharp/FSharp.Core/prim-types.fs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -656,17 +656,17 @@ namespace Microsoft.FSharp.Core
656656

657657
moduleLanguagePrimitives=
658658

659-
[<Sealed>]
660-
type(* internal*)ErrorStrings=
659+
660+
module(* internal*)ErrorStrings=
661661
//inlinefunctionscannotcallGetString,sowemustmakethesebitspublic
662-
staticmemberAddressOpNotFirstClassStringwithget()=SR.GetString(SR.addressOpNotFirstClass)
663-
staticmemberNoNegateMinValueStringwithget()=SR.GetString(SR.noNegateMinValue)
662+
letAddressOpNotFirstClassString=SR.GetString(SR.addressOpNotFirstClass)
663+
letNoNegateMinValueString=SR.GetString(SR.noNegateMinValue)
664664
//needstobepublictobevisiblefrominlinefunction'average'andothers
665-
staticmemberInputSequenceEmptyStringwithget()=SR.GetString(SR.inputSequenceEmpty)
665+
letInputSequenceEmptyString=SR.GetString(SR.inputSequenceEmpty)
666666
//needstobepublictobevisiblefrominlinefunction'average'andothers
667-
staticmemberInputArrayEmptyStringwithget()=SR.GetString(SR.arrayWasEmpty)
667+
letInputArrayEmptyString=SR.GetString(SR.arrayWasEmpty)
668668
//needstobepublictobevisiblefrominlinefunction'average'andothers
669-
staticmemberInputMustBeNonNegativeStringwithget()=SR.GetString(SR.inputMustBeNonNegative)
669+
letInputMustBeNonNegativeString=SR.GetString(SR.inputMustBeNonNegative)
670670

671671
[<CodeAnalysis.SuppressMessage("Microsoft.Design","CA1034:NestedTypesShouldNotBeVisible")>]//nestedmoduleOK
672672
moduleIntrinsicOperators=

‎src/fsharp/FSharp.Core/prim-types.fsi‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,23 +1015,22 @@ namespace Microsoft.FSharp.Core
10151015
val inline DivideByInt< ^T >:x:^T->y:int->^T when ^T:(static member DivideByInt:^T*int->^T)
10161016

10171017
///<summary>For compiler use only</summary>
1018-
[<Sealed>]
1019-
type(*internal*)ErrorStrings=
1018+
module(*internal*)ErrorStrings=
10201019

10211020
[<CompilerMessage("This value is for use by compiled F#code and should not be used directly",1204,IsHidden=true)>]
1022-
static memberInputSequenceEmptyString:string with get
1021+
valInputSequenceEmptyString:string
10231022

10241023
[<CompilerMessage("This value is for use by compiled F#code and should not be used directly",1204,IsHidden=true)>]
1025-
static memberInputArrayEmptyString:string with get
1024+
valInputArrayEmptyString:string
10261025

10271026
[<CompilerMessage("This value is for use by compiled F#code and should not be used directly",1204,IsHidden=true)>]
1028-
static memberAddressOpNotFirstClassString:string with get
1027+
valAddressOpNotFirstClassString:string
10291028

10301029
[<CompilerMessage("This value is for use by compiled F#code and should not be used directly",1204,IsHidden=true)>]
1031-
static memberNoNegateMinValueString:string with get
1030+
valNoNegateMinValueString:string
10321031

10331032
[<CompilerMessage("This value is for use by compiled F#code and should not be used directly",1204,IsHidden=true)>]
1034-
static memberInputMustBeNonNegativeString:string with get
1033+
valInputMustBeNonNegativeString:string
10351034

10361035

10371036
//-------------------------------------------------------------------------
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
moduleTest
2+
3+
let inlineinit1 n f= Array.init n f
4+
letinit2 n f= Array.init n f
5+
6+
let inlinereduce1 f= Array.reduce f
7+
letreduce2 f= Array.reduce f
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#if INTERACTIVE
2+
#r"author.dll"
3+
#else
4+
moduleFoo
5+
#endif
6+
7+
Test.init14(fun _->4.)|> printfn"%A"
8+
Test.init24(fun _->4.)|> printfn"%A"
9+
10+
Test.reduce1(fun acc n-> acc+ n)[|1..10|]|> printfn"%A"
11+
Test.reduce2(fun acc n-> acc+ n)[|1..10|]|> printfn"%A"
12+
13+
#if INTERACTIVE
14+
#q;;
15+
#endif

‎tests/fsharpqa/Source/MultiTargeting/env.lst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ NOMONOSOURCE=E_BadPathToFSharpCore.fsx SCFLAGS="--noframework -r %W
66
NOMONOSOURCE=E_UseBinaryIncompatibleLibrary.fs SCFLAGS="--noframework -r ..\\Common\\FSharp.Core.dll"# E_UseBinaryIncompatibleLibrary.fs
77

88
ReqOpenSOURCE=dummy.fs POSTCMD="\$FSI_PIPE --nologo --quiet --exec .\\MultiTargetMatrix.fsx QuotedCommaTypeName_author.fs QuotedCommaTypeName_consumer.fsx 0,8"# QuotedCommaTypeName
9+
ReqOpenSOURCE=dummy.fs POSTCMD="\$FSI_PIPE --nologo --quiet --exec .\\MultiTargetMatrix.fsx InlineCoreResource_author.fs InlineCoreResource_consumer.fsx"# InlineCoreResource

0 commit comments

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