Commitbe2d157

committed

Extract computeMangledNameWithoutDefaultArgValues to make it testable

1 parentbbdd2a3 commitbe2d157Copy full SHA for be2d157

File tree

+14

-11

lines changed

+14

-11

lines changed

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -463,4 +463,16 @@ module internal Microsoft.FSharp.Compiler.PrettyNaming`
`463`	`463`	`nonDefaultArgs`
`464`	`464`	`\|> Array.map mangleStaticStringArg`
`465`	`465`	`\|> String.concat","`
`466`		`- typeLogicalName+","+nonDefaultArgsText`
	`466`	`+ typeLogicalName+","+nonDefaultArgsText`
	`467`	`+`
	`468`	`+`
	`469`	`+letcomputeMangledNameWithoutDefaultArgValues(nm,staticArgs,defaultArgValues)=`
	`470`	`+letnonDefaultArgs=`
	`471`	`+(staticArgs,defaultArgValues)`
	`472`	`+\|\|> Array.zip`
	`473`	`+\|> Array.choose(fun(staticArg,(defaultArgName,defaultArgValue))->`
	`474`	`+letactualArgValue= string staticArg`
	`475`	`+match defaultArgValuewith`
	`476`	`+\| Some vwhen v= actualArgValue-> None`
	`477`	`+\|_-> Some(defaultArgName, actualArgValue))`
	`478`	`+ mangleProvidedTypeName(nm, nonDefaultArgs)`

Lines changed: 1 addition & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1262,16 +1262,7 @@ module internal ExtensionTyping =`
`1262`	`1262`	`staticParams.PApply((fun ps-> ps\|> Array.map(fun sp-> sp.Name,(if sp.IsOptionalthen Some(string sp.RawDefaultValue)else None))),range=m)`
`1263`	`1263`
`1264`	`1264`	`letdefaultArgValues= defaultArgValues.PUntaint(id,m)`
`1265`		`-`
`1266`		`-letnonDefaultArgs=`
`1267`		`-(staticArgs,defaultArgValues)`
`1268`		`-\|\|> Array.zip`
`1269`		`-\|> Array.choose(fun(staticArg,(defaultArgName,defaultArgValue))->`
`1270`		`-letactualArgValue= string staticArg`
`1271`		`-match defaultArgValuewith`
`1272`		`-\| Some vwhen v= actualArgValue-> None`
`1273`		`-\|_-> Some(defaultArgName, actualArgValue))`
`1274`		`- PrettyNaming.mangleProvidedTypeName(nm, nonDefaultArgs)`
	`1265`	`+ PrettyNaming.computeMangledNameWithoutDefaultArgValues(nm,staticArgs,defaultArgValues)`
`1275`	`1266`
`1276`	`1267`	`/// Apply the given provided method to the given static arguments (the arguments are assumed to have been sorted into application order)`
`1277`	`1268`	`letTryApplyProvidedMethod(methBeforeArgs:Tainted<ProvidedMethodBase>,staticArgs:obj[],m:range)=`

Comments

(0)