Changeset 497 for trunk/Include/basic

Timestamp:

Mar 28, 2008, 5:43:34 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

インクルードガードとその他不要な前処理定義などの削除

Location:

trunk/Include/basic

Files:

• command.sbp (modified) (13 diffs)
• dos_console.sbp (modified) (1 diff)
• function.sbp (modified) (18 diffs)
• prompt.sbp (modified) (12 diffs)

trunk/Include/basic/command.sbp

@@ -1 +1 @@
 'command.sbp
-
-
-#ifndef _INC_COMMAND
-#define _INC_COMMAND
 
 Const _System_Type_SByte = 1
@@ -152 +148 @@
 Sub INPUT_FromFile(FileNumber As Long)
     FileNumber--
-    
+
     Dim i = 0 As Long
     Dim buffer = New System.Text.StringBuilder(256)
-    Dim temp[1] As StrChar
+    Dim temp[1] As Char
     Dim dwAccessBytes As DWord
     Dim IsStr As Long
@@ -162 +158 @@
         '次のデータをサーチ
         Do
-            Dim ret = ReadFile(_System_hFile[FileNumber],temp,SizeOf (StrChar),VarPtr(dwAccessBytes),ByVal 0)
+            Dim ret = ReadFile(_System_hFile[FileNumber],temp,SizeOf (Char),VarPtr(dwAccessBytes),ByVal 0)
             If ret=0 or dwAccessBytes=0 Then
                 'error
@@ -173 +169 @@
         IsStr=0
         While 1
-            Dim ret = ReadFile(_System_hFile[FileNumber],temp,SizeOf (StrChar),VarPtr(dwAccessBytes),ByVal 0)
+            Dim ret = ReadFile(_System_hFile[FileNumber],temp,SizeOf (Char),VarPtr(dwAccessBytes),ByVal 0)
             If ret = 0 or dwAccessBytes = 0 Then
                 'error
@@ -183 +179 @@
             If dwAccessBytes=0 or temp[0]=0 or temp[0]=13 or temp[0]=10 or (IsStr=0 and temp[0]=Asc(",")) or (IsStr=0 and (temp[0]=32 or temp[0]=9) and _System_InputDataType[i]<>_System_Type_String) Then
                 If temp[0]=13 Then
-                    ReadFile(_System_hFile[FileNumber],temp,SizeOf (StrChar),VarPtr(dwAccessBytes),ByVal 0)
+                    ReadFile(_System_hFile[FileNumber],temp,SizeOf (Char),VarPtr(dwAccessBytes),ByVal 0)
                     If Not(dwAccessBytes<>0 And temp[0]=10) Then
                         SetFilePointer(_System_hFile[FileNumber],-1,0,FILE_CURRENT)
@@ -202 +198 @@
                 End If
 
-                buffer.Append(0 As StrChar)
+                buffer.Append(0 As Char)
                 Exit While
             End If
@@ -252 +248 @@
 Function _System_GetUsingFormat(UsingStr As String) As String
     Dim i2 As Long, i3 As Long, i4 As Long, i5 As Long, ParmNum As Long
-    Dim temporary[255] As StrChar
+    Dim temporary[255] As Char
     Dim buffer = New System.Text.StringBuilder(1024)
 
@@ -270 +266 @@
         If UsingStr[i2]=Asc("#") Then
             Dim dec As Long, sign As Long
-            Dim temp2 As *StrChar
+            Dim temp2 As *Char
 
             Dim length_num As Long, length_buf As Long
@@ -325 +321 @@
 
                 If dec > 0 Then
-                    memcpy(VarPtr(buffer.Chars[i3]), temp2, SizeOf (StrChar) * length_num)
+                    memcpy(VarPtr(buffer.Chars[i3]), temp2, SizeOf (Char) * length_num)
                 Else
                     buffer[i3] = &H30
@@ -376 +372 @@
                     ActiveBasic.Strings.Detail.ChrFill(VarPtr(buffer.Chars[i3]), i4, &h20) 'Asc(" ")
                 End If
-                memcpy(VarPtr(buffer.Chars[i3]), _System_UsingStrData[ParmNum], SizeOf (StrChar) * i5)
+                memcpy(VarPtr(buffer.Chars[i3]), _System_UsingStrData[ParmNum], SizeOf (Char) * i5)
                 i3 += i4
             Else
@@ -416 +412 @@
     RecodeNumber--
 
-    SetFilePointer(_System_hFile(FileNumber), SizeOf (StrChar) * RecodeNumber * _System_FieldSize(FileNumber), 0, FILE_BEGIN)
+    SetFilePointer(_System_hFile(FileNumber), SizeOf (Char) * RecodeNumber * _System_FieldSize(FileNumber), 0, FILE_BEGIN)
     Dim t = ZeroString(_System_FieldSize(FileNumber))
-    ReadFile(_System_hFile(FileNumber), StrPtr(t), SizeOf (StrChar) * _System_FieldSize(FileNumber), VarPtr(dwAccessByte), ByVal 0)
+    ReadFile(_System_hFile(FileNumber), StrPtr(t), SizeOf (Char) * _System_FieldSize(FileNumber), VarPtr(dwAccessByte), ByVal 0)
     If dwAccessByte = _System_FieldSize(FileNumber) Then
         buffer = t.ToString
@@ -431 +427 @@
     RecodeNumber--
 
-    SetFilePointer(_System_hFile(FileNumber), SizeOf (StrChar) * RecodeNumber*_System_FieldSize(FileNumber), 0, FILE_BEGIN)
-    WriteFile(_System_hFile(FileNumber), StrPtr(buffer), SizeOf (StrChar) * _System_FieldSize(FileNumber), VarPtr(dwAccessByte), ByVal 0)
+    SetFilePointer(_System_hFile(FileNumber), SizeOf (Char) * RecodeNumber*_System_FieldSize(FileNumber), 0, FILE_BEGIN)
+    WriteFile(_System_hFile(FileNumber), StrPtr(buffer), SizeOf (Char) * _System_FieldSize(FileNumber), VarPtr(dwAccessByte), ByVal 0)
 End Macro
 
@@ -444 +440 @@
     DeleteFile(ToTCStr(path))
 End Macro
-
-
-#endif '_INC_COMMAND

trunk/Include/basic/dos_console.sbp

@@ -30 +30 @@
 
     'データを変数に格納
-    Const comma = &h2c As StrChar 'Asc(",")
+    Const comma = &h2c As Char 'Asc(",")
     Dim broken = ActiveBasic.Strings.Detail.Split(input, comma)
     Dim i As Long

trunk/Include/basic/function.sbp

@@ -1 +1 @@
 'function.sbp
-
-
-#ifndef _INC_FUNCTION
-#define _INC_FUNCTION
-
 
 Const _System_PI = 3.14159265358979323846264
@@ -10 +5 @@
 Const _System_SQRT2 = 1.41421356237309504880168872421
 Const _System_Log_N = 7 As Long
-
-
-#require <Classes/System/Math.ab>
-#require <Classes/System/DateTime.ab>
-#require <Classes/System/Text/StringBuilder.ab>
-#require <Classes/ActiveBasic/Math/Math.ab>
-#require <Classes/ActiveBasic/Strings/Strings.ab>
-
 
 '------------- サポート関数の定義 -------------
@@ -243 +230 @@
 '------------
 
-Function Asc(buf As String) As StrChar
+Function Asc(buf As String) As Char
     Asc = buf[0]
 End Function
 
-Function Chr$(code As StrChar) As String
+Function Chr$(code As Char) As String
     Chr$ = New String(code, 1)
 End Function
 
-#ifndef __STRING_IS_NOT_UNICODE
+#ifdef UNICODE
 Function AscW(s As String) As UCSCHAR
     If String.IsNullOrEmpty(s) Then
@@ -275 +262 @@
 Function ChrW(c As UCSCHAR) As String
     If c <= &hFFFF Then
-        Return New String(c As StrChar, 1)
+        Return New String(c As Char, 1)
     ElseIf c <= &h10FFFF Then
         c -= &h10000
@@ -390 +377 @@
 
 Function Space$(length As Long) As String
-    Return New String(&h20 As StrChar, length)
-End Function
-
-Sub _ecvt_support(buf As *StrChar, count As Long, size As Long)
+    Return New String(&h20 As Char, length)
+End Function
+
+Sub _ecvt_support(buf As *Char, count As Long, size As Long)
     Dim i As Long
     If buf[count] = 9 Then
@@ -410 +397 @@
 End Sub
 
-Sub _ecvt(buffer As *StrChar, value As Double, count As Long, ByRef dec As Long, ByRef sign As Boolean)
+Sub _ecvt(buffer As *Char, value As Double, count As Long, ByRef dec As Long, ByRef sign As Boolean)
     Dim i As Long, i2 As Long
 
     '値が0の場合
     If value = 0 Then
-        ActiveBasic.Strings.ChrFill(buffer, count As SIZE_T, &h30 As StrChar)
+        ActiveBasic.Strings.ChrFill(buffer, count As SIZE_T, &h30 As Char)
         buffer[count] = 0
         dec = 0
@@ -442 +429 @@
 
     For i = 0 To count - 1
-        buffer[i] = Int(value) As StrChar
+        buffer[i] = Int(value) As Char
         value = (value-CDbl(Int(value))) * 10
     Next
@@ -471 +458 @@
     End If
     Dim dec As Long, sign As Boolean
-    Dim buffer[32] As StrChar, temp[15] As StrChar
+    Dim buffer[32] As Char, temp[15] As Char
     Dim i = 0 As Long
 
@@ -585 +572 @@
 End Function
 
-Function String$(n As Long, s As StrChar) As String
+Function String$(n As Long, s As Char) As String
     Return New String(s, n)
 End Function
-        
+
 #ifdef _AB4_COMPATIBILITY_STRING$_
 Function String$(n As Long, s As String) As String
@@ -594 +581 @@
         'Throw ArgumentOutOfRangeException
     End If
-
     Dim buf = New System.Text.StringBuilder(s.Length * n)
     Dim i As Long
-    For i = 0 To n
+    For i = 1 To n
         buf.Append(s)
     Next
@@ -603 +589 @@
 #else
 Function String$(n As Long, s As String) As String
+    Dim c As Char
     If String.IsNullOrEmpty(s) Then
-        Return New String(0 As StrChar, n)
-    Else
-        Return New String(s[0], n)
-    End If
+        c = 0
+    Else
+        c = s[0]
+    End If
+    String$ = New String(c, n)
 End Function
 #endif
@@ -613 +601 @@
 Function Time$() As String
     Dim time = System.DateTime.Now
-
     Dim buf = New System.Text.StringBuilder(8)
-
     'hour
     If time.Hour < 10 Then
@@ -640 +626 @@
 End Function
 
-Function Val(buf As *StrChar) As Double
+Function Val(buf As *Char) As Double
     Dim i As Long, i2 As Long, i3 As Long, i4 As Long
     Dim temporary As String
-    Dim TempPtr As *StrChar
+    Dim TempPtr As *Char
     Dim dbl As Double
     Dim i64data As Int64
@@ -665 +651 @@
                 If Not (0<=i3 And i3<=7) Then Exit While
 
-                TempPtr[i]=i3 As StrChar
+                TempPtr[i]=i3 As Char
                 i++
             Wend
@@ -688 +674 @@
                 End If
 
-                TempPtr[i]=i3 As StrChar
+                TempPtr[i]=i3 As Char
                 i++
             Wend
@@ -703 +689 @@
     Else
         '10進数
-#ifdef __STRING_IS_NOT_UNICODE
+#ifdef UNICODE
+        swscanf(buf,"%lf",VarPtr(Val))
+#else
         sscanf(buf,"%lf",VarPtr(Val))
-#else
-        swscanf(buf,ToWCStr("%lf"),VarPtr(Val))
 #endif
     End If
@@ -981 +967 @@
 
 Function _System_IsLowSurrogate(c As WCHAR) As Boolean
-    Return &hDC00 <= c And c < &hE000 
+    Return &hDC00 <= c And c < &hE000
 End Function
 
@@ -1000 +986 @@
     _System_GetHashFromWordArray = hash As Long
 End Function
-
-#endif '_INC_FUNCTION

trunk/Include/basic/prompt.sbp

@@ -8 +8 @@
 Namespace Prompt
 Namespace Detail
-    
+
 Function _PromptSys_GetTextExtentPoint32(hdc As HDC, psz As PCSTR, cb As Long, ByRef Size As SIZE) As Long
     _PromptSys_GetTextExtentPoint32 = GetTextExtentPoint32A(hdc, psz, cb, Size)
@@ -47 +47 @@
 Type _PromptSys_LineInformation
     Length As Long
-    Text As *StrChar
+    Text As *Char
     CharInfo As *_PromptSys_CharacterInformation
 End Type
@@ -53 +53 @@
 Dim _PromptSys_hFont As HFONT
 Dim _PromptSys_FontSize As SIZE
-Dim _PromptSys_InputStr[255] As StrChar
+Dim _PromptSys_InputStr[255] As Char
 Dim _PromptSys_InputLen = -1 As Long
 Dim _PromptSys_KeyChar As Byte
@@ -97 +97 @@
         Next
         _PromptSys_TextLine[100].Length = 0
-        _PromptSys_TextLine[100].Text = _System_calloc(SizeOf (StrChar) * 255)
+        _PromptSys_TextLine[100].Text = _System_calloc(SizeOf (Char) * 255)
         _PromptSys_TextLine[100].CharInfo = _System_calloc(SizeOf (_PromptSys_CharacterInformation) * 255)
         _PromptSys_CurPos.y--
@@ -136 +136 @@
                 End If
                 With _PromptSys_FontSize
-                    _PromptSys_TextOut(hDC, currentLineCharInfo[i2].StartPos, i * .cy, VarPtr(_PromptSys_TextLine[i].Text[i2]) As *StrChar, tempLen)
+                    _PromptSys_TextOut(hDC, currentLineCharInfo[i2].StartPos, i * .cy, VarPtr(_PromptSys_TextLine[i].Text[i2]) As *Char, tempLen)
                 End With
                 i2 += tempLen
@@ -191 +191 @@
                         EndIf
                         Dim p = buf.StrPtr
-                        _PromptSys_GetTextExtentPoint32(hdc, VarPtr(p[i2]) As *StrChar, charLen, sz)
+                        _PromptSys_GetTextExtentPoint32(hdc, VarPtr(p[i2]) As *Char, charLen, sz)
                         currentLineCharInfo[.x + 1].StartPos = currentLineCharInfo[.x].StartPos + sz.cx
                     End If
@@ -421 +421 @@
         End If
         Dim tempStr = Nothing As String
-        Dim str As *StrChar
-#ifdef __STRING_IS_NOT_UNICODE
-        Dim size = _PromptWnd_GetCompositionStringA(himc, str)
-        tempStr = New String(str, size As Long)
-#else
+        Dim str As *Char
+#ifdef UNICODE
         Dim osver = System.Environment.OSVersion
         With osver
-            ' GetCompositionStringW is not implimented in Windows 95 
+            ' GetCompositionStringW is not implimented in Windows 95
             If .Version.Major = 4 And .Version.Minor = 0 And .Platform = System.PlatformID.Win32Windows Then
                 Dim strA As PCSTR
@@ -438 +435 @@
             End If
         End With
+#else
+        Dim size = _PromptWnd_GetCompositionStringA(himc, str)
+        tempStr = New String(str, size As Long)
 #endif
         ImmReleaseContext(hwnd, himc)
@@ -460 +460 @@
         With _PromptSys_TextLine[i]
             .Length = 0
-            .Text = _System_calloc(SizeOf (StrChar) * 255)
+            .Text = _System_calloc(SizeOf (Char) * 255)
             .CharInfo = _System_calloc(SizeOf (_PromptSys_CharacterInformation) * 255)
         End With
@@ -543 +543 @@
         For i = 0 To 100
             With _PromptSys_TextLine[i]
-                .Text[0] = 0 '_System_FillChar(_PromptSys_TextLine[i].Text, -1 As StrChar, 0)
+                .Text[0] = 0 '_System_FillChar(_PromptSys_TextLine[i].Text, -1 As Char, 0)
                 .Length = 0
             End With
@@ -589 +589 @@
 
     'Set value to variable
-    Const comma = &h2c As StrChar 'Asc(",")
+    Const comma = &h2c As Char 'Asc(",")
     Dim broken = ActiveBasic.Strings.Detail.Split(New String(_PromptSys_InputStr), comma)
     Dim i As Long
@@ -617 +617 @@
     Dim i = _PromptSys_TextLine[y].Length
     If i < x Then
-        ActiveBasic.Strings.ChrFill(VarPtr(_PromptSys_TextLine[y].Text[i]), x - i, &h20 As StrChar) 'Asc(" ")
+        ActiveBasic.Strings.ChrFill(VarPtr(_PromptSys_TextLine[y].Text[i]), x - i, &h20 As Char) 'Asc(" ")
         Dim i2 As Long
         For i2 = i To ELM(x)