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

Commite5033af

Browse files
Vasily KirichenkoVasily Kirichenko
Vasily Kirichenko
authored and
Vasily Kirichenko
committed
removetypenameof bits
1 parent22898ad commite5033af

File tree

4 files changed

+11
-26
lines changed

4 files changed

+11
-26
lines changed

‎src/fsharp/FSComp.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,5 +1334,4 @@ tcGlobalsSystemTypeNotFound,"The system type '%s' was required but no referenced
13341334
3213,typrelMemberHasMultiplePossibleDispatchSlots,"The member '%s' matches multiple overloads of the same method.\nPlease restrict it to one of the following:%s."
13351335
3214,methodIsNotStatic,"Method or object constructor '%s' is not static"
13361336
3215,expressionHasNoName,"This expression does not have a name."
1337-
3216,nameofNotPermitted,"The nameof operator is not allowed in this position."
1338-
3217,chkNoFirstClassNameOf,"First-class uses of the 'nameof' operator is not permitted"
1337+
3216,chkNoFirstClassNameOf,"First-class uses of the 'nameof' operator is not permitted"

‎src/fsharp/TastOps.fs‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2889,11 +2889,6 @@ let isNameOfValRef g vref =
28892889
// There is an internal version of typeof defined in prim-types.fs that needs to be detected
28902890
||(g.compilingFslib&& vref.LogicalName="nameof")
28912891

2892-
letisTypeNameOfValRef g vref=
2893-
valRefEq g vref g.typenameof_vref
2894-
// There is an internal version of namef defined in prim-types.fs that needs to be detected
2895-
||(g.compilingFslib&& vref.LogicalName="typenameof")
2896-
28972892
letisTypeDefOfValRef g vref=
28982893
valRefEq g vref g.typedefof_vref
28992894
// There is an internal version of typenameof defined in prim-types.fs that needs to be detected
@@ -2924,11 +2919,6 @@ let (|NameOfExpr|_|) g expr =
29242919
| Expr.App(Expr.Val(vref,_,_),_,[ty],[],_)when isNameOfValRef g vref-> Some ty
29252920
|_-> None
29262921

2927-
let(|TypeNameOfExpr|_|)g expr=
2928-
match exprwith
2929-
| Expr.App(Expr.Val(vref,_,_),_,[ty],[],_)when isTypeNameOfValRef g vref-> Some ty
2930-
|_-> None
2931-
29322922
let(|SeqExpr|_|)g expr=
29332923
match exprwith
29342924
| Expr.App(Expr.Val(vref,_,_),_,_,_,_)when valRefEq g vref g.seq_vref-> Some()
@@ -7764,8 +7754,7 @@ let IsSimpleSyntacticConstantExpr g inputExpr =
77647754
| UncheckedDefaultOfExpr g_
77657755
| SizeOfExpr g_
77667756
| TypeOfExpr g_
7767-
| NameOfExpr g_
7768-
| TypeNameOfExpr g_->true
7757+
| NameOfExpr g_->true
77697758
// All others are not simple constant expressions
77707759
|_->false
77717760

‎src/fsharp/TastOps.fsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1410,7 +1410,6 @@ val (|EnumExpr|_|) : TcGlobals -> Expr -> Expr option
14101410
val(|TypeOfExpr|_|):TcGlobals->Expr->TType option
14111411
val(|TypeDefOfExpr|_|):TcGlobals->Expr->TType option
14121412
val(|NameOfExpr|_|):TcGlobals->Expr->TType option
1413-
val(|TypeNameOfExpr|_|):TcGlobals->Expr->TType option
14141413
val(|SeqExpr|_|):TcGlobals->Expr->unit option
14151414

14161415
valEvalLiteralExprOrAttribArg:TcGlobals->Expr->Expr

‎src/fsharp/TcGlobals.fs‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,6 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d
569569
letv_typeof_info= makeIntrinsicValRef(fslib_MFOperators_nleref,"typeof", None, Some"TypeOf",[vara],([], v_system_Type_typ))
570570
letv_methodhandleof_info= makeIntrinsicValRef(fslib_MFOperators_nleref,"methodhandleof", None, Some"MethodHandleOf",[vara;varb],([[varaTy--> varbTy]], v_system_RuntimeMethodHandle_typ))
571571
letv_sizeof_info= makeIntrinsicValRef(fslib_MFOperators_nleref,"sizeof", None, Some"SizeOf",[vara],([], v_int_ty))
572-
letv_typenameof_info= makeIntrinsicValRef(fslib_MFOperators_nleref,"typenameof", None, Some"TypeNameOf",[vara],([], v_string_ty))
573572
letv_nameof_info= makeIntrinsicValRef(fslib_MFOperators_nleref,"nameof", None, Some"NameOf",[vara],([[varaTy]], v_string_ty))
574573

575574
letv_unchecked_defaultof_info= makeIntrinsicValRef(fslib_MFOperatorsUnchecked_nleref,"defaultof", None, Some"DefaultOf",[vara],([], varaTy))
@@ -1125,7 +1124,6 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d
11251124
member valtypeof_vref= ValRefForIntrinsic v_typeof_info
11261125
member valsizeof_vref= ValRefForIntrinsic v_sizeof_info
11271126
member valnameof_vref= ValRefForIntrinsic v_nameof_info
1128-
member valtypenameof_vref= ValRefForIntrinsic v_typenameof_info
11291127
member valtypedefof_vref= ValRefForIntrinsic v_typedefof_info
11301128
member valenum_vref= ValRefForIntrinsic v_enum_info
11311129
member valenumOfValue_vref= ValRefForIntrinsic v_enumOfValue_info
@@ -1152,15 +1150,15 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d
11521150
member valunbox_fast_vref= ValRefForIntrinsic v_unbox_fast_info
11531151
member valistype_vref= ValRefForIntrinsic v_istype_info
11541152
member valistype_fast_vref= ValRefForIntrinsic v_istype_fast_info
1155-
member valquery_source_vref= ValRefForIntrinsic v_query_source_info
1156-
member valquery_value_vref= ValRefForIntrinsic v_query_value_info
1157-
member valquery_run_value_vref= ValRefForIntrinsic v_query_run_value_info
1158-
member valquery_run_enumerable_vref= ValRefForIntrinsic v_query_run_enumerable_info
1159-
member valquery_for_vref= ValRefForIntrinsic v_query_for_value_info
1160-
member valquery_yield_vref= ValRefForIntrinsic v_query_yield_value_info
1161-
member valquery_yield_from_vref= ValRefForIntrinsic v_query_yield_from_value_info
1162-
member valquery_select_vref= ValRefForIntrinsic v_query_select_value_info
1163-
member valquery_where_vref= ValRefForIntrinsic v_query_where_value_info
1153+
member valquery_source_vref= ValRefForIntrinsic v_query_source_info
1154+
member valquery_value_vref= ValRefForIntrinsic v_query_value_info
1155+
member valquery_run_value_vref= ValRefForIntrinsic v_query_run_value_info
1156+
member valquery_run_enumerable_vref= ValRefForIntrinsic v_query_run_enumerable_info
1157+
member valquery_for_vref= ValRefForIntrinsic v_query_for_value_info
1158+
member valquery_yield_vref= ValRefForIntrinsic v_query_yield_value_info
1159+
member valquery_yield_from_vref= ValRefForIntrinsic v_query_yield_from_value_info
1160+
member valquery_select_vref= ValRefForIntrinsic v_query_select_value_info
1161+
member valquery_where_vref= ValRefForIntrinsic v_query_where_value_info
11641162
member valquery_zero_vref= ValRefForIntrinsic v_query_zero_value_info
11651163

11661164
member__.seq_collect_info= v_seq_collect_info

0 commit comments

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