Movatterモバイル変換

Skip to content

Pateldisolution/visualfsharpPublic

forked fromdotnet/fsharp

NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit529cc6f

Vasily Kirichenko

Vasily Kirichenko

Vasily Kirichenko

authored and

Vasily Kirichenko

committed

Apply feedback

1 parent223d313 commit529cc6fCopy full SHA for 529cc6f

File tree

12 files changed

+30

-27

lines changed

src/fsharp
- Optimizer.fs
- PostInferenceChecks.fs
tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf

12 files changed

+30

-27

lines changed

`‎src/fsharp/Optimizer.fs‎`

Lines changed: 13 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -2304,8 +2304,17 @@ and DevirtualizeApplication cenv env (vref:ValRef) ty tyargs args m =`
`2304`	`2304`	`lettransformedExpr= wrap(MakeApplicationAndBetaReduce cenv.g(exprForValRef m vref,vref.Type,(if isNil tyargsthen[]else[tyargs]),args,m))`
`2305`	`2305`	`OptimizeExpr cenv env transformedExpr`
`2306`	`2306`
`2307`		`-`
`2308`		`-`
	`2307`	`+`
	`2308`	`+andGetNameFromTypeName tcGlobals m typeName=`
	`2309`	`+match stripTyEqns tcGlobals typeNamewith`
	`2310`	`+\| TType_app(tcref,_)-> tcref.CompiledRepresentationForNamedType.FullName`
	`2311`	`+\| TType_forall_-> errorR(Error(FSComp.SR.expressionHasNoName(), m));""`
	`2312`	`+\| TType_tuple_-> errorR(Error(FSComp.SR.expressionHasNoName(), m));""`
	`2313`	`+\| TType_fun_-> errorR(Error(FSComp.SR.expressionHasNoName(), m));""`
	`2314`	`+\| TType_ucase_-> errorR(Error(FSComp.SR.expressionHasNoName(), m));""`
	`2315`	`+\| TType_var tp-> tp.DisplayName`
	`2316`	`+\| TType_measure ms-> sprintf"%A" ms`
	`2317`	`+`
`2309`	`2318`	`andTryDevirtualizeApplication cenv env(f,tyargs,args,m)=`
`2310`	`2319`	`match f,tyargs,argswith`
`2311`	`2320`
`@@ -2514,17 +2523,8 @@ and TryDevirtualizeApplication cenv env (f,tyargs,args,m) =`
`2514`	`2523`	`// Analyze the name of the given type and rewrite AST to constant string expression with the name`
`2515`	`2524`	`\| Expr.Val(vref,_,_),_,_when valRefEq cenv.g vref cenv.g.typenameof_vref->`
`2516`	`2525`	`match tyargswith`
`2517`		`-\|(typeName:TType)::_->`
`2518`		`-letname=`
`2519`		`-match typeNamewith`
`2520`		`-\| TType_forall(_tps,ty)-> ty.ToString()`
`2521`		`-\| TType_app(tcref,_)-> tcref.CompiledRepresentationForNamedType.FullName`
`2522`		`-\| TType_tuple tinst->"("+ String.concat","(List.map string tinst)+")"`
`2523`		`-\| TType_fun(d,r)->"("+ string d+" ->"+ string r+")"`
`2524`		`-\| TType_ucase(uc,_)-> uc.CaseName`
`2525`		`-\| TType_var tp-> tp.DisplayName`
`2526`		`-\| TType_measure ms-> sprintf"%A" ms`
`2527`		`-`
	`2526`	`+\| typeName::_->`
	`2527`	`+letname= GetNameFromTypeName cenv.g m typeName`
`2528`	`2528`	`Some(Expr.Const(Const.String name, m, cenv.g.string_ty),`
`2529`	`2529`	`{ TotalSize=1`
`2530`	`2530`	`FunctionSize=1`

`‎src/fsharp/PostInferenceChecks.fs‎`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -511,10 +511,13 @@ let rec CheckExprNoByrefs (cenv:cenv) (env:env) expr =`
`511`	`511`	`lettryExtractNameOf args=`
`512`	`512`	`match argswith`
`513`	`513`	`\|[Expr.App(Expr.Val(r,_,_),_,_,Expr.Const(constant,_,_)::_,_)]->`
`514`		`-if r.CompiledName.StartsWith("get_")&& constant= Const.Unitthen// TODO: We need a better way to find static property getters`
`515`		`- Some(r.CompiledName.Substring(4))`
`516`		`-else`
`517`		`- None// the function was applied`
	`514`	`+match constantwith`
	`515`	`+\| Const.Unit->`
	`516`	`+if r.CompiledName.StartsWith("get_")then// TODO: We need a better way to find static property getters`
	`517`	`+ Some(r.CompiledName.Substring(4))`
	`518`	`+else`
	`519`	`+ None// the function was applied`
	`520`	`+\|_-> None`
`518`	`521`	`\|[Expr.App(Expr.Val(r,_,_),_,_,[],_)]-> Some(r.CompiledName)`
`519`	`522`	`\|[Expr.App(Expr.Val(r,_,_),_,_,_,_)]->`
`520`	`523`	`if r.CompiledName.StartsWith("get_")then// TODO: We need a better way to find member property getters`

`‎tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfAdditionExpr.fs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// #Regression #Conformance #DataExpressions`
`2`	`2`	`// Verify that nameof doesn't work on const string`
`3`		`-//<Expectsx x-first x-last">FS3197" span="(5,9)" status="error">This expression does not have a name.</Expects>`
	`3`	`+//<Expectsx x-first x-last">FS3199" span="(5,9)" status="error">This expression does not have a name.</Expects>`
`4`	`4`
`5`	`5`	`letx= nameof(1+2)`
`6`	`6`

`‎tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfAppliedFunction.fs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// #Regression #Conformance #DataExpressions`
`2`	`2`	`// Verify that nameof doesn't work on applied functions`
`3`		`-//<Expectsx x-first x-last">FS3197" span="(6,9)" status="error">This expression does not have a name.</Expects>`
	`3`	`+//<Expectsx x-first x-last">FS3199" span="(6,9)" status="error">This expression does not have a name.</Expects>`
`4`	`4`
`5`	`5`	`letf()=1`
`6`	`6`	`letx= nameof(f())`

`‎tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfAsAFunction.fs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// #Regression #Conformance #DataExpressions`
`2`	`2`	`// Verify that nameof can't be used as a function.`
`3`		`-//<Expectsx x-first x-last">FS3197" span="(5,9)" status="error">This expression does not have a name.</Expects>`
	`3`	`+//<Expectsx x-first x-last">FS3199" span="(5,9)" status="error">This expression does not have a name.</Expects>`
`4`	`4`
`5`	`5`	`letf= nameof`
`6`	`6`

`‎tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfDictLookup.fs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// #Regression #Conformance #DataExpressions`
`2`	`2`	`// Verify that nameof doesn't work on dictionary lookup`
`3`		`-//<Expectsx x-first x-last">FS3197" span="(6,9)" status="error">This expression does not have a name.</Expects>`
	`3`	`+//<Expectsx x-first x-last">FS3199" span="(6,9)" status="error">This expression does not have a name.</Expects>`
`4`	`4`
`5`	`5`	`letdict=new System.Collections.Generic.Dictionary<int,string>()`
`6`	`6`	`letb= nameof(dict.[2])`

`‎tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfIntConst.fs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// #Regression #Conformance #DataExpressions`
`2`	`2`	`// Verify that nameof doesn't work on const int`
`3`		`-//<Expectsx x-first x-last">FS3197" span="(5,9)" status="error">This expression does not have a name.</Expects>`
	`3`	`+//<Expectsx x-first x-last">FS3199" span="(5,9)" status="error">This expression does not have a name.</Expects>`
`4`	`4`
`5`	`5`	`letx= nameof1`
`6`	`6`

`‎tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfIntegerAppliedFunction.fs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// #Regression #Conformance #DataExpressions`
`2`	`2`	`// Verify that nameof doesn't work on applied functions`
`3`		`-//<Expectsx x-first x-last">FS3197" span="(6,9)" status="error">This expression does not have a name.</Expects>`
	`3`	`+//<Expectsx x-first x-last">FS3199" span="(6,9)" status="error">This expression does not have a name.</Expects>`
`4`	`4`
`5`	`5`	`letf x=1* x`
`6`	`6`	`letx= nameof(f2)`

`‎tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfParameterAppliedFunction.fs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// #Regression #Conformance #DataExpressions`
`2`	`2`	`// Verify that nameof doesn't work on applied functions`
`3`		`-//<Expectsx x-first x-last">FS3197" span="(7,9)" status="error">This expression does not have a name.</Expects>`
	`3`	`+//<Expectsx x-first x-last">FS3199" span="(7,9)" status="error">This expression does not have a name.</Expects>`
`4`	`4`
`5`	`5`	`letf x y= x y`
`6`	`6`	`letz x=1* x`

`‎tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfPartiallyAppliedFunction.fs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// #Regression #Conformance #DataExpressions`
`2`	`2`	`// Verify that nameof doesn't work on partially applied functions`
`3`		`-//<Expectsx x-first x-last">FS3197" span="(6,9)" status="error">This expression does not have a name.</Expects>`
	`3`	`+//<Expectsx x-first x-last">FS3199" span="(6,9)" status="error">This expression does not have a name.</Expects>`
`4`	`4`
`5`	`5`	`letf x y= y* x`
`6`	`6`	`letx= nameof(f2)`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp