Changeset 272 for Include/system

Timestamp:

Jun 12, 2007, 7:24:38 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

StringBuilderを追加。String不変へ。共通の文字列操作関数をActiveBasic.Strings内に配置（設計に検討の余地あり）。

File:

• Include/system/string.sbp (modified) (10 diffs)

Include/system/string.sbp

@@ -5 +5 @@
 #define _INC_BASIC_STRING
 
-Function StrPtr(buf As *StrChar) As *StrChar
-    StrPtr = buf
+Function StrPtr(s As String) As *StrChar
+    StrPtr = s.StrPtr
 End Function
 
@@ -93 +93 @@
 
 Function GetStr(s As String, ByRef mbs As PSTR) As SIZE_T
-    Return GetStr(s.Chars, s.Length As SIZE_T, mbs)
+    Return GetStr(s.StrPtr, s.Length As SIZE_T, mbs)
 End Function
 
 Function GetStr(s As String, ByRef wcs As PWSTR) As SIZE_T
-    Return GetStr(s.Chars, s.Length As SIZE_T, wcs)
+    Return GetStr(s.StrPtr, s.Length As SIZE_T, wcs)
 End Function
 
@@ -117 +117 @@
 
 Function GetWCStr(s As String, ByRef wcs As PWSTR) As SIZE_T
-    Return GetStr(s.Chars, s.Length As SIZE_T, wcs)
+    Return GetStr(s.StrPtr, s.Length As SIZE_T, wcs)
 End Function
 
@@ -137 +137 @@
 
 Function GetMBStr(s As String, ByRef mbs As PSTR) As SIZE_T
-    Return GetStr(s.Chars, s.Length As SIZE_T, mbs)
+    Return GetStr(s.StrPtr, s.Length As SIZE_T, mbs)
 End Function
 
@@ -157 +157 @@
 
 Function GetTCStr(s As String, ByRef tcs As PCTSTR) As SIZE_T
-    Return GetStr(s.Chars, s.Length As SIZE_T, tcs)
+    Return GetStr(s.StrPtr, s.Length As SIZE_T, tcs)
 End Function
 
@@ -177 +177 @@
 
 Function GetSCStr(s As String, ByRef ss As *StrChar) As SIZE_T
-    Return GetStr(s.Chars, s.Length As SIZE_T, ss)
+    Return GetStr(s.StrPtr, s.Length As SIZE_T, ss)
 End Function
 
@@ -197 +197 @@
 
 Function ToWCStr(s As String) As PWSTR
-    GetStr(s.Chars, s.Length As SIZE_T, ToWCStr)
+    GetStr(s.StrPtr, s.Length As SIZE_T, ToWCStr)
 End Function
 
@@ -217 +217 @@
 
 Function ToMBStr(s As String) As PSTR
-    GetStr(s.Chars, s.Length As SIZE_T, ToMBStr)
+    GetStr(s.StrPtr, s.Length As SIZE_T, ToMBStr)
 End Function
 
@@ -237 +237 @@
 
 Function ToTCStr(s As String) As PCTSTR
-    GetStr(s.Chars, s.Length As SIZE_T, ToTCStr)
+    GetStr(s.StrPtr, s.Length As SIZE_T, ToTCStr)
 End Function
 
@@ -257 +257 @@
 
 Function ToSCStr(s As String) As *StrChar
-    GetStr(s.Chars, s.Length As SIZE_T, ToSCStr)
+    GetStr(s.StrPtr, s.Length As SIZE_T, ToSCStr)
 End Function