NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit6cc3227

committed

Do not generate logical type names like "MyNamespace.Test,"

1 parentb40d937 commit6cc3227Copy full SHA for 6cc3227

File tree

2 files changed

+13

-4

lines changed

src/fsharp
- FSharp.Compiler.Unittests
  - ManglingNameOfProvidedTypes.fs
- PrettyNaming.fs

2 files changed

+13

-4

lines changed

`‎src/fsharp/FSharp.Compiler.Unittests/ManglingNameOfProvidedTypes.fs‎`

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ type ManglingNamesOfProvidedTypesWithSingleParameter() =`
`19`	`19`	`memberthis.MangleWithDefaultValue()=`
`20`	`20`	`letmangled=`
`21`	`21`	`PrettyNaming.computeMangledNameWithoutDefaultArgValues("MyNamespace.Test",[\|"xyz"\|],[\|"Foo", Some"xyz"\|])`
`22`		`- Assert.AreEqual("MyNamespace.Test,", mangled)`
	`22`	`+ Assert.AreEqual("MyNamespace.Test", mangled)`
`23`	`23`
`24`	`24`	`[<Test>]`
`25`	`25`	`memberthis.DemangleNonDefaultValue()=`
`@@ -29,11 +29,16 @@ type ManglingNamesOfProvidedTypesWithSingleParameter() =`
`29`	`29`
`30`	`30`	`[<Test>]`
`31`	`31`	`memberthis.DemangleDefaultValue()=`
`32`		`-// If all provided parameters are the default value demangling fails - see #98`
`33`	`32`	`letname,parameters= PrettyNaming.demangleProvidedTypeName"MyNamespace.Test,"`
`34`	`33`	`Assert.AreEqual("MyNamespace.Test", name)`
`35`	`34`	`Assert.AreEqual([\|\|], parameters)`
`36`	`35`
	`36`	`+[<Test>]`
	`37`	`+memberthis.DemangleNewDefaultValue()=`
	`38`	`+letname,parameters= PrettyNaming.demangleProvidedTypeName"MyNamespace.Test"`
	`39`	`+ Assert.AreEqual("MyNamespace.Test", name)`
	`40`	`+ Assert.AreEqual([\|\|], parameters)`
	`41`	`+`
`37`	`42`	`[<TestFixture>]`
`38`	`43`	`typeManglingNamesOfProvidedTypesWithMultipleParameter()=`
`39`	`44`
`@@ -53,7 +58,7 @@ type ManglingNamesOfProvidedTypesWithMultipleParameter() =`
`53`	`58`	`("MyNamespace.Test",[\|"xyz";"abc"\|],`
`54`	`59`	`[\|"Foo", Some"xyz"`
`55`	`60`	`"Foo2", Some"abc"\|])`
`56`		`- Assert.AreEqual("MyNamespace.Test,", mangled)`
	`61`	`+ Assert.AreEqual("MyNamespace.Test", mangled)`
`57`	`62`
`58`	`63`	`[<Test>]`
`59`	`64`	`memberthis.DemangleMultiParameter()=`

`‎src/fsharp/PrettyNaming.fs‎`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,11 @@ module internal Microsoft.FSharp.Compiler.PrettyNaming`
`462`	`462`	`nonDefaultArgs`
`463`	`463`	`\|> Array.map mangleStaticStringArg`
`464`	`464`	`\|> String.concat","`
`465`		`- typeLogicalName+","+nonDefaultArgsText`
	`465`	`+`
	`466`	`+if nonDefaultArgsText=""then`
	`467`	`+ typeLogicalName`
	`468`	`+else`
	`469`	`+ typeLogicalName+","+ nonDefaultArgsText`
`466`	`470`
`467`	`471`
`468`	`472`	`letcomputeMangledNameWithoutDefaultArgValues(nm,staticArgs,defaultArgValues)=`

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!

Commit6cc3227

File tree

2 files changed

2 files changed

`‎src/fsharp/FSharp.Compiler.Unittests/ManglingNameOfProvidedTypes.fs‎`

`‎src/fsharp/PrettyNaming.fs‎`

0 commit comments