Changeset 110 for Include/basic/function.sbp

Timestamp:

Feb 18, 2007, 11:19:00 PM (18 years ago)

Author:

イグトランス (egtra)

Message:

ByteからCharへの変更（不完全）ほか微修正

File:

• Include/basic/function.sbp (modified) (11 diffs)

Include/basic/function.sbp

@@ -344 +344 @@
 '------------
 
-Function Asc(buf As String) As Byte
+Function Asc(buf As String) As Char
     Asc = buf[0]
 End Function
 
-Function Chr$(code As Byte) As String
+Function Chr$(code As Char) As String
     Chr$=ZeroString(1)
     Chr$[0]=code
@@ -497 +497 @@
 End Function
 
-Dim _System_ecvt_buffer[16] As Byte
+Dim _System_ecvt_buffer[16] As Char
 Sub _ecvt_support(count As Long)
     Dim i As Long
@@ -511 +511 @@
         End If
     Else
-        _System_ecvt_buffer[count]=_System_ecvt_buffer[count]+1 As Byte
+        _System_ecvt_buffer[count]=_System_ecvt_buffer[count]+1 As Char
     End If
 End Sub
@@ -549 +549 @@
 
     For i=0 To count-1
-        _System_ecvt_buffer[i]=Int(value) As Byte
+        _System_ecvt_buffer[i]=Int(value) As Char
 
         value=(value-CDbl(Int(value)))*10
@@ -578 +578 @@
     End If
     Dim dec As Long, sign As Long
-    Dim buffer[32] As Byte, temp As BytePtr
+    Dim buffer[32] As Char, temp As *Char
     Dim i As Long, i2 As Long, i3 As Long
 
@@ -664 +664 @@
 End Function
 Function Str$(value As LONG_PTR) As String
-    Dim temp[255] As Byte
+    Dim temp[255] As Char
     wsprintf(temp,"%d",value)
     Str$=MakeStr(temp)
@@ -739 +739 @@
                 If Not (0<=i3 And i3<=7) Then Exit While
 
-                TempPtr[i]=i3 As Byte
+                TempPtr[i]=i3 As Char
                 i++
             Wend
@@ -762 +762 @@
                 End If
 
-                TempPtr[i]=i3 As Byte
+                TempPtr[i]=i3 As Char
                 i++
             Wend
@@ -918 +918 @@
 Sub _splitpath(path As BytePtr, drive As BytePtr, dir As BytePtr, fname As BytePtr, ext As BytePtr)
     Dim i As Long, i2 As Long, i3 As Long, length As Long
-    Dim buffer[MAX_PATH] As Byte
+    Dim buffer[MAX_PATH] As Char
 
     '":\"をチェック
@@ -934 +934 @@
     i2=0
     Do
+#ifdef UNICODE
+' ToDo: サロゲートペアの認識
+#else
         If IsDBCSLeadByte(path[i])=TRUE and path[i+1]<>0 Then
             If dir Then
@@ -944 +947 @@
             Continue
         End If
+#endif
 
         If path[i]=0 Then Exit Do