Changeset 385 for trunk/Include/Classes/ActiveBasic

Timestamp:

Nov 20, 2007, 12:04:07 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

例外クラスの実装。ExceptionTestでSystem.Exceptionを使用するようにした。
StringBuilderでコメント化されていた例外を投げる処理を有効にした（除OutOfMemory）。
Str$の実装にSPrintfなどを使用するようにした。
毎回Object.ReferenceEquals(xxx, Nothing)と打つのが面倒なので、IsNothingを導入。

Location:

trunk/Include/Classes/ActiveBasic

Files:

• Strings/SPrintF.ab (modified) (6 diffs)
• Strings/Strings.ab (modified) (2 diffs)
• misc.ab (added)

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

@@ -90 +90 @@
     Zero = &h4
     '! 左揃え、-。フィールド内で左揃えにする。
-    Left = &h8
+    LeftSide = &h8
     /*! 代替表記、#。
     <ul>
@@ -867 +867 @@
         If .Length < field Then
             Dim embeddedSize = field - .Length
-            If flags And Left Then
+            If flags And LeftSide Then
                 .Append(&h20, embeddedSize)
             Else
@@ -898 +898 @@
     Dim sb = New System.Text.StringBuilder(
         x, 0, System.Math.Min(x.Length As DWord, d) As Long, field)
-    AdjustFieldWidth(sb, field, flags And Left)
+    AdjustFieldWidth(sb, field, flags And LeftSide)
     FormatString = sb.ToString()
 End Function
@@ -915 +915 @@
     Dim sb = New System.Text.StringBuilder(field + 1)
     sb.Append(x)
-    AdjustFieldWidth(sb, field, flags And Left)
+    AdjustFieldWidth(sb, field, flags And LeftSide)
     FormatCharacter = sb.ToString()
 End Function
@@ -1094 +1094 @@
                 flags Or= Sign
             Case &h2d '-
-                flags Or = Left
+                flags Or = LeftSide
             Case &h26 '&
                 flags Or= BPrefix
@@ -1122 +1122 @@
     If ReadInt(fmt, params, paramsCount, t) Then
         If t < 0 Then
-            flags Or= Left
+            flags Or= LeftSide
             fieldWidth = -t As DWord
         Else

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

@@ -95 +95 @@
     ChrCmp = ChrCmp(s1, s2, System.Math.Min(size1, size2))
     If ChrCmp = 0 Then
-        ChrCmp = ( size1 - size2 ) As Long
+        ChrCmp = (( size1 - size2 ) As LONG_PTR) As Long
     End If
 End Function
@@ -102 +102 @@
     ChrCmp = ChrCmp(s1, s2, System.Math.Min(size1, size2))
     If ChrCmp = 0 Then
-        ChrCmp = ( size1 - size2 ) As Long
+        ChrCmp = (( size1 - size2 ) As LONG_PTR) As Long
     End If
 End Function