Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite2d8300

Browse files
cartermpKevinRansom
authored andcommitted
Remove some asses from the codebase (dotnet#5975)
* Remove some asses from the codebase* Remove more asses
1 parent5a54ebd commite2d8300

File tree

24 files changed

+91
-91
lines changed

24 files changed

+91
-91
lines changed

‎fcs/docsrc/content/ja/symbols.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ argTy1c.TypeDefinition.CompiledName // "Int32"
175175
*)
176176
letprojectContext= checkFileResults.ProjectContext
177177

178-
forassin projectContext.GetReferencedAssemblies()do
179-
matchass.FileNamewith
178+
forassemblyin projectContext.GetReferencedAssemblies()do
179+
matchassembly.FileNamewith
180180
| None-> printfn"コンパイル時にファイルの存在しないアセンブリを参照しました"
181181
| Some s-> printfn"コンパイル時にアセンブリ '%s' を参照しました" s
182182

‎fcs/docsrc/content/symbols.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ used in the compilation, called the `ProjectContext`:
168168
*)
169169
letprojectContext= checkFileResults.ProjectContext
170170

171-
forassin projectContext.GetReferencedAssemblies()do
172-
matchass.FileNamewith
171+
forassemblyin projectContext.GetReferencedAssemblies()do
172+
matchassembly.FileNamewith
173173
| None-> printfn"compilation referenced an assembly without a file"
174174
| Some s-> printfn"compilation references assembly '%s'" s
175175

‎src/absil/il.fs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2330,7 +2330,7 @@ let mkILNonGenericValueTy tref = mkILNamedTy AsValue tref []
23302330

23312331
letmkILNonGenericBoxedTy tref= mkILNamedTy AsObject tref[]
23322332

2333-
letmkSimpleAssRef n=
2333+
letmkSimpleAssemblyRef n=
23342334
ILAssemblyRef.Create(n, None, None,false, None, None)
23352335

23362336
letmkSimpleModRef n=
@@ -3191,9 +3191,9 @@ let destTypeDefsWithGlobalFunctionsFirst ilg (tdefs: ILTypeDefs) =
31913191
lettop2=if isNil topthen[ mkILTypeDefForGlobalFunctions ilg(emptyILMethods, emptyILFields)]else top
31923192
top2@nontop
31933193

3194-
letmkILSimpleModuleassname modname dll subsystemVersion useHighEntropyVA tdefs hashalg locale flags exportedTypes metadataVersion=
3194+
letmkILSimpleModuleassemblyName modname dll subsystemVersion useHighEntropyVA tdefs hashalg locale flags exportedTypes metadataVersion=
31953195
letmanifest=
3196-
{ Name=assname
3196+
{ Name=assemblyName
31973197
AuxModuleHashAlgorithm=match hashalgwith| Some(alg)-> alg|_->0x8004// SHA1
31983198
SecurityDeclsStored=emptyILSecurityDeclsStored
31993199
PublicKey= None
@@ -3921,13 +3921,13 @@ let emptyILRefs =
39213921
ModuleReferences=[]}
39223922

39233923
(* Now find references.*)
3924-
letrefs_of_assref(s:ILReferencesAccumulator)x= s.refsA.Add x|> ignore
3924+
letrefs_of_assemblyRef(s:ILReferencesAccumulator)x= s.refsA.Add x|> ignore
39253925
letrefs_of_modref(s:ILReferencesAccumulator)x= s.refsM.Add x|> ignore
39263926

39273927
letrefs_of_scoref s x=
39283928
match xwith
39293929
| ILScopeRef.Local->()
3930-
| ILScopeRef.Assemblyassref->refs_of_assref sassref
3930+
| ILScopeRef.AssemblyassemblyRef->refs_of_assemblyRef sassemblyRef
39313931
| ILScopeRef.Module modref-> refs_of_modref s modref
39323932

39333933
letrefs_of_tref s(x:ILTypeRef)= refs_of_scoref s x.Scope
@@ -4099,7 +4099,7 @@ and refs_of_resource_where s x =
40994099
| ILResourceLocation.LocalIn_->()
41004100
| ILResourceLocation.LocalOut_->()
41014101
| ILResourceLocation.File(mref,_)-> refs_of_modref s mref
4102-
| ILResourceLocation.Assembly aref->refs_of_assref s aref
4102+
| ILResourceLocation.Assembly aref->refs_of_assemblyRef s aref
41034103

41044104
andrefs_of_resource s x=
41054105
refs_of_resource_where s x.Location

‎src/absil/il.fsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,7 @@ val decodeILAttribData:
16051605
ILAttributeNamedArg list(* named args: values and flags indicating if they are fields or properties*)
16061606

16071607
/// Generate simple references to assemblies and modules.
1608-
valmkSimpleAssRef:string->ILAssemblyRef
1608+
valmkSimpleAssemblyRef:string->ILAssemblyRef
16091609

16101610
valmkSimpleModRef:string->ILModuleRef
16111611

‎src/absil/ilprint.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ let output_publickeyinfo os = function
986986
| PublicKey k-> output_publickey os k
987987
| PublicKeyToken k-> output_publickeytoken os k
988988

989-
letoutput_assref os(aref:ILAssemblyRef)=
989+
letoutput_assemblyRef os(aref:ILAssemblyRef)=
990990
output_string os" .assembly extern";
991991
output_sqstring os aref.Name;
992992
if aref.Retargetablethen output_string os" retargetable";
@@ -1056,7 +1056,7 @@ let output_module_fragment os (ilg: ILGlobals) modul =
10561056
refs
10571057

10581058
letoutput_module_refs os refs=
1059-
List.iter(fun x->output_assref os x; output_string os"\n") refs.AssemblyReferences;
1059+
List.iter(fun x->output_assemblyRef os x; output_string os"\n") refs.AssemblyReferences;
10601060
List.iter(fun x-> output_modref os x; output_string os"\n") refs.ModuleReferences
10611061

10621062
letgoutput_module_manifest env os modul=

‎src/fsharp/CompileOps.fs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2674,9 +2674,9 @@ type AssemblyResolution =
26742674
memberthis.GetILAssemblyRef(ctok,reduceMemoryUsage,tryGetMetadataSnapshot)=
26752675
cancellable{
26762676
match!this.ilAssemblyRefwith
2677-
| Some(assref)->returnassref
2677+
| Some(assemblyRef)->returnassemblyRef
26782678
| None->
2679-
let!assRefOpt=
2679+
let!assemblyRefOpt=
26802680
cancellable{
26812681
match this.ProjectReferencewith
26822682
| Some r->
@@ -2689,8 +2689,8 @@ type AssemblyResolution =
26892689
|_->return None
26902690
| None->return None
26912691
}
2692-
letassRef=
2693-
matchassRefOptwith
2692+
letassemblyRef=
2693+
matchassemblyRefOptwith
26942694
| Some aref-> aref
26952695
| None->
26962696
letreaderSettings:ILReaderOptions=
@@ -2701,8 +2701,8 @@ type AssemblyResolution =
27012701
tryGetMetadataSnapshot= tryGetMetadataSnapshot}
27022702
use reader= OpenILModuleReader this.resolvedPath readerSettings
27032703
mkRefToILAssembly reader.ILModuleDef.ManifestOfAssembly
2704-
this.ilAssemblyRef:= Some(assRef)
2705-
returnassRef
2704+
this.ilAssemblyRef:= Some(assemblyRef)
2705+
returnassemblyRef
27062706
}
27072707

27082708
//----------------------------------------------------------------------------
@@ -3655,10 +3655,10 @@ type TcAssemblyResolutions(tcConfig: TcConfig, results: AssemblyResolution list,
36553655
membertcResolutions.TryFindByOriginalReference(assemblyReference:AssemblyReference)= originalReferenceToResolution.TryFind assemblyReference.Text
36563656

36573657
/// This doesn't need to be cancellable, it is only used by F# Interactive
3658-
membertcResolution.TryFindByExactILAssemblyRef(ctok,assref)=
3658+
membertcResolution.TryFindByExactILAssemblyRef(ctok,assemblyRef)=
36593659
results|> List.tryFind(fun ar->
36603660
letr= ar.GetILAssemblyRef(ctok, tcConfig.reduceMemoryUsage, tcConfig.tryGetMetadataSnapshot)|> Cancellable.runWithoutCancellation
3661-
r=assref)
3661+
r=assemblyRef)
36623662

36633663
/// This doesn't need to be cancellable, it is only used by F# Interactive
36643664
membertcResolution.TryFindBySimpleAssemblyName(ctok,simpleAssemName)=
@@ -4026,11 +4026,11 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
40264026
| ResolvedImportedAssembly(importedAssembly)-> ResolvedCcu(importedAssembly.FSharpViewOfMetadata)
40274027
| UnresolvedImportedAssembly(assemblyName)-> UnresolvedCcu(assemblyName)
40284028

4029-
membertcImports.FindCcuFromAssemblyRef(ctok,m,assref:ILAssemblyRef)=
4029+
membertcImports.FindCcuFromAssemblyRef(ctok,m,assemblyRef:ILAssemblyRef)=
40304030
CheckDisposed()
4031-
match tcImports.FindCcuInfo(ctok, m,assref.Name, lookupOnly=false)with
4031+
match tcImports.FindCcuInfo(ctok, m,assemblyRef.Name, lookupOnly=false)with
40324032
| ResolvedImportedAssembly(importedAssembly)-> ResolvedCcu(importedAssembly.FSharpViewOfMetadata)
4033-
| UnresolvedImportedAssembly_-> UnresolvedCcu(assref.QualifiedName)
4033+
| UnresolvedImportedAssembly_-> UnresolvedCcu(assemblyRef.QualifiedName)
40344034

40354035

40364036
#if!NO_EXTENSIONTYPING
@@ -4641,8 +4641,8 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
46414641
resolutions.TryFindBySimpleAssemblyName(ctok, simpleAssemName)|> Option.map(fun r-> r.resolvedPath)
46424642

46434643
/// This doesn't need to be cancellable, it is only used by F# Interactive
4644-
membertcImports.TryFindExistingFullyQualifiedPathByExactAssemblyRef(ctok,assref:ILAssemblyRef):string option=
4645-
resolutions.TryFindByExactILAssemblyRef(ctok,assref)|> Option.map(fun r-> r.resolvedPath)
4644+
membertcImports.TryFindExistingFullyQualifiedPathByExactAssemblyRef(ctok,assemblyRef:ILAssemblyRef):string option=
4645+
resolutions.TryFindByExactILAssemblyRef(ctok,assemblyRef)|> Option.map(fun r-> r.resolvedPath)
46464646

46474647
membertcImports.TryResolveAssemblyReference(ctok,assemblyReference:AssemblyReference,mode:ResolveAssemblyReferenceMode):OperationResult<AssemblyResolutionlist>=
46484648
lettcConfig= tcConfigP.Get(ctok)

‎src/fsharp/DetupleArgs.fs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -850,11 +850,11 @@ let postTransformExpr (penv:penv) expr =
850850
|_-> None
851851

852852

853-
letpassImplFile penvass=
854-
ass|> RewriteImplFile{PreIntercept=None
855-
PreInterceptBinding=None
856-
PostTransform= postTransformExpr penv
857-
IsUnderQuotations=false}
853+
letpassImplFile penvassembly=
854+
assembly|> RewriteImplFile{PreIntercept=None
855+
PreInterceptBinding=None
856+
PostTransform= postTransformExpr penv
857+
IsUnderQuotations=false}
858858

859859

860860
//-------------------------------------------------------------------------

‎src/fsharp/FSharp.Core/quotations.fs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1322,19 +1322,19 @@ module Patterns =
13221322
// typeof<int>.MakeArrayType(1) returns "Int[*]" but we need "Int[]"
13231323
|_-> invalidArg"tys"(SR.GetString(SR.QexpectedOneType))
13241324

1325-
letmkNamedTycon(tcName,ass:Assembly)=
1326-
matchass.GetType(tcName)with
1325+
letmkNamedTycon(tcName,assembly:Assembly)=
1326+
matchassembly.GetType(tcName)with
13271327
|null->
13281328
// For some reason we can get 'null' returned here even when a type with the right name exists... Hence search the slow way...
1329-
match(ass.GetTypes()|> Array.tryFind(fun a-> a.FullName= tcName))with
1329+
match(assembly.GetTypes()|> Array.tryFind(fun a-> a.FullName= tcName))with
13301330
| Some ty-> ty
1331-
| None-> invalidArg"tcName"(String.Format(SR.GetString(SR.QfailedToBindTypeInAssembly), tcName,ass.FullName))// "Available types are:\n%A" tcNameass (ass.GetTypes() |> Array.map (fun a -> a.FullName))
1331+
| None-> invalidArg"tcName"(String.Format(SR.GetString(SR.QfailedToBindTypeInAssembly), tcName,assembly.FullName))// "Available types are:\n%A" tcNameassembly (assembly.GetTypes() |> Array.map (fun a -> a.FullName))
13321332
| ty-> ty
13331333

13341334
letdecodeNamedTy tc tsR= mkNamedType(tc,tsR)
13351335

13361336
letmscorlib= typeof<System.Int32>.Assembly
1337-
letu_assref st= u_string st
1337+
letu_assemblyRef st= u_string st
13381338
letdecodeAssemblyRef st a=
13391339
if a=""then mscorlib
13401340
elif a="."then st.localAssembly
@@ -1345,10 +1345,10 @@ module Patterns =
13451345
match System.Reflection.Assembly.Load(a)with
13461346
#endif
13471347
|null-> raise<| System.InvalidOperationException(String.Format(SR.GetString(SR.QfailedToBindAssembly), a.ToString()))
1348-
|ass->ass
1348+
|assembly->assembly
13491349

13501350
letu_NamedType st=
1351-
leta,b= u_tup2 u_stringu_assref st
1351+
leta,b= u_tup2 u_stringu_assemblyRef st
13521352
let mutableidx=0
13531353
// From FSharp.Core for F# 4.0+ (4.4.0.0+), referenced type definitions can be integer indexes into a table of type definitions provided on quotation
13541354
// deserialization, avoiding the need for System.Reflection.Assembly.Load
@@ -1358,8 +1358,8 @@ module Patterns =
13581358
// escape commas found in type name, which are not already escaped
13591359
// '\' is not valid in a type name except as an escape character, so logic can be pretty simple
13601360
letescapedTcName= System.Text.RegularExpressions.Regex.Replace(a,@"(?<!\\),",@"\,")
1361-
letassref= decodeAssemblyRef st b
1362-
mkNamedTycon(escapedTcName,assref)
1361+
letassemblyRef= decodeAssemblyRef st b
1362+
mkNamedTycon(escapedTcName,assemblyRef)
13631363

13641364
letu_tyconstSpec st=
13651365
lettag= u_byte_as_int st

‎src/fsharp/LowerCallsAndSeqs.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ let InterceptExpr g cont expr =
5252
/// known arity to lambda expressions and beta-var-reduces to bind
5353
/// any known arguments. The results are later optimized by the peephole
5454
/// optimizer in opt.fs
55-
letLowerImplFile gass=
55+
letLowerImplFile gassembly=
5656
RewriteImplFile{ PreIntercept= Some(InterceptExpr g)
5757
PreInterceptBinding=None
5858
PostTransform=(fun _-> None)
59-
IsUnderQuotations=false}ass
59+
IsUnderQuotations=false}assembly
6060

6161

6262
//----------------------------------------------------------------------------
@@ -512,12 +512,12 @@ let LowerSeqExpr g amap overallExpr =
512512
// Note, however, this leads to a loss of tailcalls: the case not
513513
// handled correctly yet is sequence expressions that use yield! in the last position
514514
// This can give rise to infinite iterator chains when implemented by the naive expansion to
515-
//“for x in e yield e”. For example consider this:
515+
//�for x in e yield e�. For example consider this:
516516
//
517517
// let rec rwalk x = { yield x
518518
// yield! rwalk (x + rand()) }
519519
//
520-
// This is the moral equivalent of a tailcall optimization. These also don’t compile well
520+
// This is the moral equivalent of a tailcall optimization. These also don�t compile well
521521
// in the C# compilation model
522522

523523
| arbitrarySeqExpr->

‎src/fsharp/QuotationPickler.fs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,12 +304,12 @@ module SimplePickle =
304304
openSimplePickle
305305

306306

307-
letp_assref x st= p_string x st
307+
letp_assemblyref x st= p_string x st
308308

309309
letp_NamedType x st=
310310
match xwith
311-
| Idx n-> p_tup2 p_stringp_assref(string n,"") st
312-
| Named(nm,ass)-> p_tup2 p_stringp_assref(nm,ass) st
311+
| Idx n-> p_tup2 p_stringp_assemblyref(string n,"") st
312+
| Named(nm,a)-> p_tup2 p_stringp_assemblyref(nm,a) st
313313

314314
letp_tycon x st=
315315
match xwith

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp