Changeset 203 for Include/Classes

Timestamp:

Apr 4, 2007, 6:53:48 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

GCHandleの追加、String.Compareなどの追加、gc.sbpの修正

Location:

Include/Classes/System

Files:

• Collections/ArrayList.ab (modified) (12 diffs)
• Runtime (added)
• Runtime/InteropServices (added)
• Runtime/InteropServices/GCHandle.ab (added)
• String.ab (modified) (10 diffs)

Include/Classes/System/Collections/ArrayList.ab

@@ -37 +37 @@
             Debug
         End If
+        capacity = size
     End Sub
 
@@ -42 +43 @@
         If This.capacity < capacity Then
             This.capacity = capacity 
-            Realloc( capacity )
+            Realloc(capacity)
         End If
     End Sub
@@ -96 +97 @@
     /*Override*/ Virtual Sub Operator []=(index As Long, object As Object)
         If 0 <= index And index < size Then
-            pObject[i] = object
+            pObject[index] = object
         Else
             'Throw OutOfRangeException?
@@ -114 +115 @@
     End Sub
 /*
-    Sub ArrayList(ByRef c As ICollection)
+    Sub ArrayList(c As ICollection)
         ' 未実装
         Debug
@@ -127 +128 @@
     End Sub
 
-'   Sub Operator =(ByRef a As ArrayList)
+'   Sub Operator =(a As ArrayList)
 
     /*Override*/ Virtual Function Add( object As Object ) As Long
@@ -136 +137 @@
     End Function
 
-    Virtual Sub AddRange(ByRef c As ICollection)
-        ' TODO: 実装
-    End Sub
-
-    Const Virtual Function BinarySearch(x As *Object)
-        ' TODO: 実装
-    End Function
-
-    Const Virtual Function BinarySearch(x As *Object, ByRef c As IComparer) As Long
-        ' TODO: 実装
-    End Function
-
-    Const Virtual Function BinarySearch(index As Long, count As Long, x As *Object, ByRef c As IComparer) As Long
-        ' TODO: 実装
+    Virtual Sub AddRange(c As ICollection)
+        ' TODO: 実装
+    End Sub
+
+    Const Virtual Function BinarySearch(x As Object)
+        ' TODO: 実装
+    End Function
+
+    Const Virtual Function BinarySearch(x As Object, c As IComparer) As Long
+        Return BinarySearch(0, size, x, c)
+    End Function
+
+    Const Virtual Function BinarySearch(index As Long, count As Long, x As Object, c As IComparer) As Long
+        Dim l = index
+        Dim r = index + ELM(count)
+        While l <= r
+            Dim mid = (l + r) >> 2
+            Dim ret = c.Compare(pObject[mid], x)
+            If ret = 0 Then
+                Return mid
+            Else If ret < 0 Then 'pObject[mid] < x
+                If l = r Then
+                    If mid + 1 <= index + ELM(count) Then
+                        Return Not (mid + 1)
+                    Else
+                        Return count
+                    End If
+                End If
+                l = mid + 1
+            Else 'pObject[mid] > x
+                If l = r And mid + 1 <= index + ELM(count) Then
+                    Return Not mid
+                End If
+                r = mid - 1
+            End If
+        Wend
+        If l = index Then
+            Return Not index
+        Else 'r = index + ELM(count)
+            Return Not count
+        End If
     End Function
 
@@ -172 +200 @@
 
     ' CopyTo
-    /*Const*/ /*Override*/ Virtual Function GetEnumerator() As *IEnumerator
-        'Return GetEnumerator(index, count)
-    End Function
-
-    Const Virtual Function GetEnumerator(index As Long, count As Long) As *IEnumerator
-        ' TODO: 実装
-    End Function
-
-    Virtual Function GetRange(index As Long, count As Long) As *ArrayList
+
+'   
+'   /*Const*/ /*Override*/ Virtual Function GetEnumerator() As IEnumerator
+'       'Return GetEnumerator(index, count)
+'   End Function
+
+'   Const Virtual Function GetEnumerator(index As Long, count As Long) As IEnumerator
+'       ' TODO: 実装
+'   End Function
+
+    Virtual Function GetRange(index As Long, count As Long) As ArrayList
         ' TODO: 実装
     End Function
@@ -210 +240 @@
     End Sub
 
-    Virtual Sub InsertRange(index As Long, ByRef c As ICollection)
+    Virtual Sub InsertRange(index As Long, c As ICollection)
         ' TODO: 実装
     End Sub
@@ -253 +283 @@
     End Sub
 
-    Virtual Sub SetRange(index As Long, ByRef c As ICollection)
+    Virtual Sub SetRange(index As Long, c As ICollection)
         ' TODO: 実装
     End Sub
@@ -261 +291 @@
     End Sub
 
-    Virtual Sub Sort(ByRef c As IComparer)
+    Virtual Sub Sort(c As IComparer)
         Sort(0, size, c)
     End Sub
 
-    Virtual Sub Sort(index As Long, count As Long, ByRef c As IComparer)
+    Virtual Sub Sort(index As Long, count As Long, c As IComparer)
         ' TODO: 実装
     End Sub
@@ -280 +310 @@
     ' --------------------------------
     ' static methods
-    Static Function Adapter(ByRef l As IList) As *ArrayList
-        ' TODO: 実装
-    End Function
-
-    Static Function FixedSize(ByRef l As ArrayList) As *ArrayList
-        ' TODO: 実装
-    End Function
-
-    Static Function FixedSize(ByRef l As IList) As *IList
+    Static Function Adapter(l As IList) As ArrayList
+        ' TODO: 実装
+    End Function
+
+    Static Function FixedSize(l As ArrayList) As ArrayList
+        ' TODO: 実装
+    End Function
+
+    Static Function FixedSize(l As IList) As IList
         Return FixedSize(Adapter(VarPtr(i)))
     End Function
 
-    Static Function ReadOnly(ByRef l As ArrayList) As *ArrayList
-        ' TODO: 実装
-    End Function
-
-    Static Function ReadOnly(ByRef l As IList) As *IList
+    Static Function ReadOnly(l As ArrayList) As ArrayList
+        ' TODO: 実装
+    End Function
+
+    Static Function ReadOnly(l As IList) As IList
         Return ReadOnly(Adapter(VarPtr(i)))
     End Function
 
-    Static Function Repeat(ByRef x As Object, c As Long) As *ArrayList
+    Static Function Repeat(x As Object, c As Long) As ArrayList
         Repeat = New ArrayList(c)
         Dim i As Long
@@ -308 +338 @@
     End Function
 
-    Static Function Synchronized(ByRef l As ArrayList) As *ArrayList
-        ' TODO: 実装
-    End Function
-
-    Static Function Synchronized(ByRef l As IList) As *IList
+    Static Function Synchronized(l As ArrayList) As ArrayList
+        ' TODO: 実装
+    End Function
+
+    Static Function Synchronized(l As IList) As IList
         Return Synchronized(Adapter(VarPtr(i)))
     End Function

Include/Classes/System/String.ab

@@ -16 +16 @@
 
 Class String
+'   Inherits IComparable, ICloneable, IConvertible, IEnumerable
+
     m_Length As Long
 Public
@@ -21 +23 @@
 
     Sub String()
-        Chars = _System_malloc(SizeOf (StrChar)) '0
+        Chars = _System_malloc(SizeOf (StrChar))
         Chars[0] = 0
         m_Length = 0
@@ -129 +131 @@
     End Function
 
-    Const Function Operator + (ByRef objString As String) As String
+    Const Function Operator + (objString As String) As String
         Return Concat(objString.Chars, objString.m_Length)
     End Function
@@ -143 +145 @@
     End Function
 
-    Const Function Operator & (ByRef objString As String) As String
+    Const Function Operator & (objString As String) As String
         Dim tempString = This + objString
         Return tempString
     End Function
 
-    Const Function Operator == (ByRef objString As String) As Boolean
-        Return _System_StrCmp(This.Chars, objString.Chars) = 0
+    Const Function Operator == (objString As String) As Boolean
+        Return String.Compare(This, objString) = 0
     End Function
 
@@ -156 +158 @@
     End Function
 
-    Const Function Operator <> (ByRef objString As String) As Boolean
-        Return _System_StrCmp(This.Chars, objString.Chars) <> 0
+    Const Function Operator <> (objString As String) As Boolean
+        Return String.Compare(This, objString) <> 0
     End Function
 
@@ -164 +166 @@
     End Function
 
-    Const Function Operator < (ByRef objString As String) As Boolean
-        Return _System_StrCmp(This.Chars, objString.Chars) < 0
+    Const Function Operator < (objString As String) As Boolean
+        Return String.Compare(This, objString) < 0
     End Function
 
@@ -172 +174 @@
     End Function
 
-    Const Function Operator > (ByRef objString As String) As Boolean
-        Return _System_StrCmp(This.Chars, objString.Chars) > 0
+    Const Function Operator > (objString As String) As Boolean
+        Return String.Compare(This, objString) > 0
     End Function
 
@@ -180 +182 @@
     End Function
 
-    Const Function Operator <= (ByRef objString As String) As Boolean
-        Return _System_StrCmp(This.Chars, objString.Chars) <= 0
+    Const Function Operator <= (objString As String) As Boolean
+        Return String.Compare(This, objString) <= 0
     End Function
 
@@ -188 +190 @@
     End Function
 
-    Const Function Operator >= (ByRef objString As String) As Boolean
-        Return _System_StrCmp(This.Chars, objString.Chars) >= 0
+    Const Function Operator >= (objString As String) As Boolean
+        Return String.Compare(This, objString) >= 0
     End Function
 
     Const Function Operator >= (text As *StrChar) As Boolean
         Return _System_StrCmp(This.Chars, text) >= 0
+    End Function
+
+    Static Function Compare(x As String, y As String) As Long
+        Return CompareOrdinal(x, y)
+    End Function
+
+    Static Function Compare(x As String, indexX As Long, y As String, indexY As Long, length As Long) As Long
+        Return CompareOrdinal(x, indexX, y, indexY, length)
+    End Function
+
+    Static Function CompareOrdinal(x As String, y As String) As Long
+        Return _System_StrCmp(x.Chars, y.Chars)
+    End Function
+
+    Static Function CompareOrdinal(x As String, indexX As Long, y As String, indexY As Long, length As Long) As Long
+        If x = Nothing Then
+            If y = Nothing Then
+                Return 0
+            Else
+                Return -1
+            End If
+        ElseIf y = Nothing Then
+            Return 1
+        End If
+        Return _System_StrCmpN(VarPtr(x.Chars[indexX]), VarPtr(y.Chars[indexY]), length)
+    End Function
+
+    Function CompareTo(y As String) As Long
+        Return String.Compare(This, y)
+    End Function
+
+    Function CompareTo(y As Object) As Long
+        Dim s = y As String
+'       If y is not String Then
+'           Throw New ArgumentException
+'       End If
+        Return CompareTo(y)
     End Function
 
@@ -341 +380 @@
 #endif
     End Function
-    Const Function Contains(ByRef objString As String) As Boolean
+
+    Static Function Concat(x As String, y As String) As String
+        If x = Nothing Then
+            Return y
+        Else
+            Return x.Concat(objString.Chars, objString.m_Length)
+        End If
+    End Function
+
+    Static Function Concat(x As Object, y As Object) As String
+        Return String.Concat(x.ToString, y.ToString)
+    End Function
+
+    Const Function Contains(objString As String) As Boolean
         Return IndexOf(objString, 0, m_Length) >= 0
     End Function