Changeset 388 for trunk/Include/system

Timestamp:

Nov 25, 2007, 4:31:35 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

Stringなどで例外を投げるようにした。
#147の解決。
CType ASCII文字判定関数群の追加。

Location:

trunk/Include/system

Files:

• debug.sbp (modified) (3 diffs)
• exception.ab (modified) (3 diffs)

trunk/Include/system/debug.sbp

@@ -29 +29 @@
 End Function
 
-Sub _DebugSys_Set_LONG_PTR(pPtr As VoidPtr, lpData As LONG_PTR)
-#ifdef _WIN64
-    SetQWord(pPtr,lpData)
-#else
-    SetDWord(pPtr,lpData)
-#endif
-End Sub
-
 Sub _DebugSys_StartProc(lpSpBase As ULONG_PTR, lpObp As ULONG_PTR)
     Dim i As Long
@@ -53 +45 @@
         _DebugSys_lplpSpBase[ThreadNum]=HeapAlloc(GetProcessHeap(),0,SizeOf(ULONG_PTR)*2)
     End If
-    _DebugSys_Set_LONG_PTR(_DebugSys_lplpObp[ThreadNum]+_DebugSys_ProcNum[ThreadNum]*SizeOf(ULONG_PTR),lpObp)
-    _DebugSys_Set_LONG_PTR(_DebugSys_lplpSpBase[ThreadNum]+_DebugSys_ProcNum[ThreadNum]*SizeOf(ULONG_PTR),lpSpBase)
+    Set_LONG_PTR(_DebugSys_lplpObp[ThreadNum]+_DebugSys_ProcNum[ThreadNum]*SizeOf(ULONG_PTR),lpObp)
+    Set_LONG_PTR(_DebugSys_lplpSpBase[ThreadNum]+_DebugSys_ProcNum[ThreadNum]*SizeOf(ULONG_PTR),lpSpBase)
 
     _DebugSys_ProcNum[ThreadNum]=_DebugSys_ProcNum[ThreadNum]+1
@@ -77 +69 @@
         _DebugSys_lplpSpBase[ThreadNum]=HeapAlloc(GetProcessHeap(),0,SizeOf(ULONG_PTR)*2)
     End If
-    _DebugSys_Set_LONG_PTR(_DebugSys_lplpObp[ThreadNum]+_DebugSys_ProcNum[ThreadNum]*SizeOf(ULONG_PTR), lpObp)
-    _DebugSys_Set_LONG_PTR(_DebugSys_lplpSpBase[ThreadNum]+_DebugSys_ProcNum[ThreadNum]*SizeOf(ULONG_PTR), lpSpBase)
+    Set_LONG_PTR(_DebugSys_lplpObp[ThreadNum]+_DebugSys_ProcNum[ThreadNum]*SizeOf(ULONG_PTR), lpObp)
+    Set_LONG_PTR(_DebugSys_lplpSpBase[ThreadNum]+_DebugSys_ProcNum[ThreadNum]*SizeOf(ULONG_PTR), lpSpBase)
 End Sub
 

trunk/Include/system/exception.ab

@@ -57 +57 @@
                 End If
             Else
-                If lstrcmp( paramName, ex.GetType().FullName ) = 0 Then
+                If isCatchable(New String(paramName), ex.GetType()) Then
+'               If lstrcmp( paramName, ex.GetType().FullName ) = 0 Then
                     ' マッチしたとき
                     Return codePos
@@ -64 +65 @@
         Wend
         Return defaultCatchCodePos
+    End Function
+
+    Function isCatchable(paramName As String, catchType As System.TypeInfo) As Boolean
+        isCatchable = False
+        While Not ActiveBasic.IsNothing(catchType)
+            Dim catchTypeName = catchType.FullName
+            If paramName = catchTypeName Then
+                isCatchable = True
+                Exit Function
+            End If
+            catchType = catchType.BaseType
+        Wend
     End Function
 End Class
@@ -114 +127 @@
 
             'TODO: 適切なエラー処理
-            MessageBox( NULL, "例外", "", MB_OK or MB_ICONEXCLAMATION )
-
+            MessageBox( NULL, "Catchされていない例外があります", NULL, MB_OK or MB_ICONEXCLAMATION )
+            Debug
             Return
         End If