Skip to content

[WIP] Better representation of named parameters in the syntax tree #13855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 12 commits into from
Closed

[WIP] Better representation of named parameters in the syntax tree #13855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ad89261
Update SyntaxTree and grammar.
nojaf Sep 7, 2022
ff11177
Move types from Untyped tree to Typed tree.
nojaf Sep 7, 2022
64d80c3
Update compiler to reflect syntax tree changes.
nojaf Sep 7, 2022
3e40bd2
Add unit test for syntax tree changes.
nojaf Sep 7, 2022
f45a4f4
Don't make a property when for SynType.Fun.
nojaf Sep 8, 2022
ef5d2dc
Preserve usage of thisIdOpt in inferSynValDataFromBinding.
nojaf Sep 8, 2022
60aebc9
Further fixes for mkArityForType
nojaf Sep 8, 2022
bd75010
Try and correct SynValData for members.
nojaf Sep 8, 2022
94b2428
Accept single tuple pattern as multiple args.
nojaf Sep 8, 2022
c9f6092
Only accept tuple pattern for get/set.
nojaf Sep 9, 2022
085baa9
Remove SynBindingReturnInfo from TypeTests.fs
nojaf Sep 9, 2022
a947f41
Merge branch 'main' into syntype-named
nojaf Sep 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions src/Compiler/Checking/CheckDeclarations.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,8 @@ module TcRecdUnionAndEnumDeclarations =

rfields, thisTy

| SynUnionCaseKind.FullType (ty, arity) ->
| SynUnionCaseKind.FullType ty ->
let arity = mkArityForType ty
let tyR, _ = TcTypeAndRecover cenv NoNewTypars CheckCxs ItemOccurence.UseInType WarnOnIWSAM.Yes env tpenv ty
let curriedArgTys, recordTy = GetTopTauTypeInFSharpForm g (arity |> TranslateSynValInfo m (TcAttributes cenv env) |> TranslatePartialValReprInfo []).ArgInfos tyR m

Expand Down Expand Up @@ -882,7 +883,7 @@ module MutRecBindingChecking =
| SynMemberDefn.Member (bind, m), _ ->
// Phase2A: member binding - create prelim valspec (for recursive reference) and RecursiveBindingInfo
let NormalizedBinding(_, _, _, _, _, _, _, valSynData, _, _, _, _) as bind = BindingNormalization.NormalizeBinding ValOrMemberBinding cenv envForTycon bind
let (SynValData(memberFlagsOpt, _, _)) = valSynData
let (SynValData2(memberFlagsOpt, _, _)) = valSynData

match tcref.TypeOrMeasureKind with
| TyparKind.Type -> ()
Expand Down Expand Up @@ -2362,7 +2363,8 @@ module EstablishTypeDefinitionCores =
let tyR, _ = TcTypeAndRecover cenv NoNewTypars NoCheckCxs ItemOccurence.UseInType WarnOnIWSAM.Yes env tpenv ty
yield (tyR, m)

| SynUnionCaseKind.FullType (ty, arity) ->
| SynUnionCaseKind.FullType ty ->
let arity = mkArityForType ty
let tyR, _ = TcTypeAndRecover cenv NoNewTypars NoCheckCxs ItemOccurence.UseInType WarnOnIWSAM.Yes env tpenv ty
let curriedArgTys, _ = GetTopTauTypeInFSharpForm g (arity |> TranslateSynValInfo m (TcAttributes cenv env) |> TranslatePartialValReprInfo []).ArgInfos tyR m

Expand Down Expand Up @@ -2544,7 +2546,9 @@ module EstablishTypeDefinitionCores =
// '<param>' documentation is allowed for delegates
let paramNames =
match synTyconRepr with
| SynTypeDefnSimpleRepr.General (SynTypeDefnKind.Delegate (_ty, arity), _, _, _, _, _, _, _) -> arity.ArgNames
| SynTypeDefnSimpleRepr.General (SynTypeDefnKind.Delegate ty, _, _, _, _, _, _, _) ->
let arity = mkArityForType ty
arity.ArgNames
| SynTypeDefnSimpleRepr.General (SynTypeDefnKind.Unspecified, _, _, _, _, _, Some synPats, _) ->
let rec patName (p: SynSimplePat) =
match p with
Expand Down Expand Up @@ -3333,7 +3337,8 @@ module EstablishTypeDefinitionCores =
structLayoutAttributeCheck(not isIncrClass)
allowNullLiteralAttributeCheck()
TFSharpClass
| SynTypeDefnKind.Delegate (ty, arity) ->
| SynTypeDefnKind.Delegate ty ->
let arity = mkArityForType ty
noCLIMutableAttributeCheck()
noSealedAttributeCheck FSComp.SR.tcTypesAreAlwaysSealedDelegate
structLayoutAttributeCheck false
Expand Down Expand Up @@ -4008,14 +4013,14 @@ module TcDeclarations =
let mLetPortion = synExpr.Range
let fldId = ident (CompilerGeneratedName id.idText, mLetPortion)
let headPat = SynPat.LongIdent (SynLongIdent([fldId], [], [None]), None, Some noInferredTypars, SynArgPats.Pats [], None, mLetPortion)
let retInfo = match tyOpt with None -> None | Some ty -> Some (SynReturnInfo((ty, SynInfo.unnamedRetVal), ty.Range))

let isMutable =
match propKind with
| SynMemberKind.PropertySet
| SynMemberKind.PropertyGetSet -> true
| _ -> false
let attribs = mkAttributeList attribs mWholeAutoProp
let binding = mkSynBinding (xmlDoc, headPat) (None, false, isMutable, mLetPortion, DebugPointAtBinding.NoneAtInvisible, retInfo, synExpr, synExpr.Range, [], attribs, None, SynBindingTrivia.Zero)
let binding = mkSynBinding (xmlDoc, headPat) (None, false, isMutable, mLetPortion, DebugPointAtBinding.NoneAtInvisible, tyOpt, synExpr, synExpr.Range, [], attribs, None, SynBindingTrivia.Zero)

[(SynMemberDefn.LetBindings ([binding], isStatic, false, mWholeAutoProp))]

Expand Down Expand Up @@ -4050,9 +4055,8 @@ module TcDeclarations =
| SynMemberKind.PropertyGetSet ->
let getter =
let rhsExpr = SynExpr.Ident fldId
let retInfo = match tyOpt with None -> None | Some ty -> Some (SynReturnInfo((ty, SynInfo.unnamedRetVal), ty.Range))
let attribs = mkAttributeList attribs mMemberPortion
let binding = mkSynBinding (xmlDoc, headPat) (access, false, false, mMemberPortion, DebugPointAtBinding.NoneAtInvisible, retInfo, rhsExpr, rhsExpr.Range, [], attribs, Some memberFlags, SynBindingTrivia.Zero)
let binding = mkSynBinding (xmlDoc, headPat) (access, false, false, mMemberPortion, DebugPointAtBinding.NoneAtInvisible, tyOpt, rhsExpr, rhsExpr.Range, [], attribs, Some memberFlags, SynBindingTrivia.Zero)
SynMemberDefn.Member (binding, mMemberPortion)
yield getter
| _ -> ()
Expand Down Expand Up @@ -4084,7 +4088,7 @@ module TcDeclarations =

let isConcrete =
members |> List.exists (function
| SynMemberDefn.Member(SynBinding(valData = SynValData(Some memberFlags, _, _)), _) -> not memberFlags.IsDispatchSlot
| SynMemberDefn.Member(SynBinding(valData = SynValData(Some memberFlags, _)), _) -> not memberFlags.IsDispatchSlot
| SynMemberDefn.Interface (members=defOpt) -> Option.isSome defOpt
| SynMemberDefn.LetBindings _ -> true
| SynMemberDefn.ImplicitCtor _ -> true
Expand Down Expand Up @@ -4242,10 +4246,11 @@ module TcDeclarations =
// members of the type
let preEstablishedHasDefaultCtor =
members |> List.exists (function
| SynMemberSig.Member (synValSig, memberFlags, _) ->
| SynMemberSig.Member (SynValSig(synType = ty) as synValSig, memberFlags, _) ->
memberFlags.MemberKind=SynMemberKind.Constructor &&
// REVIEW: This is a syntactic approximation
(match synValSig.SynType, synValSig.SynInfo.CurriedArgInfos with
let arity = mkArityForType ty
(match synValSig.SynType, arity.CurriedArgInfos with
| StripParenTypes (SynType.Fun (argType = StripParenTypes (SynType.LongIdent (SynLongIdent([id], _, _))))), [[_]] when id.idText = "unit" -> true
| _ -> false)
| _ -> false)
Expand Down Expand Up @@ -4584,7 +4589,7 @@ and TcModuleOrNamespaceSignatureElementsNonMutRec cenv parent env (id, moduleKin
let ElimSynModuleDeclExpr bind =
match bind with
| SynModuleDecl.Expr (expr, m) ->
let bind2 = SynBinding (None, SynBindingKind.StandaloneExpression, false, false, [], PreXmlDoc.Empty, SynInfo.emptySynValData, SynPat.Wild m, None, expr, m, DebugPointAtBinding.NoneAtDo, SynBindingTrivia.Zero)
let bind2 = SynBinding (None, SynBindingKind.StandaloneExpression, false, false, [], PreXmlDoc.Empty, SynValData(None, None), SynPat.Wild m, None, expr, m, DebugPointAtBinding.NoneAtDo, SynBindingTrivia.Zero)
SynModuleDecl.Let(false, [bind2], m)
| _ -> bind

Expand Down
55 changes: 34 additions & 21 deletions src/Compiler/Checking/CheckExpressions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2266,7 +2266,7 @@ let PushOnePatternToRhs (cenv: cenv) isMember synPat (NormalizedBindingRhs(simpl
NormalizedBindingRhs(simplePats :: simplePatsList, retTyOpt, rhsExpr)

type NormalizedBindingPatternInfo =
NormalizedBindingPat of SynPat * NormalizedBindingRhs * SynValData * SynValTyparDecls
NormalizedBindingPat of SynPat * NormalizedBindingRhs * SynValData2 * SynValTyparDecls

/// Represents a syntactic, unchecked binding after the resolution of the name resolution status of pattern
/// constructors and after "pushing" all complex patterns to the right hand side.
Expand All @@ -2279,7 +2279,7 @@ type NormalizedBinding =
attribs: SynAttribute list *
xmlDoc: XmlDoc *
typars: SynValTyparDecls *
valSynData: SynValData *
valSynData: SynValData2 *
pat: SynPat *
rhsExpr: NormalizedBindingRhs *
mBinding: range *
Expand All @@ -2298,14 +2298,14 @@ module BindingNormalization =


let private MakeNormalizedStaticOrValBinding (cenv: cenv) isObjExprBinding id vis typars args rhsExpr valSynData =
let (SynValData(memberFlagsOpt, _, _)) = valSynData
let (SynValData2(memberFlagsOpt, _, _)) = valSynData
NormalizedBindingPat(mkSynPatVar vis id, PushMultiplePatternsToRhs cenv ((isObjExprBinding = ObjExprBinding) || Option.isSome memberFlagsOpt) args rhsExpr, valSynData, typars)

let private MakeNormalizedInstanceMemberBinding (cenv: cenv) thisId memberId toolId vis m typars args rhsExpr valSynData =
NormalizedBindingPat(SynPat.InstanceMember(thisId, memberId, toolId, vis, m), PushMultiplePatternsToRhs cenv true args rhsExpr, valSynData, typars)

let private NormalizeStaticMemberBinding (cenv: cenv) (memberFlags: SynMemberFlags) valSynData id vis typars args m rhsExpr =
let (SynValData(_, valSynInfo, thisIdOpt)) = valSynData
let (SynValData2(_, valSynInfo, thisIdOpt)) = valSynData
if memberFlags.IsInstance then
// instance method without adhoc "this" argument
error(Error(FSComp.SR.tcInstanceMemberRequiresTarget(), m))
Expand All @@ -2319,15 +2319,15 @@ module BindingNormalization =
// static property: these transformed into methods taking one "unit" argument
| [], SynMemberKind.Member ->
let memberFlags = {memberFlags with MemberKind = SynMemberKind.PropertyGet}
let valSynData = SynValData(Some memberFlags, valSynInfo, thisIdOpt)
let valSynData = SynValData2(Some memberFlags, valSynInfo, thisIdOpt)
NormalizedBindingPat(mkSynPatVar vis id,
PushOnePatternToRhs cenv true (SynPat.Const(SynConst.Unit, m)) rhsExpr,
valSynData,
typars)
| _ -> MakeNormalizedStaticOrValBinding cenv ValOrMemberBinding id vis typars args rhsExpr valSynData

let private NormalizeInstanceMemberBinding (cenv: cenv) (memberFlags: SynMemberFlags) valSynData thisId memberId (toolId: Ident option) vis typars args m rhsExpr =
let (SynValData(_, valSynInfo, thisIdOpt)) = valSynData
let (SynValData2(_, valSynInfo, thisIdOpt)) = valSynData

if not memberFlags.IsInstance then
// static method with adhoc "this" argument
Expand All @@ -2351,15 +2351,15 @@ module BindingNormalization =
(SynPat.InstanceMember(thisId, memberId, toolId, vis, m),
PushOnePatternToRhs cenv true (SynPat.Const(SynConst.Unit, m)) rhsExpr,
// Update the member info to record that this is a SynMemberKind.PropertyGet
SynValData(Some memberFlags, valSynInfo, thisIdOpt),
SynValData2(Some memberFlags, valSynInfo, thisIdOpt),
typars)

| _ ->
MakeNormalizedInstanceMemberBinding cenv thisId memberId toolId vis m typars args rhsExpr valSynData

let private NormalizeBindingPattern (cenv: cenv) nameResolver isObjExprBinding (env: TcEnv) valSynData headPat rhsExpr =
let ad = env.AccessRights
let (SynValData(memberFlagsOpt, _, _)) = valSynData
let (SynValData2(memberFlagsOpt, _, _)) = valSynData
let rec normPattern pat =
// One major problem with versions of F# prior to 1.9.x was that data constructors easily 'pollute' the namespace
// of available items, to the point that you can't even define a function with the same name as an existing union case.
Expand Down Expand Up @@ -2423,7 +2423,17 @@ module BindingNormalization =

let NormalizeBinding isObjExprBinding (cenv: cenv) (env: TcEnv) binding =
match binding with
| SynBinding (vis, kind, isInline, isMutable, Attributes attrs, xmlDoc, valSynData, headPat, retInfo, rhsExpr, mBinding, debugPoint, _) ->
| SynBinding (vis, kind, isInline, isMutable, Attributes attrs, xmlDoc, _, headPat, retInfo, rhsExpr, mBinding, debugPoint, _) ->
let valSynData = inferSynValDataFromBinding binding

let retInfo : SynBindingReturnInfo option =
match retInfo with
| Some (SynType.SignatureParameter(attributes, _, _, usedType, m)) ->
Some(SynBindingReturnInfo(usedType, m, attributes))
| Some t ->
Some(SynBindingReturnInfo(t, t.Range, []))
| None -> None

let (NormalizedBindingPat(pat, rhsExpr, valSynData, typars)) =
NormalizeBindingPattern cenv cenv.nameResolver isObjExprBinding env valSynData headPat (NormalizedBindingRhs ([], retInfo, rhsExpr))
let paramNames = Some valSynData.SynValInfo.ArgNames
Expand Down Expand Up @@ -2459,10 +2469,10 @@ module EventDeclarationNormalization =
| _ -> error(BadEventTransformation m)

let private ConvertSynData m valSynData =
let (SynValData(memberFlagsOpt, valSynInfo, thisIdOpt)) = valSynData
let (SynValData2(memberFlagsOpt, valSynInfo, thisIdOpt)) = valSynData
let memberFlagsOpt = ConvertMemberFlagsOpt m memberFlagsOpt
let valSynInfo = ConvertSynInfo m valSynInfo
SynValData(memberFlagsOpt, valSynInfo, thisIdOpt)
SynValData2(memberFlagsOpt, valSynInfo, thisIdOpt)

let rec private RenameBindingPattern f declPattern =
match declPattern with
Expand Down Expand Up @@ -4061,7 +4071,8 @@ and TcPseudoMemberSpec cenv newOk env synTypes tpenv synMemberSig m =
/// Check a value specification, e.g. in a signature, interface declaration or a constraint
and TcValSpec (cenv: cenv) env declKind newOk containerInfo memFlagsOpt thisTyOpt tpenv synValSig attrs =
let g = cenv.g
let (SynValSig(ident=SynIdent(id,_); explicitTypeParams=ValTyparDecls (synTypars, synTyparConstraints, _); synType=ty; arity=valSynInfo; range=m)) = synValSig
let (SynValSig(ident=SynIdent(id,_); explicitTypeParams=ValTyparDecls (synTypars, synTyparConstraints, _); synType=ty; range=m)) = synValSig
let valSynInfo = mkArityForType ty
let declaredTypars = TcTyparDecls cenv env synTypars
let (ContainerInfo(altActualParent, tcrefContainerInfo)) = containerInfo

Expand Down Expand Up @@ -4353,9 +4364,11 @@ and TcTypeOrMeasure kindOpt (cenv: cenv) newOk checkConstraints occ (iwsam: Warn
| SynType.App(arg1, _, args, _, _, postfix, m) ->
TcTypeMeasureApp kindOpt cenv newOk checkConstraints occ env tpenv arg1 args postfix m

| SynType.Paren(innerType, _) ->
| SynType.Paren(innerType, _)
| SynType.SignatureParameter(usedType = innerType) ->
TcTypeOrMeasure kindOpt cenv newOk checkConstraints occ iwsam env tpenv innerType


and CheckIWSAM (cenv: cenv) (env: TcEnv) checkConstraints iwsam m tcref =
let g = cenv.g
let ad = env.eAccessRights
Expand Down Expand Up @@ -6590,7 +6603,7 @@ and TcRecordConstruction (cenv: cenv) (overallTy: TType) env tpenv withExprInfoO

and GetNameAndSynValInfoOfObjExprBinding _cenv _env b =
let (NormalizedBinding (_, _, _, _, _, _, _, valSynData, pat, rhsExpr, mBinding, _)) = b
let (SynValData(memberFlagsOpt, valSynInfo, _)) = valSynData
let (SynValData2(memberFlagsOpt, valSynInfo, _)) = valSynData
match pat, memberFlagsOpt with

// This is the normal case for F# 'with member x.M(...) = ...'
Expand Down Expand Up @@ -6682,7 +6695,7 @@ and TcObjectExprBinding (cenv: cenv) (env: TcEnv) implTy tpenv (absSlotInfo, bin
let g = cenv.g

let (NormalizedBinding(vis, kind, isInline, isMutable, attrs, xmlDoc, synTyparDecls, valSynData, headPat, bindingRhs, mBinding, debugPoint)) = bind
let (SynValData(memberFlagsOpt, _, _)) = valSynData
let (SynValData2(memberFlagsOpt, _, _)) = valSynData

// 4a2. adjust the binding, especially in the "member" case, a subset of the logic of AnalyzeAndMakeAndPublishRecursiveValue
let bindingRhs, logicalMethId, memberFlags =
Expand Down Expand Up @@ -6762,7 +6775,7 @@ and ComputeObjectExprOverrides (cenv: cenv) (env: TcEnv) tpenv impls =
let binds, bindsAttributes =
[ for binding in binds do
let (NormalizedBinding(_, _, _, _, bindingSynAttribs, _, _, valSynData, _, _, _, _)) = binding
let (SynValData(memberFlagsOpt, _, _)) = valSynData
let (SynValData2(memberFlagsOpt, _, _)) = valSynData
let attrTgt = ObjectExpressionOverrideBinding.AllowedAttribTargets memberFlagsOpt
let bindingAttribs = TcAttributes cenv env attrTgt bindingSynAttribs
yield binding, bindingAttribs
Expand Down Expand Up @@ -10176,7 +10189,7 @@ and TcNormalizedBinding declKind (cenv: cenv) env tpenv overallTy safeThisValOpt

match bind with
| NormalizedBinding(vis, kind, isInline, isMutable, attrs, xmlDoc, _, valSynData, pat, NormalizedBindingRhs(spatsL, rtyOpt, rhsExpr), mBinding, debugPoint) ->
let (SynValData(memberFlagsOpt, _, _)) = valSynData
let (SynValData2(memberFlagsOpt, _, _)) = valSynData

let callerName =
match declKind, kind, pat with
Expand Down Expand Up @@ -10234,8 +10247,8 @@ and TcNormalizedBinding declKind (cenv: cenv) env tpenv overallTy safeThisValOpt
match rotRetSynAttrs with
| [] -> valSynData
| {Range=mHead} :: _ ->
let (SynValData(valMf, SynValInfo(args, SynArgInfo(attrs, opt, retId)), valId)) = valSynData
SynValData(valMf, SynValInfo(args, SynArgInfo({Attributes=rotRetSynAttrs; Range=mHead} :: attrs, opt, retId)), valId)
let (SynValData2(valMf, SynValInfo(args, SynArgInfo(attrs, opt, retId)), valId)) = valSynData
SynValData2(valMf, SynValInfo(args, SynArgInfo({Attributes=rotRetSynAttrs; Range=mHead} :: attrs, opt, retId)), valId)
retAttribs, valAttribs, valSynData

let isVolatile = HasFSharpAttribute g g.attrib_VolatileFieldAttribute valAttribs
Expand Down Expand Up @@ -10312,7 +10325,7 @@ and TcNormalizedBinding declKind (cenv: cenv) env tpenv overallTy safeThisValOpt
let isCompGen = false

// Use the syntactic arity if we're defining a function
let (SynValData(_, valSynInfo, _)) = valSynData
let (SynValData2(_, valSynInfo, _)) = valSynData
let prelimValReprInfo = TranslateSynValInfo mBinding (TcAttributes cenv env) valSynInfo

// Check the pattern of the l.h.s. of the binding
Expand Down Expand Up @@ -11350,7 +11363,7 @@ and AnalyzeAndMakeAndPublishRecursiveValue
// Pull apart the inputs
let (NormalizedBinding(vis1, bindingKind, isInline, isMutable, bindingSynAttribs, bindingXmlDoc, synTyparDecls, valSynData, declPattern, bindingRhs, mBinding, debugPoint)) = binding
let (NormalizedBindingRhs(_, _, bindingExpr)) = bindingRhs
let (SynValData(memberFlagsOpt, valSynInfo, thisIdOpt)) = valSynData
let (SynValData2(memberFlagsOpt, valSynInfo, thisIdOpt)) = valSynData
let (ContainerInfo(altActualParent, tcrefContainerInfo)) = containerInfo

let attrTgt = declKind.AllowedAttribTargets memberFlagsOpt
Expand Down
2 changes: 1 addition & 1 deletion src/Compiler/Checking/CheckExpressions.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ type NormalizedBinding =
attribs: SynAttribute list *
xmlDoc: XmlDoc *
typars: SynValTyparDecls *
valSynData: SynValData *
valSynData: SynValData2 *
pat: SynPat *
rhsExpr: NormalizedBindingRhs *
mBinding: range *
Expand Down
Loading