NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit18ac68a

committed

Merge branch 'fix-2453' ofhttps://github.com/dsyme/visualfsharp into dsyme-fix-2453

2 parents5a3afd2 +3685f84 commit18ac68aCopy full SHA for 18ac68a

File tree

4 files changed

+46

-4

lines changed

src/fsharp
- NameResolution.fs
tests/fsharp
- core/fsfromfsviacs
  - lib2.cs
  - test.fsx
- tests.fs

4 files changed

+46

-4

lines changed

`‎src/fsharp/NameResolution.fs‎`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -427,9 +427,12 @@ let private GetCSharpStyleIndexedExtensionMembersForTyconRef (amap:Import.Import`
`427`	`427`	`\| firstTy::_->`
`428`	`428`	`match firstTywith`
`429`	`429`	`\| ILType.Boxed tspec\| ILType.Value tspec->`
`430`		`-lettcref=(tspec\|> rescopeILTypeSpec scoref).TypeRef\|> Import.ImportILTypeRef amap m`
`431`		`-if isCompiledTupleTyconRef g tcref\|\| tyconRefEq g tcref g.fastFunc_tcrthen None`
`432`		`-else Some tcref`
	`430`	`+lettref=(tspec\|> rescopeILTypeSpec scoref).TypeRef`
	`431`	`+if Import.CanImportILTypeRef amap m trefthen`
	`432`	`+lettcref= tref\|> Import.ImportILTypeRef amap m`
	`433`	`+if isCompiledTupleTyconRef g tcref\|\| tyconRefEq g tcref g.fastFunc_tcrthen None`
	`434`	`+else Some tcref`
	`435`	`+else None`
`433`	`436`	`\|_-> None`
`434`	`437`	`\|_-> None`
`435`	`438`	`\|_->`

`‎tests/fsharp/core/fsfromfsviacs/lib2.cs‎`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,18 @@ public class Lib2`
`43`	`43`
`44`	`44`	`}`
`45`	`45`
	`46`	`+`
	`47`	`+namespaceCustomExtensions`
	`48`	`+{`
	`49`	`+publicstaticclassExtensions`
	`50`	`+{`
	`51`	`+`
	`52`	`+/// Extend an F# type`
	`53`	`+staticpublicintExtendFSharpType(thisLib.recd1recd){return5;}`
	`54`	`+staticpublicintExtendCSharpType(thisLib2recd){return4;}`
	`55`	`+}`
	`56`	`+}`
	`57`	`+`
`46`	`58`	`namespaceNewtonsoft.Json.Converters`
`47`	`59`	`{`
`48`	`60`	`internalclassSomeClass`

`‎tests/fsharp/core/fsfromfsviacs/test.fsx‎`

Lines changed: 22 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`// #Conformance #Interop #Unions`
	`2`	`+#if!NO_LIB_REFERENCE`
`2`	`3`	`openLib`
	`4`	`+#endif`
`3`	`5`	`openFSharpOptionalTests`
`4`	`6`
`5`	`7`	`letfailures= ref[]`
`@@ -14,6 +16,11 @@ let test (s : string) b =`
`14`	`16`	`if bthen stderr.WriteLine" OK"`
`15`	`17`	`else report_failure(s)`
`16`	`18`
	`19`	`+#if NO_LIB_REFERENCE// Test for https://github.com/Microsoft/visualfsharp/issues/2453#issuecomment-280946177`
	`20`	`+moduleTestExtensions=`
	`21`	`+openCustomExtensions`
	`22`	`+`
	`23`	`+#else`
`17`	`24`	`letr1= Lib2.r1`
`18`	`25`	`letr2= Lib2.r2`
`19`	`26`
`@@ -28,6 +35,7 @@ let r3 = (Lib2.r3 : string recd3)`
`28`	`35`	`let_= test"fejio2dw"(r3.recd3field1=4)`
`29`	`36`	`let_= test"fejio2dw"(r3.recd3field2="c")`
`30`	`37`	`let_= test"fejio2dw"(LanguagePrimitives.PhysicalEquality r3.recd3field3 r3)`
	`38`	`+`
`31`	`39`	`let_= test"fejio2dw"(Lib2.li1=[3])`
`32`	`40`	`let_= test"fejio2dw"(Lib2.lr1=[r1])`
`33`	`41`	`let_= test"fejio2dw"(Lib2.oi1= Some3)`
`@@ -144,6 +152,20 @@ let TestAccessibility() =`
`144`	`152`
`145`	`153`	`*)`
`146`	`154`
	`155`	`+moduleTestExtensions=`
	`156`	`+openCustomExtensions`
	`157`	`+ test"dfeweeon"(r1.ExtendFSharpType()=5)`
	`158`	`+ test"dfeweeon"(Lib2().ExtendCSharpType()=4)`
	`159`	`+`
	`160`	`+#endif`
	`161`	`+`
	`162`	`+`
	`163`	`+let_=`
	`164`	`+if failuresthen(stdout.WriteLine"Test Failed"; exit1)`
	`165`	`+else(stdout.WriteLine"Test Passed";`
	`166`	`+ System.IO.File.WriteAllText("test.ok","ok");`
	`167`	`+ exit0)`
	`168`	`+`
`147`	`169`	`#if TESTS_AS_APP`
`148`	`170`	`letRUN()=!failures`
`149`	`171`	`#else`
`@@ -157,4 +179,3 @@ let aa =`
`157`	`179`	`stdout.WriteLine"Test Failed"`
`158`	`180`	`exit1`
`159`	`181`	`#endif`
`160`		`-`

`‎tests/fsharp/tests.fs‎`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -373,6 +373,12 @@ module CoreTests =`
`373`	`373`
`374`	`374`	`peverify cfg"test.exe"`
`375`	`375`
	`376`	`+`
	`377`	`+// Same without the reference to lib.dll - testing an incomplete reference set, but only compiling a subset of the code`
	`378`	`+ fsc cfg"%s --noframework --define:NO_LIB_REFERENCE -r:lib3.dll -r:lib2.dll -o:test.exe -g" cfg.fsc_flags["test.fsx"]`
	`379`	`+`
	`380`	`+ peverify cfg"test.exe"`
	`381`	`+`
`376`	`382`	`exec cfg("."++"test.exe")""`
`377`	`383`
`378`	`384`	`[<Test>]`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit18ac68a

File tree

4 files changed

4 files changed

`‎src/fsharp/NameResolution.fs‎`

`‎tests/fsharp/core/fsfromfsviacs/lib2.cs‎`

`‎tests/fsharp/core/fsfromfsviacs/test.fsx‎`

`‎tests/fsharp/tests.fs‎`

0 commit comments