Changeset 400 for trunk/Include/basic/function.sbp

Timestamp:

Jan 22, 2008, 9:19:59 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

_System_CThreadCollectionでのクラスインスタンスへのポインタの使用を除去、参照変数構文へ。

File:

• trunk/Include/basic/function.sbp (modified) (7 diffs)

trunk/Include/basic/function.sbp

@@ -263 +263 @@
                 If _System_IsLowSurrogate(s[0]) Then
                     AscW = ((s[0] And &h3FF) As DWord << 10) Or (s[1] And &h3FF)
+                    AscW += &h10000
                     Exit Function
                 End If
@@ -276 +277 @@
         Return New String(c As StrChar, 1)
     ElseIf c <= &h10FFFF Then
+        c -= &h10000
         Dim t[1] As WCHAR
         t[0] = (&hD800 Or (c >> 10)) As WCHAR
@@ -647 +649 @@
     Val=0
 
-    While buf[0]=Asc(" ") or buf[0]=Asc(Ex"\t")
+    While ActiveBasic.CType.IsSpace(buf[0])
         buf = VarPtr(buf[1])
     Wend
@@ -655 +657 @@
         temporary = temporary.ToUpper()
         TempPtr = StrPtr(temporary)
-        If TempPtr(1)=Asc("O") Then
+        If TempPtr(1) = Asc("O") Then
             '8進数
             i=2
@@ -715 +717 @@
 
 Function Eof(FileNum As Long) As Long
-    Dim dwCurrent As DWord, dwEnd As DWord
-
     FileNum--
-
-    dwCurrent=SetFilePointer(_System_hFile(FileNum),0,NULL,FILE_CURRENT)
-    dwEnd=SetFilePointer(_System_hFile(FileNum),0,NULL,FILE_END)
-    SetFilePointer(_System_hFile(FileNum),dwCurrent,NULL,FILE_BEGIN)
+    Dim dwCurrent = SetFilePointer(_System_hFile(FileNum), 0,NULL, FILE_CURRENT)
+    Dim dwEnd = SetFilePointer(_System_hFile(FileNum), 0, NULL, FILE_END)
+    SetFilePointer(_System_hFile(FileNum), dwCurrent, NULL, FILE_BEGIN)
 
     If dwCurrent>=dwEnd Then
@@ -770 +769 @@
 
 Function _System_malloc(stSize As SIZE_T) As VoidPtr
-    Return HeapAlloc(_System_hProcessHeap,0,stSize)
+    Return HeapAlloc(_System_hProcessHeap, 0, stSize)
 End Function
 
 Function _System_calloc(stSize As SIZE_T) As VoidPtr
-    Return HeapAlloc(_System_hProcessHeap,HEAP_ZERO_MEMORY,stSize)
+    Return HeapAlloc(_System_hProcessHeap, HEAP_ZERO_MEMORY, stSize)
 End Function
 
@@ -786 +785 @@
 
 Sub _System_free(lpMem As VoidPtr)
-    HeapFree(_System_hProcessHeap,0,lpMem)
+    HeapFree(_System_hProcessHeap, 0, lpMem)
 End Sub