Changeset 396 for trunk/Include

Timestamp:

Dec 18, 2007, 2:55:40 AM (17 years ago)

Author:

dai

Message:

Foreachを試験的に実装。
ジェネリクスインターフェイスをサポートした。

Location:

trunk/Include

Files:

• Classes/System/Collections/Generic/List.ab (modified) (3 diffs)
• system/enum.sbp (modified) (2 diffs)

trunk/Include/Classes/System/Collections/Generic/List.ab

@@ -4 +4 @@
 Namespace Generic
 
+Interface IEnumerable<T>
+    ' Method
+    Function GetEnumerator() As IEnumerator<T>
+End Interface
+
+Interface IEnumerator<T>
+    ' Methods
+    Function MoveNext() As Boolean
+    Sub Reset()
+    ' Property
+    Function Current() As T
+End Interface
+
 Class List<T>
-    Implements IEnumerable, IEnumerator
+    Implements IEnumerable<T>, IEnumerator<T>
     items As *T
     size As Long
@@ -138 +151 @@
     @return IEnumeratorインターフェイスが返る
     */
-    Function GetEnumerator() As IEnumerator
+    Function GetEnumerator() As IEnumerator<T>
         Return This
     End Function
@@ -173 +186 @@
     @return カレントオブジェクトが返る
     */
-    Function Current() As Object
+    Function Current() As T
         If currentIndexForEnumerator = -1 Then
             ' MoveNextメソッドがReset後、一度も呼び出されなかった
             Return Nothing
         End If
-        Return items[currentIndexForEnumerator] As Object
+        Return items[currentIndexForEnumerator]
     End Function
 End Class

trunk/Include/system/enum.sbp

@@ -21 +21 @@
     End Sub
 
+    Function Operator() As Int64
+        Return This.value
+    End Function
     Function Operator() As Long
         Return This.value
+    End Function
+    Function Operator() As DWord
+        Return This.value
+    End Function
+    Function Operator() As Boolean
+        Return ( This.value <> 0 )
     End Function
 
@@ -40 +49 @@
         End If
     End Function
-/*
-    Function Operator or (enumBase As EnumBase) As EnumBase
-        Return New EnumBase(This.value Or enumBase.value)
+
+    Function Operator or (enumBase As EnumBase) As Boolean
+        Return ( This.value or enumBase.value ) <> 0
     End Function
 
-    Function Operator and (enumBase As EnumBase) As EnumBase
-        Return New EnumBase(This.value And enumBase.value)
+    Function Operator and (enumBase As EnumBase) As Boolean
+        Return ( This.value and enumBase.value ) <> 0
     End Function
-
+/*
     Function Operator xor (enumBase As EnumBase) As EnumBase
         Return New EnumBase(This.value Xor enumBase.value)