Changeset 400 for trunk/Include/Classes/ActiveBasic

Timestamp:

Jan 22, 2008, 9:19:59 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

_System_CThreadCollectionでのクラスインスタンスへのポインタの使用を除去、参照変数構文へ。

Location:

trunk/Include/Classes/ActiveBasic

Files:

• CType/CType.ab (modified) (4 diffs)
• Core/TypeInfo.ab (modified) (2 diffs)
• Strings/SPrintF.ab (modified) (1 diff)
• misc.ab (modified) (1 diff)

trunk/Include/Classes/ActiveBasic/CType/CType.ab

@@ -86 +86 @@
 End Function
 
+/*!
+@brief  ASCIIの表示文字かどうか
+@author Egtra
+@date   2007/11/25
+制御文字でないもの、空白も表示文字に含む
+*/
 Function IsPrint(c As WCHAR) As Boolean
     Return (c As DWord - &h20) < (&h7e - &h20)
@@ -98 +104 @@
 Function IsPunct(c As WCHAR) As Boolean
     Return c < &h7f And IsGraph(c) And (Not IsAlnum(c))
+End Function
+
+/*!
+@brief  ASCIIの空白文字かどうか
+@author Egtra
+@date   2008/01/22
+*/
+Function IsSpace(c As WCHAR) As Boolean
+    Return c As DWord - 9 < 4 Or c = &h20 ' &h41 = Asc("A")
 End Function
 
@@ -210 +225 @@
 @overload
 */
+Function IsSpace(c As CHAR) As Boolean
+    Return IsSpace(Detail.Widen(c))
+End Function
+
+/*!
+@overload
+*/
 Function IsUpper(c As CHAR) As Boolean
     Return IsUpper(Detail.Widen(c))
@@ -235 +257 @@
 End Function
 
-End Namespace
-End Namespace
+End Namespace 'CType
+End Namespace 'ActiveBasic

trunk/Include/Classes/ActiveBasic/Core/TypeInfo.ab

@@ -160 +160 @@
 
     Static Sub InitializeValueType()
-        types = New System.Collections.Generic.Dictionary<String, TypeBaseImpl>(8192)
+        types = New System.Collections.Generic.Dictionary<String, TypeBaseImpl>(8191)
 
         ' 値型の追加
@@ -222 +222 @@
         End If
 
-        If Object.ReferenceEquals( types.Item(fullName), Nothing ) Then
-            OutputDebugString( "TypeSearch Failed: " )
-            OutputDebugString( fullName )
-            OutputDebugString( Ex"\r\n" )
+        Search = types.Item(fullName)
+
+        If Object.ReferenceEquals( Search, Nothing ) Then
+            OutputDebugString("TypeSearch Failed: ")
+            If Not ActiveBasic.IsNothing(fullName) Then
+                OutputDebugStringW(StrPtr(fullName) As PWSTR)
+                OutputDebugString(Ex"\r\n")
+                OutputDebugStringA(StrPtr(fullName) As PSTR)
+            End If
+            OutputDebugString(Ex"\r\n")
         End If
-
-        Return types.Item(fullName)
     End Function
 

trunk/Include/Classes/ActiveBasic/Strings/SPrintF.ab

@@ -1072 +1072 @@
         ReadInt = True
     Else
-        Dim p As PSTR
+        Dim p As *StrChar
         ret = StrToLong(fmt, p)
         If fmt <> p Then

trunk/Include/Classes/ActiveBasic/misc.ab

@@ -2 +2 @@
 
 Namespace ActiveBasic
+    Namespace Detail
+        /*!
+        @brief baseがderivedの基底クラスかどうか判定する。
+        @param[in] base 基底クラス
+        @param[in] derived 派生クラス
+        @retval True baseがderivedの基底クラスである
+        @retval False 基底クラスでない
+        @exception ArgumentNullException 引数のどちらか又は双方がNoghing
+        @auther Egtra
+        @date 2008/01/21
+        */
+        Function IsBaseOf(base As System.TypeInfo, derived As System.TypeInfo) As Boolean
+            Imports System
+            If IsNothing(base) Then
+                Throw New ArgumentNullException("base")
+            ElseIf IsNothing(derived) Then
+                Throw New ArgumentNullException("derived")
+            End If
+            Do
+                IsBaseOf = derived.Equals(base)
+                If IsBaseOf Then
+                    Exit Function
+                End If
+                derived = derived.BaseType
+            Loop Until IsNothing(derived)
+        End Function
+    End Namespace
+
     Function IsNothing(o As Object) As Boolean
         Return Object.ReferenceEquals(o, Nothing)