提交 98eec39f 编写于 作者: D Don Syme

cleaup whitespace

上级 5ef60c91
......@@ -1918,21 +1918,21 @@ let buildModuleTypePass4 visited emEnv tdef = buildTypeDefPass4 visited [] emE
//----------------------------------------------------------------------------
let buildModuleFragment cenv emEnv (asmB : AssemblyBuilder) (modB : ModuleBuilder) (m: ILModuleDef) =
let tdefs = m.TypeDefs.AsArray
let tdefs = m.TypeDefs.AsList
let emEnv = (emEnv, tdefs) ||> Array.fold (buildModuleTypePass1 cenv modB)
tdefs |> Array.iter (buildModuleTypePass1b cenv emEnv)
let emEnv = (emEnv, tdefs) ||> Array.fold (buildModuleTypePass2 cenv)
let emEnv = (emEnv, tdefs) ||> List.fold (buildModuleTypePass1 cenv modB)
tdefs |> List.iter (buildModuleTypePass1b cenv emEnv)
let emEnv = (emEnv, tdefs) ||> List.fold (buildModuleTypePass2 cenv)
for delayedFieldInit in emEnv.delayedFieldInits do
delayedFieldInit()
let emEnv = { emEnv with delayedFieldInits = [] }
let emEnv = (emEnv, tdefs) ||> Array.fold (buildModuleTypePass3 cenv modB)
let emEnv = (emEnv, tdefs) ||> List.fold (buildModuleTypePass3 cenv modB)
let visited = new Dictionary<_,_>(10)
let created = new Dictionary<_,_>(10)
tdefs |> Array.iter (buildModuleTypePass4 (visited,created) emEnv)
tdefs |> List.iter (buildModuleTypePass4 (visited,created) emEnv)
let emEnv = Seq.fold envUpdateCreatedTypeRef emEnv created.Keys // update typT with the created typT
emitCustomAttrs cenv emEnv modB.SetCustomAttributeAndLog m.CustomAttrs;
m.Resources.AsList |> List.iter (fun r ->
......
......@@ -1120,11 +1120,11 @@ and TypeDefsBuilder() =
let tdef = b.Close()
// Skip the <PrivateImplementationDetails$> type if it is empty
if not eliminateIfEmpty
|| tdef.NestedTypes.AsList.IsEmpty
|| tdef.NestedTypes.AsList.IsEmpty
|| not tdef.Fields.AsList.IsEmpty
|| not tdef.Events.AsList.IsEmpty
|| not tdef.Properties.AsList.IsEmpty
|| tdef.Methods.AsList.Length <> 0 then
|| tdef.Methods.AsList.IsEmpty then
yield tdef ]
member b.FindTypeDefBuilder(nm) =
......@@ -3936,7 +3936,7 @@ and GenDelegateExpr cenv cgbuf eenvouter expr (TObjExprMethod((TSlotSig(_,delega
let tcref = tcrefOfAppTy cenv.g delegateTy
let _,_,tdef = tcref.ILTyconInfo
match tdef.Methods.FindByName ".ctor" with
| [ ctorMDef ] ->
| [ctorMDef] ->
match ctorMDef.Parameters |> ILList.toList with
| [ _;p2 ] -> (p2.Type.TypeSpec.Name = "System.UIntPtr")
| _ -> false
......
......@@ -476,9 +476,9 @@ module private PrintIL =
let bodyStatic =
memberBlockLs (typeDef.Fields.AsList |> List.filter (fun fd -> fd.IsStatic) |> mkILFields,
typeDef.Methods.AsList |> List.filter (fun md -> md.IsStatic) |> mkILMethods,
typeDef.Properties.AsList |> List.filter (fun pd -> isStaticILProperty pd) |> mkILProperties,
typeDef.Events.AsList |> List.filter (fun ed -> isStaticILEvent ed) |> mkILEvents)
typeDef.Methods.AsList |> List.filter (fun md -> md.IsStatic) |> mkILMethods,
typeDef.Properties.AsList |> List.filter (fun pd -> isStaticILProperty pd) |> mkILProperties,
typeDef.Events.AsList |> List.filter (fun ed -> isStaticILEvent ed) |> mkILEvents)
let bodyInstance =
memberBlockLs (typeDef.Fields.AsList |> List.filter (fun fd -> not(fd.IsStatic)) |> mkILFields,
......
......@@ -1308,7 +1308,7 @@ module StaticLinker =
{ ilxMainModule with
Manifest = (let m = ilxMainModule.ManifestOfAssembly in Some {m with CustomAttrs = mkILCustomAttrs (m.CustomAttrs.AsList @ savedManifestAttrs) });
CustomAttrs = mkILCustomAttrs [ for m in moduls do yield! m.CustomAttrs.AsList ];
TypeDefs = mkILTypeDefs [ yield topTypeDef ; yield! List.concat normalTypeDefs ];
TypeDefs = mkILTypeDefs (topTypeDef :: List.concat normalTypeDefs);
Resources = mkILResources (savedResources @ ilxMainModule.Resources.AsList);
NativeResources = savedNativeResources }
......@@ -1629,8 +1629,8 @@ module StaticLinker =
let rec rw enc (tdefs: ILTypeDefs) =
mkILTypeDefs
[ for tdef in tdefs do
let ilOrigTyRef = mkILNestedTyRef (ilOrigScopeRef, enc, tdef.Name)
if not (ilOrigTyRefsForProviderGeneratedTypesToRelocate.ContainsKey ilOrigTyRef) then
let ilOrigTyRef = mkILNestedTyRef (ilOrigScopeRef, enc, tdef.Name)
if not (ilOrigTyRefsForProviderGeneratedTypesToRelocate.ContainsKey ilOrigTyRef) then
if debugStaticLinking then printfn "Keep provided type %s in place because it wasn't relocated" ilOrigTyRef.QualifiedName
yield { tdef with NestedTypes = rw (enc@[tdef.Name]) tdef.NestedTypes } ]
rw [] ilModule.TypeDefs
......
......@@ -2983,7 +2983,7 @@ let GetImmediateIntrinsicMethInfosOfType (optFilter,ad) g amap m typ =
| ILTypeMetadata (_,tdef) ->
let mdefs = tdef.Methods
let mdefs = (match optFilter with None -> mdefs.AsList | Some nm -> mdefs.FindByName nm)
mdefs |> List.map (fun mdef -> MethInfo.CreateILMeth(amap, m, typ, mdef))
mdefs |> List.map (fun mdef -> MethInfo.CreateILMeth(amap, m, typ, mdef))
| FSharpOrArrayOrByrefOrTupleOrExnTypeMetadata ->
if not (isAppTy g typ) then []
else SelectImmediateMemberVals g optFilter (TrySelectMemberVal g optFilter typ None) (tcrefOfAppTy g typ)
......
......@@ -1038,7 +1038,7 @@ let rec convClassUnionDef cenv enc td cud =
let isAbstract = (altTypeDefs.Length = cud.cudAlternatives.Length)
let existingMeths =
td.Methods.AsList
td.Methods.AsList
// Filter out the F#-compiler supplied implementation of the get_Empty method. This is because we will replace
// its implementation by one that loads the unique private static field for lists
|> List.filter (fun md -> not (cud.cudHasHelpers = SpecialFSharpListHelpers && (md.Name = "get_Empty" || md.Name = "Cons" || md.Name = "get_IsEmpty")) &&
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册