Skip to content

Commit 103396b

Browse files
committed
Fantomas
1 parent aa0b26a commit 103396b

2 files changed

Lines changed: 47 additions & 14 deletions

File tree

src/Compiler/SyntaxTree/ParseHelpers.fs

Lines changed: 40 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,31 +1137,64 @@ let mkLetBangExpression
11371137
IsFromSource = true // User-written let!/use! bindings
11381138
}
11391139

1140-
let mkAbstractMember parseState attrs (accessBeforeKeyword: SynAccess option) memberFlags (accessBeforeId: SynAccess option) mInline id typeParams typeWithConstraints accessors =
1140+
let mkAbstractMember
1141+
parseState
1142+
attrs
1143+
(accessBeforeKeyword: SynAccess option)
1144+
memberFlags
1145+
(accessBeforeId: SynAccess option)
1146+
mInline
1147+
id
1148+
typeParams
1149+
typeWithConstraints
1150+
accessors
1151+
=
11411152
if Option.isSome accessBeforeKeyword then
11421153
errorR (Error(FSComp.SR.parsVisibilityDeclarationsShouldComePriorToIdentifier (), rhs parseState 2))
11431154

11441155
let (ty: SynType), arity = typeWithConstraints
1145-
let isInline, doc, explicitValTyparDecls = Option.isSome mInline, grabXmlDoc (parseState, attrs, 1), typeParams
1146-
let mWith, (getSet, getSetRangeOpt: GetSetKeywords option, getterAccess, setterAccess) = accessors
1156+
1157+
let isInline, doc, explicitValTyparDecls =
1158+
Option.isSome mInline, grabXmlDoc (parseState, attrs, 1), typeParams
1159+
1160+
let mWith, (getSet, getSetRangeOpt: GetSetKeywords option, getterAccess, setterAccess) =
1161+
accessors
1162+
11471163
let getSetAdjuster arity =
11481164
match arity, getSet with
11491165
| SynValInfo([], _), SynMemberKind.Member -> SynMemberKind.PropertyGet
11501166
| _ -> getSet
11511167

11521168
let mWhole =
11531169
let m = rhs parseState 1
1170+
11541171
match getSetRangeOpt with
11551172
| None -> unionRanges m ty.Range
11561173
| Some gs -> unionRanges m gs.Range
11571174
|> unionRangeWithXmlDoc doc
11581175

11591176
[ accessBeforeKeyword; accessBeforeId; getterAccess; setterAccess ]
1160-
|> List.iter (function None -> () | Some access -> errorR (Error(FSComp.SR.parsAccessibilityModsIllegalForAbstract (), access.Range)))
1177+
|> List.iter (function
1178+
| None -> ()
1179+
| Some access -> errorR (Error(FSComp.SR.parsAccessibilityModsIllegalForAbstract (), access.Range)))
11611180

11621181
let mkFlags, leadingKeyword = memberFlags
1163-
let trivia = { LeadingKeyword = leadingKeyword; InlineKeyword = mInline; WithKeyword = mWith; EqualsRange = None }
1182+
1183+
let trivia =
1184+
{
1185+
LeadingKeyword = leadingKeyword
1186+
InlineKeyword = mInline
1187+
WithKeyword = mWith
1188+
EqualsRange = None
1189+
}
1190+
11641191
let vis2 = SynValSigAccess.Single None
1165-
let valSpfn = SynValSig(attrs, id, explicitValTyparDecls, ty, arity, isInline, false, doc, vis2, None, mWhole, trivia)
1192+
1193+
let valSpfn =
1194+
SynValSig(attrs, id, explicitValTyparDecls, ty, arity, isInline, false, doc, vis2, None, mWhole, trivia)
1195+
11661196
let trivia: SynMemberDefnAbstractSlotTrivia = { GetSetKeywords = getSetRangeOpt }
1167-
[ SynMemberDefn.AbstractSlot(valSpfn, mkFlags (getSetAdjuster arity), mWhole, trivia) ]
1197+
1198+
[
1199+
SynMemberDefn.AbstractSlot(valSpfn, mkFlags (getSetAdjuster arity), mWhole, trivia)
1200+
]

src/Compiler/SyntaxTree/ParseHelpers.fsi

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,10 @@ val mkAbstractMember:
291291
attrs: SynAttributeList list ->
292292
accessBeforeKeyword: SynAccess option ->
293293
abstractMemberFlags: (SynMemberKind -> SynMemberFlags) * SynLeadingKeyword ->
294-
accessBeforeId: SynAccess option ->
295-
mInline: range option ->
296-
id: SynIdent ->
297-
typeParams: SynValTyparDecls ->
298-
typeWithConstraints: SynType * SynValInfo ->
299-
accessors: range option * (SynMemberKind * GetSetKeywords option * SynAccess option * SynAccess option) ->
300-
SynMemberDefn list
294+
accessBeforeId: SynAccess option ->
295+
mInline: range option ->
296+
id: SynIdent ->
297+
typeParams: SynValTyparDecls ->
298+
typeWithConstraints: SynType * SynValInfo ->
299+
accessors: range option * (SynMemberKind * GetSetKeywords option * SynAccess option * SynAccess option) ->
300+
SynMemberDefn list

0 commit comments

Comments
 (0)