Changeset 226

Timestamp:

May 1, 2007, 1:21:27 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

StringTest追加

Files:

• Include/Classes/System/String.ab (modified) (5 diffs)
• Include/com/bstring.ab (modified) (5 diffs)
• TestCase/SimpleTestCase/SimpleTestCase.idx (modified) (1 diff)
• TestCase/SimpleTestCase/SimpleTestCase.pj (modified) (1 diff)
• TestCase/SimpleTestCase/StringTest.ab (added)

Include/Classes/System/String.ab

@@ -71 +71 @@
         Return Chars
     End Function
-
-/*  Sub Operator = (ByRef objString As String)
-        Assign(objString.Chars, objString.m_Length)
-    End Sub
-
-    Sub Operator = (text As *Byte)
-        Assign(text As PCTSTR)
-    End Sub
-
-    Sub Operator = (text As PCSTR)
-        Assign(text)
-    End Sub
-
-    Sub Operator = (text As PCWSTR)
-        Assign(text)
-    End Sub*/
 
     Const Function Operator [] (n As Long) As StrChar
@@ -372 +356 @@
 
     Static Function Concat(x As String, y As String) As String
-        If x = Nothing Then
+        If String.IsNullOrEmpty(x) Then
             Return y
         Else
-            Return x.Concat(objString.Chars, objString.m_Length)
+            Return x.Concat(y.Chars, y.m_Length)
         End If
     End Function
@@ -513 +497 @@
 
     Static Function IsNullOrEmpty(s As String) As Boolean
-        If s <> Nothing Then
+        If Not Object.ReferenceEquals(s, Nothing) Then
             If s.m_Length > 0 Then
-                Return True
+                Return False
             End If
         End If
-        Return False
+        Return True
     End Function
 
@@ -573 +557 @@
         Next
     End Function
-
+/*
     Sub Swap(ByRef x As String)
         Dim tempLen As Long
@@ -584 +568 @@
         This.Chars = tempChars
     End Sub
-
+*/
     Override Function ToString() As String
         Return This

Include/com/bstring.ab

@@ -5 +5 @@
 
 Class BString
+    Sub Init(s As PCSTR, len As DWord)
+        Dim lenBS = MultiByteToWideChar(CP_THREAD_ACP, 0, s, len As Long, 0, 0)
+        bs = SysAllocStringLen(0, lenBS)
+        MultiByteToWideChar(CP_THREAD_ACP, 0, s, len As Long, bs, lenBS)
+    End Sub
 Public
     Sub BString()
@@ -15 +20 @@
 
     Sub BString(ByRef s As BString)
-        BString(s.bs, s.Length)
+        Init(s.bs, s.Length)
     End Sub
 
@@ -27 +32 @@
 
     Sub BString(s As PCSTR)
-        BString(s, lstrlenA(s))
+        Init(s, lstrlenA(s))
     End Sub
 
@@ -37 +42 @@
 
     Sub BString(ByRef s As String)
-        BString(s.StrPtr, s.Length As DWord)
+        Init(s.StrPtr, s.Length As DWord)
     End Sub
 
@@ -44 +49 @@
     End Sub
 
-    Sub Operator =(ByRef bstr As BString)
-        Clear()
-        BString(bstr)
-    End Sub
-
-    Sub Operator =(s As LPCOLESTR)
-        Clear()
-        BString(s)
-    End Sub
-
     Sub Assign(ByRef bstr As BString)
         Clear()
-        BString(bstr)
+        Init(bstr, bstr.Length)
     End Sub
 
     Sub Assign(s As LPCOLESTR)
         Clear()
-        BString(s)
+        Init(s, lstrlenW(s))
     End Sub
 

TestCase/SimpleTestCase/SimpleTestCase.idx

@@ -7 +7 @@
 'プロジェクト内のプログラム ファイル
 #include "ObjectTest.ab"
+#include "StringTest.ab"
 
 'リソースファイル

TestCase/SimpleTestCase/SimpleTestCase.pj

@@ -28 +28 @@
 SimpleTestCase.ab
 ObjectTest.ab
+StringTest.ab