Changeset 411 for trunk/Include/system

Timestamp:

Feb 23, 2008, 5:37:00 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

UTF8Encoding（仮）の追加

File:

• trunk/Include/system/exception.ab (modified) (7 diffs)

trunk/Include/system/exception.ab

@@ -28 +28 @@
 
     Sub FinishFinally()
+        Imports System.Threading
         If Thread.CurrentThread().__IsThrowing() Then
             Throw Thread.CurrentThread().__GetThrowintParamObject()
@@ -34 +35 @@
 
     Function ResolveCatchesOverload( ex As Object ) As LONG_PTR
+        OutputDebugString("ResolveCatchesOverload: ")
+        OutputDebugString(ToTCStr(ex.ToString))
+        OutputDebugString(Ex"\r\n")
         Dim defaultCatchCodePos = 0 As LONG_PTR
         Dim pos = 0 As Long
@@ -66 +70 @@
         Return defaultCatchCodePos
     End Function
-
+Private
     Function isCatchable(paramName As String, catchType As System.TypeInfo) As Boolean
+/*      If Not String.IsNullOrEmpty(paramName) Then
+            Dim paramType = _System_TypeBase_Search(paramName)
+            isCatchable = ActiveBasic.Detail.IsBaseOf(catchType, paramType)
+        Else
+            isCatchable = False
+        End If
+/*/
         isCatchable = False
         While Not ActiveBasic.IsNothing(catchType)
@@ -77 +88 @@
             catchType = catchType.BaseType
         Wend
+'*/
     End Function
 End Class
@@ -112 +124 @@
 
     Static Function BeginTryScope( catchTable As *LONG_PTR, addressOfFinally As VoidPtr, basePtr As LONG_PTR, stackPtr As LONG_PTR ) As TryLayer
-        Return _System_pobj_AllThreads->GetCurrentException()->_BeginTryScope( catchTable, addressOfFinally, basePtr, stackPtr )
+        Return _System_pobj_AllThreads->GetCurrentException()._BeginTryScope( catchTable, addressOfFinally, basePtr, stackPtr )
     End Function
 
@@ -127 +139 @@
 
             'TODO: 適切なエラー処理
-            MessageBox( NULL, "Catchされていない例外があります", NULL, MB_OK or MB_ICONEXCLAMATION )
+            MessageBox( NULL, ToTCStr(Ex"Catchされていない例外があります\r\n" + ex.ToString), NULL, MB_OK or MB_ICONEXCLAMATION )
             Debug
             Return
@@ -133 +145 @@
 
         ' スレッドへThrow処理を開始したことを通知
+        Imports System.Threading
         Thread.CurrentThread().__Throw( ex )