Changeset 457 for trunk/Include/Classes/System

Timestamp:

Mar 6, 2008, 9:49:43 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

(SPrintF.ab) FormatIntegerExにStringBuilderを引数に取る版を追加。

Location:

trunk/Include/Classes/System

Files:

• IO/TextReader.ab (modified) (4 diffs)
• Math.ab (modified) (6 diffs)
• String.ab (modified) (8 diffs)
• Text/StringBuilder.ab (modified) (2 diffs)

trunk/Include/Classes/System/IO/TextReader.ab

@@ -36 +36 @@
         ElseIf count < 0 Then
         End If
+        Read = ReadImpl(buffer, index, count)
     End Function
 
@@ -80 +81 @@
     End Function
     /*
+    @brief 現在位置からストリームの終わりまで読み込む。
     @date 2008/02/26
     @auther Egtra
@@ -93 +95 @@
             sb.Append(ch As StrChar)
         Loop
+    End Function
+
+    Static Function Synchronized(reader As TextReader) As TextReader
     End Function
 
@@ -118 +123 @@
 End Class
 
+Namespace Detail
+
+Class SynchronizedTextReader
+    Inherits TextReader
+Public
+    Sub SynchronizedTextReader(reader As TextReader)
+        cs = New ActiveBasic.Windows.CriticalSection
+        base = reader
+    End Sub
+
+    Override Function Peek() As Long
+'       Using lock = cs.Lock
+            Peek = base.Peek
+'       End Using
+    End Function
+
+    Override Function Read() As Long
+'       Using lock = cs.Lock
+            Read = base.Read
+'       End Using
+    End Function
+
+    Override Function ReadLine() As String
+'       Using lock = cs.Lock
+            ReadLine = base.ReadLine
+'       End Using
+    End Function
+
+    Override Function ReadToEnd() As String
+'       Using lock = cs.Lock
+            ReadToEnd = base.ReadToEnd
+'       End Using
+    End Function
+
+Protected
+    Override Sub Dispose(disposing As Boolean)
+        Dim s = Nothing As Stream
+        SetPointer(VarPtr(s) As *VoidPtr, InterlockedExchangePointer(ByVal VarPtr(base) As *VoidPtr, 0))
+        If disposing Then
+            If Not ActiveBasic.IsNothing(s) Then
+                s.Dispose()
+            End If
+            cs.Dispose()
+        End If
+    End Sub
+
+    Override Function ReadImpl(buffer As *StrChar, index As Long, count As Long) As Long
+'       Using lock = cs.Lock
+            ReadImpl = base.ReadImpl(buffer, index, count)
+'       End Using
+    End Function
+Private
+    cs As ActiveBasic.Windows.CriticalSection
+    base As TextReader
+End Class
+
+End Namespace
+
 End NameSpace
 End NameSpace

trunk/Include/Classes/System/Math.ab

@@ -127 +127 @@
 
     Static Function Ceiling(x As Double) As Long
-        If Floor(x) = x then
-            Return x As Long
-        Else
-            Return Floor(x) + 1
+        Ceiling = Floor(x)
+        If Ceiling <> x Then
+            Ceiling++
         End If
     End Function
@@ -145 +144 @@
 
     Static Function Cosh(value As Double) As Double
-        Dim t As Double
-        t = Math.Exp(value)
+        Dim t = Math.Exp(value)
         return (t + 1 / t) * 0.5
     End Function
@@ -156 +154 @@
 
     Static Function DivRem(x As Int64, y As Int64, ByRef ret As Int64) As Int64
-        ret = x - (x \ y) * y
-        return x \ y
+        DivRem = x \ y
+        ret = x - (DivRem) * y
     End Function
 
@@ -196 +194 @@
         Return Int(value)
     End Function
-
-    'GetHashCode
-
-    'GetType
 
     Static Function IEEERemainder(x As Double, y As Double) As Double
@@ -513 +507 @@
 
     Static Function Sqrt(x As Double) As Double
-        Dim s As Double, last As Double
-        Dim i As *Word, j As Long, jj As Long, k As Long
         If x > 0 Then
             If ActiveBasic.Math.IsInf(x) Then
@@ -520 +512 @@
             Else
                 Sqrt = x
-                i = (VarPtr(Sqrt) + 6) As *Word
-                jj = GetWord(i)
-                j = jj >> 5
-                k = jj And &h0000001f
-                j = (j+  511) << 4 + k
+                Dim i = (VarPtr(Sqrt) + 6) As *Word
+                Dim jj = GetWord(i) As Long
+                Dim j = jj >> 5 As Long
+                Dim k = (jj And &h0000001f) As Long
+                j = (j + 511) << 4 + k
                 SetWord(i, j)
+                Dim last As Double
                 Do
                     last = Sqrt
-                    Sqrt = (x /Sqrt + Sqrt) * 0.5
+                    Sqrt = (x / Sqrt + Sqrt) * 0.5
                 Loop While Sqrt <> last
             End If

trunk/Include/Classes/System/String.ab

@@ -27 +27 @@
 
     Class String
-    '   Inherits IComparable, ICloneable, IConvertible, IEnumerable
+        Implements /*IComparable, ICloneable, IConvertible, IComparable<String>, IEnumerable, IEnumerable<StrChar>, IEquatable<String>*/
 
         m_Length As Long
@@ -34 +34 @@
         Sub validPointerCheck(p As VoidPtr, size = 1 As Long)
             If p As ULONG_PTR < &h10000 Then
-                'Throw ArgumentException
-                Debug
+                Throw New ArgumentException
             ElseIf IsBadReadPtr(p, size As ULONG_PTR) Then
-                'Throw ArgumentException
-                Debug
+                Throw New ArgumentException
             End If
         End Sub
@@ -153 +151 @@
 
         Const Function Operator == (y As String) As Boolean
-            Return String.Compare(This, y) = 0
+            Return Compare(This, y) = 0
         End Function
 
         Const Function Operator == (y As *StrChar) As Boolean
-            Return String.Compare(This, y) = 0
+            Return Compare(This, y) = 0
         End Function
 
         Const Function Operator <> (y As String) As Boolean
-            Return String.Compare(This, y) <> 0
+            Return Compare(This, y) <> 0
         End Function
 
         Const Function Operator <> (y As *StrChar) As Boolean
-            Return String.Compare(This, y) <> 0
+            Return Compare(This, y) <> 0
         End Function
 
         Const Function Operator < (y As String) As Boolean
-            Return String.Compare(This, y) < 0
+            Return Compare(This, y) < 0
         End Function
 
         Const Function Operator < (y As *StrChar) As Boolean
-            Return String.Compare(This, y) < 0
+            Return Compare(This, y) < 0
         End Function
 
         Const Function Operator > (y As String) As Boolean
-            Return String.Compare(This, y) > 0
+            Return Compare(This, y) > 0
         End Function
 
         Const Function Operator > (y As *StrChar) As Boolean
-            Return String.Compare(This, y) > 0
+            Return Compare(This, y) > 0
         End Function
 
         Const Function Operator <= (y As String) As Boolean
-            Return String.Compare(This, y) <= 0
+            Return Compare(This, y) <= 0
         End Function
 
         Const Function Operator <= (y As *StrChar) As Boolean
-            Return String.Compare(This, y) <= 0
+            Return Compare(This, y) <= 0
         End Function
 
         Const Function Operator >= (y As String) As Boolean
-            Return String.Compare(This, y) >= 0
+            Return Compare(This, y) >= 0
         End Function
 
         Const Function Operator >= (y As *StrChar) As Boolean
-            Return String.Compare(This, y) >= 0
+            Return Compare(This, y) >= 0
         End Function
 
@@ -205 +203 @@
 
     Public
+        'Compareなどで、x.Charsではなく、StrPtr(x)と書く理由は、xがNothingの場合のため。
+
         Static Function Compare(x As String, indexX As Long, y As String, indexY As Long, length As Long) As Long
-            Return String.CompareOrdinal(x, indexX, y, indexY, length)
+            Return CompareOrdinal(x, indexX, y, indexY, length)
         End Function
 
         Static Function CompareOrdinal(x As String, y As String) As Long
-            Return String.CompareOrdinal(x.Chars, y.Chars)
+            Return CompareOrdinal(StrPtr(x), StrPtr(y))
         End Function
 
         Static Function CompareOrdinal(x As String, indexX As Long, y As String, indexY As Long, length As Long) As Long
-            Return String.CompareOrdinal(x.Chars, indexX, y.Chars, indexY, length)
+            Return CompareOrdinal(StrPtr(x), indexX, StrPtr(y), indexY, length)
         End Function
     Private
         Static Function Compare(x As String, y As *StrChar) As Long
-            Return String.CompareOrdinal(x, y)
+            Return CompareOrdinal(x, y)
         End Function
 
         Static Function CompareOrdinal(x As String, y As *StrChar) As Long
-            Return String.CompareOrdinal(x.Chars, y)
+            Return CompareOrdinal(StrPtr(x), y)
         End Function
 
@@ -257 +257 @@
         Function CompareTo(y As Object) As Long
             If Not Object.Equals(This.GetType(), y.GetType()) Then
-                Throw New ArgumentException("String.CompareTo: An argument is out of range value.", "y")
+                Throw New ArgumentException("String.CompareTo: The type of the argument y is not String.", "y")
             End If
             Return CompareTo(y As String)
@@ -351 +351 @@
         End Function
 
+        Static Function Concat(x As String, y As String, z As String) As String
+            Dim sb = New Text.StringBuilder(removeNull(x).Length + removeNull(y).Length + removeNull(z).Length)
+            sb.Append(x).Append(y).Append(z)
+            Concat = sb.ToString
+        End Function
+
+        Static Function Concat(x As String, y As String, z As String, w As String) As String
+            Dim sb = New Text.StringBuilder(removeNull(x).Length + removeNull(y).Length + removeNull(z).Length + removeNull(w).Length)
+            sb.Append(x).Append(y).Append(z).Append(w)
+            Concat = sb.ToString
+        End Function
+
         Static Function Concat(x As Object, y As Object) As String
-            Return String.Concat(x.ToString, y.ToString)
+            Return Concat(x.ToString, y.ToString)
+        End Function
+
+        Static Function Concat(x As Object, y As Object, z As Object) As String
+            Return Concat(x.ToString, y.ToString, z.ToString)
+        End Function
+
+        Static Function Concat(x As Object, y As Object, z As Object, w As Object) As String
+            Return Concat(x.ToString, y.ToString, z.ToString, w.ToString)
         End Function
 
@@ -575 +595 @@
             Clone = This
         End Function
-
+/*
+        Function Clone() As Object
+            Clone = This
+        End Function
+*/
         Static Function Copy(s As String) As String
             Copy = New String(s.Chars, s.m_Length)
@@ -656 +680 @@
             End If
         End Sub
+
+        Static Function removeNull(s As String) As String
+            If ActiveBasic.IsNothing(s) Then
+                removeNull = Empty
+            Else
+                removeNull = s
+            End If
+        End Function
     End Class
 

trunk/Include/Classes/System/Text/StringBuilder.ab

@@ -182 +182 @@
         ElseIf c > Capacity Then
             Dim p = GC_malloc_atomic((c + 1) * SizeOf (StrChar)) As *StrChar
-            If p = 0 Then
-                'Throw OutOfMemoryException
-                Debug
-            End If
             ActiveBasic.Strings.ChrCopy(p, chars, size As SIZE_T)
             chars = p
@@ -488 +484 @@
         This.size = 0
         This.chars = GC_malloc_atomic((This.capacity + 1) * SizeOf (StrChar))
-        If chars = 0 Then
-            'Throw OutOfMemoryException
-            Debug
-        End If
-
     End Sub