Commited8393c

forki

authored and

KevinRansom

committed

No need to decompile coreDisplayName all the time (dotnet#4443)

1 parent792dbe5 commited8393cCopy full SHA for ed8393c

File tree

1 file changed

+15

-13

lines changed

src/fsharp
- TypeChecker.fs

1 file changed

+15

-13

lines changed

`‎src/fsharp/TypeChecker.fs‎`

Lines changed: 15 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -1405,32 +1405,34 @@ let ComputeAccessAndCompPath env declKindOpt m vis overrideVis actualParent =`
`1405`	`1405`	`let cpath = if accessModPermitted then Some env.eCompPath else None`
`1406`	`1406`	`vis, cpath`
`1407`	`1407`
`1408`		`-let CheckForAbnormalOperatorNames cenv (idRange:range)opName isMember =`
`1409`		`- if (idRange.EndColumn - idRange.StartColumn <= 5) &&`
`1410`		`- not cenv.g.compilingFslib`
	`1408`	`+let CheckForAbnormalOperatorNames cenv (idRange:range)coreDisplayName (memberInfoOpt: ValMemberInfo option) =`
	`1409`	`+ if (idRange.EndColumn - idRange.StartColumn <= 5) &&`
	`1410`	`+ not cenv.g.compilingFslib`
`1411`	`1411`	`then`
`1412`		`- match opName with`
	`1412`	`+ let opName = DecompileOpName coreDisplayName`
	`1413`	`+ let isMember = memberInfoOpt.IsSome`
	`1414`	`+ match opName with`
`1413`	`1415`	`\| PrettyNaming.Relational ->`
`1414`	`1416`	`if isMember then`
`1415`		`- warning(StandardOperatorRedefinitionWarning(FSComp.SR.tcInvalidMethodNameForRelationalOperator(opName,(CompileOpName opName)), idRange))`
	`1417`	`+ warning(StandardOperatorRedefinitionWarning(FSComp.SR.tcInvalidMethodNameForRelationalOperator(opName,coreDisplayName), idRange))`
`1416`	`1418`	`else`
`1417`		`- warning(StandardOperatorRedefinitionWarning(FSComp.SR.tcInvalidOperatorDefinitionRelational(opName), idRange))`
	`1419`	`+ warning(StandardOperatorRedefinitionWarning(FSComp.SR.tcInvalidOperatorDefinitionRelationalopName, idRange))`
`1418`	`1420`	`\| PrettyNaming.Equality ->`
`1419`	`1421`	`if isMember then`
`1420`		`- warning(StandardOperatorRedefinitionWarning(FSComp.SR.tcInvalidMethodNameForEquality(opName,(CompileOpName opName)), idRange))`
	`1422`	`+ warning(StandardOperatorRedefinitionWarning(FSComp.SR.tcInvalidMethodNameForEquality(opName,coreDisplayName), idRange))`
`1421`	`1423`	`else`
`1422`		`- warning(StandardOperatorRedefinitionWarning(FSComp.SR.tcInvalidOperatorDefinitionEquality(opName), idRange))`
	`1424`	`+ warning(StandardOperatorRedefinitionWarning(FSComp.SR.tcInvalidOperatorDefinitionEqualityopName, idRange))`
`1423`	`1425`	`\| PrettyNaming.Control ->`
`1424`	`1426`	`if isMember then`
`1425`		`- warning(StandardOperatorRedefinitionWarning(FSComp.SR.tcInvalidMemberName(opName,(CompileOpName opName)), idRange))`
	`1427`	`+ warning(StandardOperatorRedefinitionWarning(FSComp.SR.tcInvalidMemberName(opName,coreDisplayName), idRange))`
`1426`	`1428`	`else`
`1427`		`- warning(StandardOperatorRedefinitionWarning(FSComp.SR.tcInvalidOperatorDefinition(opName), idRange))`
	`1429`	`+ warning(StandardOperatorRedefinitionWarning(FSComp.SR.tcInvalidOperatorDefinitionopName, idRange))`
`1428`	`1430`	`\| PrettyNaming.Indexer ->`
`1429`	`1431`	`if not isMember then`
`1430`		`- error(StandardOperatorRedefinitionWarning(FSComp.SR.tcInvalidIndexOperatorDefinition(opName), idRange))`
	`1432`	`+ error(StandardOperatorRedefinitionWarning(FSComp.SR.tcInvalidIndexOperatorDefinitionopName, idRange))`
`1431`	`1433`	`\| PrettyNaming.FixedTypes ->`
`1432`	`1434`	`if isMember then`
`1433`		`- warning(StandardOperatorRedefinitionWarning(FSComp.SR.tcInvalidMemberNameFixedTypes(opName), idRange))`
	`1435`	`+ warning(StandardOperatorRedefinitionWarning(FSComp.SR.tcInvalidMemberNameFixedTypesopName, idRange))`
`1434`	`1436`	`\| PrettyNaming.Other -> ()`
`1435`	`1437`
`1436`	`1438`	`let MakeAndPublishVal cenv env (altActualParent, inSig, declKind, vrec, (ValScheme(id, typeScheme, topValData, memberInfoOpt, isMutable, inlineFlag, baseOrThis, vis, compgen, isIncrClass, isTyFunc, hasDeclaredTypars)), attrs, doc, konst, isGeneratedEventVal) =`
`@@ -1537,7 +1539,7 @@ let MakeAndPublishVal cenv env (altActualParent, inSig, declKind, vrec, (ValSche`
`1537`	`1539`	`(hasDeclaredTypars \|\| inSig), isGeneratedEventVal, konst, actualParent)`
`1538`	`1540`
`1539`	`1541`
`1540`		`- CheckForAbnormalOperatorNames cenv id.idRange(DecompileOpNamevspec.CoreDisplayName) (Option.isSomememberInfoOpt)`
	`1542`	`+ CheckForAbnormalOperatorNames cenv id.idRange vspec.CoreDisplayNamememberInfoOpt`
`1541`	`1543`
`1542`	`1544`	`PublishValueDefn cenv env declKind vspec`
`1543`	`1545`

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!

Commited8393c

File tree

1 file changed

1 file changed

`‎src/fsharp/TypeChecker.fs‎`

0 commit comments