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

Commitca26624

Browse files
dsymelatkin
authored andcommitted
Do not error recover from failure in GetMethods in type provider
commit 7f0ad8f0b87b9bf9643d183c07a9543dcc3b89ecAuthor: latkin <latkin@microsoft.com>Date: Mon Dec 1 12:25:20 2014 -0800 Updating TP test error baselinescommit 97dd94747ac37d83f262702916e317167945a6a2Merge: 9380ad5 765da89Author: latkin <latkin@microsoft.com>Date: Mon Dec 1 11:48:52 2014 -0800 Merge branch 'GetMethodsFix' ofhttps://git01.codeplex.com/forks/dsyme/cleanup into TPFeedback Conflicts: src/fsharp/est.fscommit 765da896ffde21b9d1fc5bafb94e228ac292ace4Author: Don Syme <dsyme@microsoft.com>Date: Fri Jun 27 15:12:46 2014 +0100 Do not error recover from failure in GetMethods in type provider
1 parenta71bbdc commitca26624

File tree

2 files changed

+177
-13
lines changed

2 files changed

+177
-13
lines changed

‎src/fsharp/est.fs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -410,11 +410,11 @@ module internal ExtensionTyping =
410410
try
411411
st.PApplyArray(f, memberName,m)
412412
with:? TypeProviderErroras tpe->
413-
tpe.Iter(fun e->errorR(Error(FSComp.SR.etUnexpectedExceptionFromProvidedTypeMember(fullName,memberName,e.ContextualErrorMessage),m)))
413+
tpe.Iter(fun e->error(Error(FSComp.SR.etUnexpectedExceptionFromProvidedTypeMember(fullName,memberName,e.ContextualErrorMessage),m)))
414414
[||]
415415

416416
match resultwith
417-
|null->errorR(Error(FSComp.SR.etUnexpectedNullFromProvidedTypeMember(fullName,memberName),m));[||]
417+
|null->error(Error(FSComp.SR.etUnexpectedNullFromProvidedTypeMember(fullName,memberName),m));[||]
418418
| r-> r
419419

420420
/// Try to access a member on a provided type, catching and reporting errors and checking the result is non-null,
@@ -545,7 +545,7 @@ module internal ExtensionTyping =
545545
member__.IsErased=(x.Attributes&&&enum(int32 TypeProviderTypeAttributes.IsErased))<>enum0
546546
member__.IsGenericType= x.IsGenericType
547547
member__.Namespace= x.Namespace
548-
memberpt.FullName= x.FullName
548+
member__.FullName= x.FullName
549549
member__.IsArray= x.IsArray
550550
member__.Assembly= x.Assembly|> ProvidedAssembly.Create ctxt
551551
member__.GetInterfaces()= x.GetInterfaces()|> ProvidedType.CreateArray ctxt
@@ -1197,7 +1197,7 @@ module internal ExtensionTyping =
11971197

11981198
// Try to find the type in the given provided namespace
11991199
let rectryNamespace(providedNamespace:Tainted<IProvidedNamespace>)=
1200-
1200+
12011201
// Get the provided namespace name
12021202
letprovidedNamespaceName= providedNamespace.PUntaint((fun providedNamespace-> providedNamespace.NamespaceName), range=m)
12031203

@@ -1218,7 +1218,7 @@ module internal ExtensionTyping =
12181218
Some result
12191219
else
12201220
// Note: This eagerly explores all provided namespaces even if there is no match of even a prefix in the
1221-
// namespace names.
1221+
// namespace names.
12221222
letprovidedNamespaces= providedNamespace.PApplyArray((fun providedNamespace-> providedNamespace.GetNestedNamespaces()),"GetNestedNamespaces", range=m)
12231223
tryNamespaces providedNamespaces
12241224

0 commit comments

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