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

Commit566875c

Browse files
authored
Merge pull requestdotnet#4803 from Microsoft/merges/master-to-dev15.8
Merge master to dev15.8
2 parents33db3a6 +26ae35b commit566875c

File tree

23 files changed

+85
-85
lines changed

23 files changed

+85
-85
lines changed

‎src/absil/illib.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ let inline isSingleton l =
4040
|_->false
4141

4242
let inlineisNonNull x=not(isNull x)
43-
let inlinenonNull msg x=if isNull xthen failwith("null:"^ msg)else x
43+
let inlinenonNull msg x=if isNull xthen failwith("null:"+ msg)else x
4444
let inline(===) x y= LanguagePrimitives.PhysicalEquality x y
4545

4646
//---------------------------------------------------------------------

‎src/absil/ilprint.fs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ let pretty () = true
2525
lettyvar_generator=
2626
leti= ref0
2727
fun n->
28-
incr i; n^string!i
28+
incr i; n+string!i
2929

3030
// Carry an environment because the way we print method variables
3131
// depends on the gparams of the current scope.
@@ -789,19 +789,19 @@ let goutput_mbody is_entrypoint env os (md: ILMethodDef) =
789789
letgoutput_mdef env os(md:ILMethodDef)=
790790
letattrs=
791791
if md.IsVirtualthen
792-
"virtual"^
793-
(if md.IsFinalthen"final"else"")^
794-
(if md.IsNewSlotthen"newslot"else"")^
795-
(if md.IsCheckAccessOnOverridethen" strict"else"")^
796-
(if md.IsAbstractthen" abstract"else"")^
792+
"virtual"+
793+
(if md.IsFinalthen"final"else"")+
794+
(if md.IsNewSlotthen"newslot"else"")+
795+
(if md.IsCheckAccessOnOverridethen" strict"else"")+
796+
(if md.IsAbstractthen" abstract"else"")+
797797
""
798798
elif md.IsNonVirtualInstancethen""
799799
elif md.IsConstructorthen"rtspecialname"
800800
elif md.IsStaticthen
801-
"static"^
801+
"static"+
802802
(match md.Body.Contentswith
803803
MethodBody.PInvoke(attr)->
804-
"pinvokeimpl(\""^attr.Where.Name^"\" as\""^attr.Name^"\""^
804+
"pinvokeimpl(\""+attr.Where.Name+"\" as\""+attr.Name+"\""+
805805
(match attr.CallingConvwith
806806
| PInvokeCallingConvention.None->""
807807
| PInvokeCallingConvention.Cdecl->" cdecl"

‎src/absil/ilreflect.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2066,7 +2066,7 @@ let defineDynamicAssemblyAndLog(asmName, flags, asmDir:string) =
20662066
asmB
20672067

20682068
letmkDynamicAssemblyAndModule(assemblyName,optimize,debugInfo,collectible)=
2069-
letfilename= assemblyName^".dll"
2069+
letfilename= assemblyName+".dll"
20702070
letasmDir="."
20712071
letasmName=new AssemblyName()
20722072
asmName.Name<- assemblyName;

‎src/absil/ilsupp.fs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -600,11 +600,11 @@ let linkNativeResources (unlinkedResources:byte[] list) (ulLinkedResourceBaseRV
600600
if outputFilePath=""then
601601
[ FileSystem.GetTempPathShim()]
602602
else
603-
[ FileSystem.GetTempPathShim();(outputFilePath^"\\")]
603+
[ FileSystem.GetTempPathShim();(outputFilePath+"\\")]
604604

605605
// Get a unique random file
606606
let recGetUniqueRandomFileName(path)=
607-
lettfn= path^ System.IO.Path.GetRandomFileName()
607+
lettfn= path+ System.IO.Path.GetRandomFileName()
608608
if FileSystem.SafeExists(tfn)then
609609
GetUniqueRandomFileName(path)
610610
else
@@ -614,7 +614,7 @@ let linkNativeResources (unlinkedResources:byte[] list) (ulLinkedResourceBaseRV
614614
letmachine=if2= nPEFileTypethen"X64"else"X86"
615615
letcmdLineArgsPreamble= sprintf"/NOLOGO /READONLY /MACHINE:%s" machine
616616

617-
letcvtres= corSystemDir^"cvtres.exe"
617+
letcvtres= corSystemDir+"cvtres.exe"
618618

619619
letcreateCvtresArgs path=
620620
lettempObjFileName= GetUniqueRandomFileName(path)
@@ -624,7 +624,7 @@ let linkNativeResources (unlinkedResources:byte[] list) (ulLinkedResourceBaseRV
624624
for_ulrin unlinkedResourcesdo
625625
lettempResFileName= GetUniqueRandomFileName(path)
626626
resFiles<- tempResFileName:: resFiles;
627-
cmdLineArgs<- cmdLineArgs^"\""^ tempResFileName^"\""
627+
cmdLineArgs<- cmdLineArgs+"\""+ tempResFileName+"\""
628628
lettrf= resFiles
629629
letcmd= cmdLineArgs
630630
cmd,tempObjFileName,trf
@@ -641,7 +641,7 @@ let linkNativeResources (unlinkedResources:byte[] list) (ulLinkedResourceBaseRV
641641
tempResFiles<- files
642642
(invoc,tmp,files)
643643

644-
letcvtresInvocation= cvtres^ cmdLineArgs
644+
letcvtresInvocation= cvtres+ cmdLineArgs
645645

646646
try
647647
let mutableiFiles=0

‎src/buildtools/fsyacc/fsyaccast.fs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type Symbols = Symbol list
3939
//---------------------------------------------------------------------
4040
// Output Raw Parser Spec AST
4141

42-
letStringOfSym sym=match symwith Terminal s->"'"^ s^"'"| NonTerminal s-> s
42+
letStringOfSym sym=match symwith Terminal s->"'"+ s+"'"| NonTerminal s-> s
4343

4444
letOutputSym os sym= fprintf os"%s"(StringOfSym sym)
4545

@@ -353,7 +353,7 @@ let CompilerLalrParserSpec logf (spec : ProcessedParserSpec) =
353353
stopWatch.Start()
354354

355355
// Augment the grammar
356-
letfakeStartNonTerminals= spec.StartSymbols|> List.map(fun nt->"_start"^nt)
356+
letfakeStartNonTerminals= spec.StartSymbols|> List.map(fun nt->"_start"+nt)
357357
letnonTerminals= fakeStartNonTerminals@spec.NonTerminals
358358
letendOfInputTerminal="$$"
359359
letdummyLookahead="#"
@@ -466,7 +466,7 @@ let CompilerLalrParserSpec logf (spec : ProcessedParserSpec) =
466466
letIsStartItem item0= fakeStartNonTerminalsSet.Contains(ntIdx_of_item0 item0)
467467
letIsKernelItem item0=(IsStartItem item0|| dotIdx_of_item0 item0<>0)
468468

469-
letStringOfSym sym=match symwith PTerminal s->"'"^ termTab.OfIndex s^"'"| PNonTerminal s-> ntTab.OfIndex s
469+
letStringOfSym sym=match symwith PTerminal s->"'"+ termTab.OfIndex s+"'"| PNonTerminal s-> ntTab.OfIndex s
470470

471471
letOutputSym os sym= fprintf os"%s"(StringOfSym sym)
472472

‎src/fsharp/DetupleArgs.fs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ let mkTransform g (f:Val) m tps x1Ntys rty (callPattern,tyfringes: (TType list *
466466
letbaseName=match vswith[v]-> v.LogicalName|_->"arg"
467467
letbaseRange=match vswith[v]-> v.Range|_-> m
468468
tyfringe|> List.mapi(fun i ty->
469-
letname= baseName^ string i
469+
letname= baseName+ string i
470470
mkCompGenLocal baseRange name ty|> fst)
471471

472472
NewArgs(vs,rebuildTS g m cpi vs))
@@ -641,14 +641,14 @@ type env =
641641
prefix:string
642642
m:Range.range}
643643

644-
letsuffixE env s={envwith prefix= env.prefix^ s}
644+
letsuffixE env s={envwith prefix= env.prefix+ s}
645645
letrangeE env m={envwith m= m}
646646

647647
letpush b bs= b::bs
648648
letpushL xs bs= xs@bs
649649

650650
letnewLocal env ty= mkCompGenLocal env.m env.prefix ty
651-
letnewLocalN env i ty= mkCompGenLocal env.m(env.prefix^ string i) ty
651+
letnewLocalN env i ty= mkCompGenLocal env.m(env.prefix+ string i) ty
652652

653653
letnoEffectExpr env bindings x=
654654
match xwith

‎src/fsharp/ErrorLogger.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ let rec AttachRange m (exn:exn) =
132132
|:? System.Reflection.TargetInvocationException-> AttachRange m exn.InnerException
133133
| UnresolvedReferenceNoRange(a)-> UnresolvedReferenceError(a, m)
134134
| UnresolvedPathReferenceNoRange(a, p)-> UnresolvedPathReference(a, p, m)
135-
| Failure(msg)-> InternalError(msg^" (Failure)", m)
135+
| Failure(msg)-> InternalError(msg+" (Failure)", m)
136136
|:? System.ArgumentExceptionas exn-> InternalError(exn.Message+" (ArgumentException)", m)
137137
| notARangeDual-> notARangeDual
138138

‎src/fsharp/InnerLambdasToTopLevelFuncs.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ let CreateNewValuesForTLR g tlrS arityM fclassM envPackM =
826826
letwf= Zmap.force f arityM("createFHat - wf",(fun v-> showL(valL v)))
827827
letfc= Zmap.force f fclassM("createFHat - fc",nameOfVal)
828828
letenvp= Zmap.force fc envPackM("CreateNewValuesForTLR - envp",string)
829-
letname= f.LogicalName(*^ "_TLR_"^ string wf*)
829+
letname= f.LogicalName(*+ "_TLR_"+ string wf*)
830830
letm= f.Range
831831
lettps,tau= f.TypeScheme
832832
letargtys,res= stripFunTy g tau

‎src/fsharp/MethodCalls.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ let BuildMethodCall tcVal g amap isMutable m isProp minfo valUseFlags minst objA
721721
letvalu= isStructTy g enclTy
722722
letisCtor= minfo.IsConstructor
723723
if minfo.IsClassConstructorthen
724-
error(InternalError(minfo.LogicalName^": cannot call a class constructor",m))
724+
error(InternalError(minfo.LogicalName+": cannot call a class constructor",m))
725725
letuseCallvirt=not valu&&not direct&& minfo.IsVirtual
726726
letisProtected= minfo.IsProtectedAccessiblity
727727
letexprTy=if isCtorthen enclTyelse minfo.GetFSharpReturnTy(amap, m, minst)
@@ -791,7 +791,7 @@ let BuildNewDelegateExpr (eventInfoOpt:EventInfo option, g, amap, delegateTy, in
791791
if List.exists(isByrefTy g) delArgTysthen
792792
error(Error(FSComp.SR.tcFunctionRequiresExplicitLambda(List.length delArgTys),m))
793793

794-
letdelArgVals= delArgTys|> List.mapi(fun i argty-> fst(mkCompGenLocal m("delegateArg"^string i) argty))
794+
letdelArgVals= delArgTys|> List.mapi(fun i argty-> fst(mkCompGenLocal m("delegateArg"+string i) argty))
795795
letexpr=
796796
letargs=
797797
match eventInfoOptwith

‎src/fsharp/PatternMatchCompilation.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ let CompilePatternBasic
936936

937937
ifnot(isNil topgtvs)then error(InternalError("Unexpected generalized type variables when compiling an active pattern",m))
938938
letrty= apinfo.ResultType g m resTys
939-
letv,vexp= mkCompGenLocal m("activePatternResult"^string(newUnique())) rty
939+
letv,vexp= mkCompGenLocal m("activePatternResult"+string(newUnique())) rty
940940
if topv.IsMemberOrModuleBindingthen
941941
AdjustValToTopVal v topv.DeclaringEntity ValReprInfo.emptyValData
942942
letargexp= GetSubExprOfInput subexpr

0 commit comments

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