Changeset 560 for trunk/ab5.0/ablib/src/Classes/System/IO

Timestamp:

Jul 21, 2008, 2:34:12 PM (16 years ago)

Author:

dai

Message:

#183への対応。コンストラクタ、デストラクタが直接呼び出された場合はエラーとして扱うようにした。
（64bit版は後ほどコミットします）

Location:

trunk/ab5.0/ablib/src/Classes/System/IO

Files:

• Exception.ab (modified) (4 diffs)
• FileStream.ab (modified) (3 diffs)

trunk/ab5.0/ablib/src/Classes/System/IO/Exception.ab

@@ -25 +25 @@
     */
     Sub IOException()
-        Exception(GetType().FullName, Nothing)
+        SystemException(GetType().FullName)
         HResult = ActiveBasic.AB_E_IO
     End Sub
@@ -33 +33 @@
     */
     Sub IOException(message As String)
-        Exception(message, Nothing)
+        SystemException(message)
         HResult = ActiveBasic.AB_E_IO
     End Sub
@@ -42 +42 @@
     */
     Sub IOException(message As String, innerException As Exception)
-        Exception(message, innerException)
+        SystemException(message, innerException)
         HResult = ActiveBasic.AB_E_IO
     End Sub
@@ -51 +51 @@
     */
     Sub IOException(message As String, hr As HRESULT)
-        Exception(message, Nothing)
+        SystemException(message)
         HResult = hr
     End Sub

trunk/ab5.0/ablib/src/Classes/System/IO/FileStream.ab

@@ -31 +31 @@
     offset As QWord 'オーバーラップドIO用
 
-Public
-    /* コンストラクタ.NETと同じように実装は難しい、一先ず動くものを実装したが変更が必要だと思う */
-    Sub FileStream(path As String, mode As FileMode, access As FileAccess, share As FileShare, options As FileOptions)
+    Sub _Initialize(path As String, mode As FileMode, access As FileAccess, share As FileShare, options As FileOptions)
         If ActiveBasic.IsNothing(path) Then
             Throw New ArgumentNullException("path")
@@ -72 +70 @@
         End If
     End Sub
+
+Public
+    /* コンストラクタ.NETと同じように実装は難しい、一先ず動くものを実装したが変更が必要だと思う */
+    Sub FileStream(path As String, mode As FileMode, access As FileAccess, share As FileShare, options As FileOptions)
+        _Initialize( path, mode, access, share, options )
+    End Sub
     Sub FileStream(path As String, mode As FileMode, access As FileAccess, share As FileShare)
-        This.FileStream(path,mode,access,share,FileOptions.None)
+        _Initialize(path,mode,access,share,FileOptions.None)
     End Sub
     Sub FileStream(path As String, mode As FileMode, access As FileAccess)
-        This.FileStream(path,mode,access,FileShare.None,FileOptions.None)
+        _Initialize(path,mode,access,FileShare.None,FileOptions.None)
     End Sub
     Sub FileStream(path As String, mode As FileMode)
@@ -94 +98 @@
                 access=FileAccess.Write
         End Select
-        This.FileStream(path,mode,access,FileShare.None,FileOptions.None)
+        _Initialize(path,mode,access,FileShare.None,FileOptions.None)
     End Sub
     /*