fantomasd

Author: T-Gro

src/Compiler/AbstractIL/il.fsi

@@ -2217,7 +2217,12 @@ val internal prependInstrsToClassCtor:
 
 /// Derived functions for making some simple constructors
 val internal mkILStorageCtor:
-    ILInstr list * ILType * (string * ILType * ILAttribute list) list * ILMemberAccess * ILDebugPoint option * ILDebugImports option ->
+    ILInstr list *
+    ILType *
+    (string * ILType * ILAttribute list) list *
+    ILMemberAccess *
+    ILDebugPoint option *
+    ILDebugImports option ->
         ILMethodDef
 
 val internal mkILSimpleStorageCtor:

src/Compiler/CodeGen/EraseClosures.fs

@@ -560,7 +560,7 @@ let rec convIlxClosureDef cenv encl (td: ILTypeDef) clo =
                     mkILStorageCtor (
                         [ mkLdarg0; mkNormalCall (mkILCtorMethSpecForTy (cenv.mkILTyFuncTy, [])) ],
                         nowTy,
-                        mkILCloFldSpecs cenv nowFields |> List.map (fun (name,t) -> (name,t,[])),
+                        mkILCloFldSpecs cenv nowFields |> List.map (fun (name, t) -> (name, t, [])),
                         ILMemberAccess.Assembly,
                         None,
                         None
@@ -695,7 +695,7 @@ let rec convIlxClosureDef cenv encl (td: ILTypeDef) clo =
                         mkILStorageCtor (
                             [ mkLdarg0; mkNormalCall (mkILCtorMethSpecForTy (nowEnvParentClass, [])) ],
                             nowTy,
-                            mkILCloFldSpecs cenv nowFields |> List.map (fun (name,t) -> (name,t,[])),
+                            mkILCloFldSpecs cenv nowFields |> List.map (fun (name, t) -> (name, t, [])),
                             ILMemberAccess.Assembly,
                             None,
                             cloImports

src/Compiler/CodeGen/EraseUnions.fs

@@ -214,16 +214,17 @@ let mkUnionCaseFieldId (fdef: IlxUnionCaseField) =
     // Use the lower case name of a field or constructor as the field/parameter name if it differs from the uppercase name
     fdef.LowerName, fdef.Type
 
-let inline getFieldsNullability (g:TcGlobals) (ilf:ILFieldDef) =
+let inline getFieldsNullability (g: TcGlobals) (ilf: ILFieldDef) =
     if g.checkNullness then
         ilf.CustomAttrs.AsArray()
         |> Array.tryFind (IsILAttrib g.attrib_NullableAttribute)
-    else None
+    else
+        None
 
 let mkUnionCaseFieldIdAndAttrs g fdef =
-    let nm,t = mkUnionCaseFieldId fdef
+    let nm, t = mkUnionCaseFieldId fdef
     let attrs = getFieldsNullability g fdef.ILField
-    nm,t,attrs |> Option.toList
+    nm, t, attrs |> Option.toList
 
 let refToFieldInTy ty (nm, fldTy) = mkILFieldSpecInTy (ty, nm, fldTy)
 
@@ -724,7 +725,7 @@ let mkMethodsAndPropertiesForFields
                 let ilReturn =
                     match getFieldsNullability g field.ILField with
                     | None -> ilReturn
-                    | Some a -> ilReturn.WithCustomAttrs(mkILCustomAttrsFromArray [|a|])
+                    | Some a -> ilReturn.WithCustomAttrs(mkILCustomAttrsFromArray [| a |])
 
                 yield
                     mkILNonGenericInstanceMethod (
@@ -816,15 +817,17 @@ let convAlternativeDef
 
                     match getFieldsNullability g fd.ILField with
                     | None -> plainParam
-                    | Some a -> { plainParam with CustomAttrsStored = storeILCustomAttrs (mkILCustomAttrsFromArray [|a|]) } )
+                    | Some a ->
+                        { plainParam with
+                            CustomAttrsStored = storeILCustomAttrs (mkILCustomAttrsFromArray [| a |])
+                        })
 
                 |> Array.toList,
                 mkILReturn baseTy,
                 mkMethodBody (true, locals, fields.Length + locals.Length, nonBranchingInstrsToCode ilInstrs, attr, imports)
             )
             |> addAltAttribs
             |> addMethodGeneratedAttrs
-            
 
         mdef
 
@@ -987,7 +990,6 @@ let convAlternativeDef
                         )
                         |> addAltAttribs
                         |> addMethodGeneratedAttrs
-                        
 
                     let nullaryProp =
 
@@ -1162,6 +1164,7 @@ let convAlternativeDef
                             |> Array.map (fun field ->
                                 let fldName, fldTy, attrs = mkUnionCaseFieldIdAndAttrs g field
                                 let fdef = mkILInstanceField (fldName, fldTy, None, ILMemberAccess.Assembly)
+
                                 let fdef =
                                     match attrs with
                                     | [] -> fdef
@@ -1204,9 +1207,10 @@ let convAlternativeDef
                                  cud.UnionCasesAccessibility)
 
                         let basicCtorFields =
-                            basicFields |> List.map (fun fdef -> 
+                            basicFields
+                            |> List.map (fun fdef ->
                                 let existingAttrs = fdef.CustomAttrs.AsArray()
-                                let nullableAttr = getFieldsNullability g fdef |> Option.toList                                 
+                                let nullableAttr = getFieldsNullability g fdef |> Option.toList
                                 fdef.Name, fdef.FieldType, nullableAttr)
 
                         let basicCtorMeth =
@@ -1304,7 +1308,7 @@ let mkClassUnionDef
         | SingleCase
         | RuntimeTypes
         | TailOrNull -> []
-        | IntegerTag -> [ let n,t = mkTagFieldId g.ilg cuspec in n,t,[] ]
+        | IntegerTag -> [ let n, t = mkTagFieldId g.ilg cuspec in n, t, [] ]
 
     let isStruct = td.IsStruct
 
@@ -1344,7 +1348,9 @@ let mkClassUnionDef
                         if isStruct && not (cidx = minNullaryIdx) then
                             []
                         else
-                            let fields = alt.FieldDefs |> Array.map (mkUnionCaseFieldIdAndAttrs g) |> Array.toList
+                            let fields =
+                                alt.FieldDefs |> Array.map (mkUnionCaseFieldIdAndAttrs g) |> Array.toList
+
                             [
                                 (mkILSimpleStorageCtor (
                                     baseInit,
@@ -1414,7 +1420,10 @@ let mkClassUnionDef
                         fieldDefs
                         |> Array.filter (fun f -> fieldsEmitted.Add(struct (f.LowerName, f.Type)))
 
-                    let fields = fieldsToBeAddedIntoType |> Array.map (mkUnionCaseFieldIdAndAttrs g) |> Array.toList
+                    let fields =
+                        fieldsToBeAddedIntoType
+                        |> Array.map (mkUnionCaseFieldIdAndAttrs g)
+                        |> Array.toList
 
                     let props, meths =
                         mkMethodsAndPropertiesForFields
@@ -1437,6 +1446,7 @@ let mkClassUnionDef
             for fldName, fldTy, attrs in (selfFields @ tagFieldsInObject) do
                 let fdef =
                     let fdef = mkILInstanceField (fldName, fldTy, None, ILMemberAccess.Assembly)
+
                     match attrs with
                     | [] -> fdef
                     | attrs -> fdef.With(customAttrs = mkILCustomAttrs attrs)

src/Compiler/CodeGen/IlxGen.fs

@@ -2057,7 +2057,9 @@ type AnonTypeGenerationTable() =
         if ilTypeRef.Scope.IsLocalRef then
 
             let flds =
-                [ for i, nm in Array.indexed nms -> (nm, nm + "@", ILType.TypeVar(uint16 i), []) ]
+                [
+                    for i, nm in Array.indexed nms -> (nm, nm + "@", ILType.TypeVar(uint16 i), [])
+                ]
 
             let ilGenericParams =
                 [
@@ -2082,7 +2084,7 @@ type AnonTypeGenerationTable() =
             let ilFieldDefs =
                 mkILFields
                     [
-                        for _, fldName, fldTy,_attrs in flds ->
+                        for _, fldName, fldTy, _attrs in flds ->
                             let fdef = mkILInstanceField (fldName, fldTy, None, ILMemberAccess.Private)
                             let attrs = [ g.CompilerGeneratedAttribute; g.DebuggerBrowsableNeverAttribute ]
                             fdef.With(customAttrs = mkILCustomAttrs attrs)
@@ -2092,7 +2094,7 @@ type AnonTypeGenerationTable() =
             let ilProperties =
                 mkILProperties
                     [
-                        for i, (propName, _fldName, fldTy,_attrs) in List.indexed flds ->
+                        for i, (propName, _fldName, fldTy, _attrs) in List.indexed flds ->
                             ILPropertyDef(
                                 name = propName,
                                 attributes = PropertyAttributes.None,
@@ -2108,7 +2110,7 @@ type AnonTypeGenerationTable() =
 
             let ilMethods =
                 [
-                    for propName, fldName, fldTy,_attrs in flds ->
+                    for propName, fldName, fldTy, _attrs in flds ->
                         let attrs = if isStruct then [ GetReadOnlyAttribute g ] else []
 
                         mkLdfldMethodDef ("get_" + propName, ILMemberAccess.Public, false, ilTy, fldName, fldTy, ILAttributes.Empty, attrs)
@@ -2158,7 +2160,7 @@ type AnonTypeGenerationTable() =
 
             let rfields =
                 (tps, flds)
-                ||> List.map2 (fun tp (propName, _fldName, _fldTy,_attrs) ->
+                ||> List.map2 (fun tp (propName, _fldName, _fldTy, _attrs) ->
                     Construct.NewRecdField
                         false
                         None
@@ -5843,7 +5845,8 @@ and GenActualSlotsig
         GenReturnType cenv m eenv.tyenv (Option.map (instType instForSlotSig) ilSlotRetTy)
 
     let iLRet = mkILReturn ilRetTy
-    let ilRetWithAttrs = 
+
+    let ilRetWithAttrs =
         match ilSlotRetTy with
         | None -> iLRet
         | Some t ->
@@ -11220,9 +11223,10 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon: Tycon) : ILTypeRef option
                             let isStruct = isStructTyconRef tcref
 
                             let retTyAttrs = GenAdditionalAttributesForTy g fspec.FormalType |> mkILCustomAttrs
-                            let attrs =                              
+
+                            let attrs =
                                 if isStruct && not isStatic then
-                                    [ GetReadOnlyAttribute g]
+                                    [ GetReadOnlyAttribute g ]
                                 else
                                     []
 
@@ -11241,9 +11245,15 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon: Tycon) : ILTypeRef option
 
                             let ilParams =
                                 let param = mkILParamNamed ("value", ilPropType)
+
                                 match GenAdditionalAttributesForTy g fspec.FormalType with
                                 | [] -> [ param ]
-                                | attrs -> [ {param with CustomAttrsStored = storeILCustomAttrs (mkILCustomAttrs attrs ) }]
+                                | attrs ->
+                                    [
+                                        { param with
+                                            CustomAttrsStored = storeILCustomAttrs (mkILCustomAttrs attrs)
+                                        }
+                                    ]
 
                             let ilReturn = mkILReturn ILType.Void
 
@@ -11812,7 +11822,7 @@ and GenExnDef cenv mgbuf eenv m (exnc: Tycon) : ILTypeRef option =
                     let ilPropType = GenType cenv m eenv.tyenv fld.FormalType
                     let ilMethName = "get_" + fld.LogicalName
                     let ilFieldName = ComputeFieldName exnc fld
-                    let typeDerivedAttributes = GenAdditionalAttributesForTy g fld.FormalType 
+                    let typeDerivedAttributes = GenAdditionalAttributesForTy g fld.FormalType
 
                     let ilMethodDef =
                         let def =

src/Compiler/CodeGen/IlxGenSupport.fs

@@ -13,7 +13,11 @@ open FSharp.Compiler.TypedTree
 /// Make a method that simply loads a field
 let mkLdfldMethodDef (ilMethName, iLAccess, isStatic, ilTy, ilFieldName, ilPropType, retTyAttrs, customAttrs) =
     let ilFieldSpec = mkILFieldSpecInTy (ilTy, ilFieldName, ilPropType)
-    let ilReturn = { mkILReturn ilPropType with CustomAttrsStored = storeILCustomAttrs retTyAttrs}
+
+    let ilReturn =
+        { mkILReturn ilPropType with
+            CustomAttrsStored = storeILCustomAttrs retTyAttrs
+        }
 
     let ilMethodDef =
         if isStatic then