Apply feedback

Author: Vasily Kirichenko

src/fsharp/Optimizer.fs

@@ -2304,8 +2304,17 @@ and DevirtualizeApplication cenv env (vref:ValRef) ty tyargs args m =
     let transformedExpr = wrap (MakeApplicationAndBetaReduce cenv.g (exprForValRef m vref,vref.Type,(if isNil tyargs then [] else [tyargs]),args,m))
     OptimizeExpr cenv env transformedExpr
 
-    
-  
+
+and GetNameFromTypeName tcGlobals m typeName =
+    match stripTyEqns tcGlobals typeName with     
+    | TType_app (tcref, _) -> tcref.CompiledRepresentationForNamedType.FullName
+    | TType_forall _ -> errorR(Error(FSComp.SR.expressionHasNoName(), m)); ""
+    | TType_tuple _ -> errorR(Error(FSComp.SR.expressionHasNoName(), m)); ""
+    | TType_fun _ -> errorR(Error(FSComp.SR.expressionHasNoName(), m)); ""
+    | TType_ucase _ -> errorR(Error(FSComp.SR.expressionHasNoName(), m)); ""
+    | TType_var tp -> tp.DisplayName
+    | TType_measure ms -> sprintf "%A" ms
+
 and TryDevirtualizeApplication cenv env (f,tyargs,args,m) =
     match f,tyargs,args with 
 
@@ -2514,17 +2523,8 @@ and TryDevirtualizeApplication cenv env (f,tyargs,args,m) =
     // Analyze the name of the given type and rewrite AST to constant string expression with the name
     | Expr.Val(vref,_,_),_,_ when valRefEq cenv.g vref cenv.g.typenameof_vref ->
         match tyargs with
-        | (typeName:TType):: _ ->
-            let name =
-                match typeName with 
-                | TType_forall (_tps,ty) -> ty.ToString()
-                | TType_app (tcref, _) -> tcref.CompiledRepresentationForNamedType.FullName
-                | TType_tuple tinst -> "(" + String.concat "," (List.map string tinst) + ")"
-                | TType_fun (d,r) -> "(" + string d + " -> " + string r + ")"
-                | TType_ucase (uc,_) ->  uc.CaseName
-                | TType_var tp -> tp.DisplayName
-                | TType_measure ms -> sprintf "%A" ms
-
+        | typeName:: _ ->
+            let name = GetNameFromTypeName cenv.g m typeName
             Some(Expr.Const(Const.String name, m, cenv.g.string_ty),
                     { TotalSize = 1
                       FunctionSize = 1

src/fsharp/PostInferenceChecks.fs

@@ -511,10 +511,13 @@ let rec CheckExprNoByrefs (cenv:cenv) (env:env) expr =
 let tryExtractNameOf args =
     match args with
     | [Expr.App(Expr.Val(r,_,_),_,_,Expr.Const(constant,_,_)::_,_)] -> 
-        if r.CompiledName.StartsWith("get_") && constant = Const.Unit then // TODO: We need a better way to find static property getters
-            Some(r.CompiledName.Substring(4))
-        else
-            None  // the function was applied
+        match constant with
+        | Const.Unit ->
+            if r.CompiledName.StartsWith("get_") then // TODO: We need a better way to find static property getters
+                Some(r.CompiledName.Substring(4))
+            else
+                None  // the function was applied
+        | _ -> None
     | [Expr.App(Expr.Val(r,_,_),_,_,[],_)] -> Some(r.CompiledName)
     | [Expr.App(Expr.Val(r,_,_),_,_,_,_)] ->
         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

@@ -1,6 +1,6 @@
 // #Regression #Conformance #DataExpressions 
 // Verify that nameof doesn't work on const string
-//<Expects id="FS3197" span="(5,9)" status="error">This expression does not have a name.</Expects>
+//<Expects id="FS3199" span="(5,9)" status="error">This expression does not have a name.</Expects>
 
 let x = nameof(1+2)
 

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

@@ -1,6 +1,6 @@
 // #Regression #Conformance #DataExpressions 
 // Verify that nameof doesn't work on applied functions
-//<Expects id="FS3197" span="(6,9)" status="error">This expression does not have a name.</Expects>
+//<Expects id="FS3199" span="(6,9)" status="error">This expression does not have a name.</Expects>
 
 let f() = 1
 let x = nameof(f())

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

@@ -1,6 +1,6 @@
 // #Regression #Conformance #DataExpressions 
 // Verify that nameof can't be used as a function.
-//<Expects id="FS3197" span="(5,9)" status="error">This expression does not have a name.</Expects>
+//<Expects id="FS3199" span="(5,9)" status="error">This expression does not have a name.</Expects>
 
 let f = nameof
 

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

@@ -1,6 +1,6 @@
 // #Regression #Conformance #DataExpressions 
 // Verify that nameof doesn't work on dictionary lookup
-//<Expects id="FS3197" span="(6,9)" status="error">This expression does not have a name.</Expects>
+//<Expects id="FS3199" span="(6,9)" status="error">This expression does not have a name.</Expects>
 
 let dict = new System.Collections.Generic.Dictionary<int,string>()
 let b = nameof(dict.[2])

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

@@ -1,6 +1,6 @@
 // #Regression #Conformance #DataExpressions 
 // Verify that nameof doesn't work on const int
-//<Expects id="FS3197" span="(5,9)" status="error">This expression does not have a name.</Expects>
+//<Expects id="FS3199" span="(5,9)" status="error">This expression does not have a name.</Expects>
 
 let x = nameof 1
 

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

@@ -1,6 +1,6 @@
 // #Regression #Conformance #DataExpressions 
 // Verify that nameof doesn't work on applied functions
-//<Expects id="FS3197" span="(6,9)" status="error">This expression does not have a name.</Expects>
+//<Expects id="FS3199" span="(6,9)" status="error">This expression does not have a name.</Expects>
 
 let f x = 1 * x
 let x = nameof(f 2)

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

@@ -1,6 +1,6 @@
 // #Regression #Conformance #DataExpressions 
 // Verify that nameof doesn't work on applied functions
-//<Expects id="FS3197" span="(7,9)" status="error">This expression does not have a name.</Expects>
+//<Expects id="FS3199" span="(7,9)" status="error">This expression does not have a name.</Expects>
 
 let f x y = x y
 let z x = 1 * x

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

@@ -1,6 +1,6 @@
 // #Regression #Conformance #DataExpressions 
 // Verify that nameof doesn't work on partially applied functions
-//<Expects id="FS3197" span="(6,9)" status="error">This expression does not have a name.</Expects>
+//<Expects id="FS3199" span="(6,9)" status="error">This expression does not have a name.</Expects>
 
 let f x y = y * x
 let x = nameof(f 2)