Changeset 355 for trunk/Include/Classes

Timestamp:

Oct 13, 2007, 2:11:22 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

FormatIntegerDを実装。
UnitTestの失敗時の表示を目立つようにした。
ArrayListを名前空間System.Collectionsに入れた。

Location:

trunk/Include/Classes

Files:

• ActiveBasic/Strings/SPrintF.ab (modified) (7 diffs)
• ActiveBasic/Strings/Strings.ab (modified) (1 diff)
• System/Collections/ArrayList.ab (modified) (2 diffs)
• System/Collections/misc.ab (modified) (2 diffs)
• index.ab (modified) (1 diff)

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

@@ -119 +119 @@
         End If
 
-        Dim e As Long, sign As Boolean
-        Dim s = FloatToChars(x, e, sign)
-
-        If sign Then
+        Dim e As Long, negative As Boolean
+        Dim s = FloatToChars(x, e, negative)
+
+        If negative Then
             .Append("-")
         Else
@@ -151 +151 @@
         End If
 
-        Dim buf[1023] As TCHAR
-        wsprintf(buf, "%03d", e)' "%+03d", e) wsprintfは+フラグが使えない！
-        Dim ts = New String(buf, 3)
-        .Append(ts)
-        '.Append(FormatLongD(e, 3, 0, Sign)
-
-        If .Length < field Then
-            Dim embeddedSize = .Length - field
-            If flags And Left Then
-                .Append(&h20, embeddedSize)
-            Else
-                Dim insPos As Long
-                If flags And Blank Then
-                    insPos++
-                End If
-                .Insert(insPos, String$(embeddedSize, " "))
-            End If
-        End If
+        .Append(FormatIntegerD(e, 2, 0, Sign Or Zero))
+
+        AdjustFieldWidth(sb, field, negative, flags)
     End With
     FormatFloatE = sb.ToString()
@@ -174 +159 @@
 
 '! DWordの最大値4294967295の文字数 - 1。FormatIntegerU内で使用。
-Const MaxSize = 9
+Const MaxSizeU = 9
 
 /*!
@@ -187 +172 @@
 */
 Function FormatIntegerU(x As DWord, d As DWord, field As DWord, flags As FormatFlags) As String
-    'zero, left
-
+    FormatIntegerU = FormatInteger(x, d, field, flags, 0)
+End Function
+
+'! Longの最大値2147483647, -2147483648の符号部を除く文字数 - 1。FormatIntegerU内で使用。
+Const MaxSizeD = 9
+
+/*!
+@brief  符号有り整数をprintfの%u相当の変換で文字列化する関数。
+@author Egtra
+@date   2007/10/13
+@param[in]  x   文字列化する整数値。
+@param[in]  d   精度、最小限表示される桁数。DWORD_MAXのとき、指定なしとして、既定値1となる。
+@param[in]  field   フィールド幅。
+@param[in]  flags   書式フラグ。
+@return xの文字列表現
+*/
+Function FormatIntegerD(x As Long, d As DWord, field As DWord, flags As FormatFlags) As String
+    Dim dwX As DWord
+
+    Dim signChar As StrChar
+    If x < 0 Then
+        dwX = (-x) As DWord
+        signChar = Asc("-")
+    Else
+        dwX = x As DWord
+        If flags And Sign Then
+            signChar = Asc("+")
+        ElseIf flags And Blank Then
+            signChar = Asc(" ")
+        End If
+    End If
+
+    FormatIntegerD = FormatInteger(dwX, d, field, flags, signChar)
+End Function
+
+/*!
+@brief  整数をprintfの%d, %u相当の変換で文字列化する関数。
+@author Egtra
+@date   2007/09/18
+@param[in]  x   文字列化する整数値。
+@param[in]  d   精度、最小限表示される桁数。DWORD_MAXのとき、指定なしとして、既定値1となる。
+@param[in]  field   フィールド幅。
+@param[in]  flags   書式フラグ。
+@param[in]  signChar    符号部分の文字。\0なら存在しないとして扱われる。
+@return xの文字列表現
+*/
+Function FormatInteger(x As DWord, d As DWord, field As DWord, flags As FormatFlags, signChar As StrChar) As String
     '左揃えのときまたは精度が指定されているとき、ゼロフラグは無視される。
     If (flags And Left) Or (d <> DWORD_MAX) Then
@@ -200 +230 @@
     Dim sb = New System.Text.StringBuilder
     With sb
-        Dim buf[MaxSize] As StrChar
-        Dim i = MaxSize
+        If signChar <> 0 Then
+            .Append(signChar)
+        End If
+
+        Dim buf[MaxSizeU] As StrChar
+        Dim i = MaxSizeU
         While x <> 0
             buf[i] = (x As Int64 Mod 10 + &h30) As StrChar 'Int64への型変換は#117対策
@@ -208 +242 @@
         Wend
         
-        Dim len = (MaxSize - i) As Long
+        Dim len = (MaxSizeU - i) As Long
         If len < d Then
             .Append(&h30 As StrChar, d - len)
@@ -215 +249 @@
         .Append(buf, i + 1, len)
 
-        If field > len Then
-            Dim embeddedSize = field - len
+        AdjustFieldWidth(sb, field, signChar <> 0, flags And (Not (Sign Or Blank)))
+    End With
+    FormatInteger = sb.ToString()
+End Function
+
+'! QWordの最大値18446744073709551615の文字数 - 1。FormatIntegerLU内で使用。
+Const MaxSizeLU = 19
+
+/*!
+@brief 文字列をフィールド幅まで満たされるように空白などを挿入する。
+@param [in,out] sb 対象文字列
+@param [in] field フィールド幅
+@param [in] hasSign 符号を持っている（負の値か）か否か
+@param [in] flags フラグ
+*/
+Sub AdjustFieldWidth(sb As System.Text.StringBuilder, field As DWord, hasSign As Boolean, flags As FormatFlags)
+    With sb
+        If .Length < field Then
+            Dim embeddedSize = field - .Length
             If flags And Left Then
                 .Append(&h20, embeddedSize)
             Else
-                .Insert(0, String$(embeddedSize, " "))
+                Dim insPos As Long
+                If (flags And Zero) <> 0 Then
+                    If ((flags And Blank) Or (flags And Sign) Or hasSign) Then
+                        insPos++
+                    End If
+                    .Insert(insPos, String$(embeddedSize, "0"))
+                Else
+                    .Insert(insPos, String$(embeddedSize, " "))
+                End If
             End If
         End If
+
     End With
-    FormatIntegerU = sb.ToString()
-End Function
+End Sub
 
 End Namespace 'Detail

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

@@ -193 +193 @@
 
 Namespace Detail
-Function Split(s As String, c As StrChar) As /*System.*/ArrayList '暫定
-    Split = New /*System.*/ArrayList
+Function Split(s As String, c As StrChar) As System.Collections.ArrayList
+    Split = New System.Collections.ArrayList
 
     Dim last = 0 As Long

trunk/Include/Classes/System/Collections/ArrayList.ab

@@ -2 +2 @@
 
 #require <Classes/System/Collections/misc.ab>
+
+Namespace System
+Namespace Collections
 
 Class ArrayList
@@ -351 +354 @@
 End Class
 
-/*
-Class ArrayList_Element
-Public
-    Sub ArrayList_Element()
-        Init(0)
-    End Sub
-    Sub ArrayList_Element(c As Long)
-        Init(c)
-    End Sub
-
-    Sub ~ArrayList_Element()
-        free(Elm)
-    End Sub
-
-    Sub Init(c As Long)
-        If c > 0 Then
-            Elm = malloc(SizeOf (*Object) * c)
-            If Elm = 0 Then
-                ' OutOfMemoryException
-                Debug
-            End If
-        Else
-            Elm = 0
-        End If
-        Size = 0
-        Capacity = c
-    End Sub
-
-    Sub Swap(ByRef x As ArrayList_Element)
-        Dim tmpElm = x.Elm
-        x.Elm = This.Elm
-        This.Elm = tmpElm
-
-        Dim tmpSize = x.Size
-        x.Size = This.Size
-        This.Size = x.Size
-
-        Dim tmpCap = x.Capacity
-        x.Capacity = This.Capacity
-        This.Capacity = tmpCap
-    End Sub
-
-    Elm As **Object
-    Size As Long
-    Capacity As Long
-End Class
-*/
+End Namespace 'Collections
+End Namespace 'System

trunk/Include/Classes/System/Collections/misc.ab

@@ -3 +3 @@
 #ifndef __SYSTEM_COLLECTIONS_MISC_AB__
 #define __SYSTEM_COLLECTIONS_MISC_AB__
+
+Namespace System
+Namespace Collections
 
 Interface ICollection
@@ -114 +117 @@
 End Class
 
+End Namespace 'Collections
+End Namespace 'System
+
 #endif '__SYSTEM_COLLECTIONS_MISC_AB__

trunk/Include/Classes/index.ab

@@ -2 +2 @@
 #require "./ActiveBasic/Core/TypeInfo.ab"
 #require "./ActiveBasic/Math/Math.ab"
-#require "./ActiveBasic/Strings/SPrintF.ab"
+'#require "./ActiveBasic/Strings/SPrintF.ab"
 #require "./ActiveBasic/Strings/Strings.ab"
 #require "./ActiveBasic/Windows/CriticalSection.ab"