Ignore:
Timestamp:
Mar 28, 2008, 5:43:34 PM (16 years ago)
Author:
イグトランス (egtra)
Message:

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

Location:
trunk/Include/Classes/System/IO
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Include/Classes/System/IO/Path.ab

    r469 r497  
    1010Class Path
    1111Public
    12     Static Const AltDirectorySeparatorChar = &H2F As StrChar '/
    13     Static Const DirectorySeparatorChar    = &H5C As StrChar '\
    14     Static Const PathSeparator             = &H3B As StrChar ';
    15     Static Const VolumeSeparatorChar       = &H3A As StrChar ':
     12    Static Const AltDirectorySeparatorChar = &H2F As Char '/
     13    Static Const DirectorySeparatorChar    = &H5C As Char '\
     14    Static Const PathSeparator             = &H3B As Char ';
     15    Static Const VolumeSeparatorChar       = &H3A As Char ':
    1616
    1717    '----------------------------------------------------------------
    … …  
    135135        If IsPathRooted(path) Then
    136136            If path.Contains(UniformNamingConventionString) Then
    137                 Return path.Remove(path.IndexOf(DirectorySeparatorChar, 
     137                Return path.Remove(path.IndexOf(DirectorySeparatorChar,
    138138                                                      UniformNamingConventionString.Length) + 1)
    139139            Else
    … …  
    214214
    215215Private
    216     Static Const ExtensionSeparatorChar = &H2E As StrChar
     216    Static Const ExtensionSeparatorChar = &H2E As Char
    217217    Static Const InvalidPathChars = Ex"\q<>|\0\t" As String
    218218    Static Const UniformNamingConventionString = "\\" As String
    … …  
    258258    */
    259259    Static Function GetLastSeparatorIndex(path As String) As Long
    260         Return System.Math.Max(path.LastIndexOf(DirectorySeparatorChar), 
     260        Return System.Math.Max(path.LastIndexOf(DirectorySeparatorChar),
    261261                               path.LastIndexOf(AltDirectorySeparatorChar)) As Long
    262262    End Function

  • trunk/Include/Classes/System/IO/StreamReader.ab

    r435 r497  
    9393    @auther Egtra
    9494    */
    95     Override Function ReadImpl(buffer As *StrChar, index As Long, count As Long) As Long
     95    Override Function ReadImpl(buffer As *Char, index As Long, count As Long) As Long
    9696        Dim n = last - cur
    9797        If count <= n Then
    … …  
    143143    文字数が足りなくても、元のストリームまで読みには行かない。
    144144    */
    145     Function ReadFromBuffer(p As *StrChar, index As Long, count As Long) As Long
    146         memcpy(VarPtr(p[index]), VarPtr(buf[cur]), count * SizeOf (StrChar))
     145    Function ReadFromBuffer(p As *Char, index As Long, count As Long) As Long
     146        memcpy(VarPtr(p[index]), VarPtr(buf[cur]), count * SizeOf (Char))
    147147        cur += count
    148148        ReadFromBuffer = count

  • trunk/Include/Classes/System/IO/StringReader.ab

    r432 r497  
    7575    @auther Egtra
    7676    */
    77     Override Function ReadImpl(buffer As *StrChar, index As Long, count As Long) As Long
     77    Override Function ReadImpl(buffer As *Char, index As Long, count As Long) As Long
    7878        ReadImpl = Math.Min(count, s.Length - i)
    79         ActiveBasic.Strings.ChrCopy(VarPtr(buffer[index]) As *StrChar, (StrPtr(s) + i * SizeOf (StrChar)) As *StrChar, ReadImpl As SIZE_T) 'ToDo: ポインタに対する+演算
     79        ActiveBasic.Strings.ChrCopy(VarPtr(buffer[index]) As *Char, (StrPtr(s) + i * SizeOf (Char)) As *Char, ReadImpl As SIZE_T) 'ToDo: ポインタに対する+演算
    8080    End Function
    8181

  • trunk/Include/Classes/System/IO/TextReader.ab

    r473 r497  
    3131    @auther Egtra
    3232    */
    33     Function Read(buffer As *StrChar, index As Long, count As Long) As Long
     33    Function Read(buffer As *Char, index As Long, count As Long) As Long
    3434        If buffer = 0 Then
    3535        ElseIf index < 0 Then
    … …  
    7676'                   Exit Do
    7777            End Select
    78             sb.Append(ch As StrChar) 'ToDo キャスト不要にすべきというチケットを書くこと
     78            sb.Append(ch As Char) 'ToDo キャスト不要にすべきというチケットを書くこと
    7979        Loop
    8080        ReadLine = sb.ToString
    … …  
    9393                Exit Function
    9494            End If
    95             sb.Append(ch As StrChar)
     95            sb.Append(ch As Char)
    9696        Loop
    9797    End Function
    … …  
    109109    @auther Egtra
    110110    */
    111     Virtual Function ReadImpl(buffer As *StrChar, index As Long, count As Long) As Long
     111    Virtual Function ReadImpl(buffer As *Char, index As Long, count As Long) As Long
    112112        Dim i As Long
    113113        Dim p = VarPtr(buffer[index])
    … …  
    118118                Exit Function
    119119            Else
    120                 p[i] = c As StrChar
     120                p[i] = c As Char
    121121            End If
    122122        Next
    … …  
    171171    End Sub
    172172
    173     Override Function ReadImpl(buffer As *StrChar, index As Long, count As Long) As Long
     173    Override Function ReadImpl(buffer As *Char, index As Long, count As Long) As Long
    174174'       Using lock = cs.Lock
    175175            ReadImpl = base.ReadImpl(buffer, index, count)
Note: See TracChangeset for help on using the changeset viewer.