Changeset 709 for trunk/ab5.0/ablib/src/com/bstring.ab

Timestamp:

Jun 29, 2009, 4:03:45 AM (15 years ago)

Author:

イグトランス (egtra)

Message:

最新のコンパイラに通るように修正。参照クラスのセマンティクスに合うように修正(Setter系プロパティの削除など)。

File:

• trunk/ab5.0/ablib/src/com/bstring.ab (modified) (9 diffs)

trunk/ab5.0/ablib/src/com/bstring.ab

@@ -5 +5 @@
 
 Class BString
-    Implements System.IDisposable ', System.ICloneable
+    Implements System.IDisposable, System.ICloneable
 Public
     Sub BString()
@@ -15 +15 @@
     End Sub
 
-    Sub BString(s As BString)
-        If Not IsNothing(s) Then
-            bs = copy(s.bs)
-        End If
-    End Sub
-
     Sub BString(s As LPCOLESTR, len As DWord)
-        If s <> 0 Then
-            bs = SysAllocStringLen(s, len)
-        End If
+        init(s, len)
     End Sub
 
     Sub BString(s As String)
         If Not IsNothing(s) Then
-            Init(s.StrPtr, s.Length As DWord)
+            init(s.StrPtr, s.Length As DWord)
         End If
     End Sub
@@ -73 +65 @@
     End Function
 
-    /*Override*/ Function Clone() As BString
-        Return New BString(This)
-    End Function
-
-    /*Override*/ Sub Dispose()
+    Function Clone() As BString
+        Return New BString(bs, Length)
+    End Function
+
+    Sub Dispose()
         Clear()
     End Sub
@@ -103 +95 @@
 
     Const Function Length() As DWord
-        Length = GetDWord(bs As VoidPtr - SizeOf (DWord)) 'SysStringLen(bs)
+        Length = SysStringLen(bs)
     End Function
 
     Const Function Operator [](i As SIZE_T) As OLECHAR
         If i > Length Then
-            Throw New ArgumentOutOfRangeException("i")
+            Throw New System.ArgumentOutOfRangeException("i - BString.Operator [] (get)")
         End If
         Return bs[i]
@@ -115 +107 @@
     Sub Operator []=(i As SIZE_T, c As OLECHAR)
         If i > Length Then
-            Throw New ArgumentOutOfRangeException("i")
+            Throw New System.ArgumentOutOfRangeException("i - BString.Operator [] (set)")
         End If
         bs[i] = c
@@ -148 +140 @@
             End If
         Else
-            If IsNullOrEmpty(bsr) Then
+            If IsNullOrEmpty(r) Then
                 Compare = 1
             Else
@@ -156 +148 @@
     End Function
 
-    Static Function IsNullOrEmpty(s As BString)
+    Static Function IsNullOrEmpty(s As BString) As Boolean
         If IsNothing(s) Then
             IsNullOrEmpty = True
@@ -196 +188 @@
 
     Sub init(s As PCSTR, len As DWord)
-        If <> 0 Then
-            Dim lenBS = MultiByteToWideChar(CP_THREAD_ACP, 0, s, len As Long, 0, 0)
+        If s <> 0 Then
+            Dim lenBS = MultiByteToWideChar(CP_ACP, 0, s, len As Long, 0, 0)
             bs = SysAllocStringLen(0, lenBS)
             If bs <> 0 Then
-                MultiByteToWideChar(CP_THREAD_ACP, 0, s, len As Long, bs, lenBS)
-            End If
+                MultiByteToWideChar(CP_ACP, 0, s, len As Long, bs, lenBS)
+            End If
+        End If
+    End Sub
+
+    Sub init(s As PCWSTR, len As DWord)
+        If s <> 0 Then
+            bs = SysAllocStringLen(s, len)
         End If
     End Sub
 
     Sub reset(newBS As BSTR)
-        Dim old = InterlockedExchangePointer(bs, newBS)
+        Dim old = InterlockedExchangePointer(ByVal VarPtr(bs) As *VoidPtr, newBS)
         SysFreeString(old)
     End Sub
@@ -215 +213 @@
 
     Static Function move(ByRef src As BSTR) As BSTR
-        move = InterlockedExchangePointer(src, 0)
+        move = InterlockedExchangePointer(ByVal VarPtr(src) As *VoidPtr, 0)
     End Function
 End Class