Changeset 475 for trunk/Include/system

Timestamp:

Mar 13, 2008, 9:44:51 AM (17 years ago)

Author:

dai

Message:

・XmlSerializer.Deserializeメソッドを実装（仮実装なため、数値メンバのシリアライズのみに留まっている）。
・XmlNode.LastChildメソッドを追加。
・XmlNode.NextSiblingメソッドを追加。
・XmlNode.PreviouseSiblingメソッドを追加。

File:

• trunk/Include/system/enum.sbp (modified) (3 diffs)

trunk/Include/system/enum.sbp

@@ -1 @@
-Class EnumBase
+Class EnumBase<T As EnumBase>
 Protected
     value As Long
@@ -40 +40 @@
 
     Function Operator == (value As Long) As Boolean
-        If This.value = value Then
-            Return True
-        Else
-            Return False
-        End If
+        Return ( This.value = value )
     End Function
 
-    Function Operator == (enumBase As EnumBase) As Boolean
-        If This.value = enumBase.value Then
-            Return True
-        Else
-            Return False
-        End If
+    Function Operator == (enumObj As T) As Boolean
+        Return ( This.value = enumObj.value )
     End Function
 
@@ -59 +51 @@
     End Function
 
-    Function Operator <> (enumBase As EnumBase) As Boolean
-        Return Not( This = enumBase)
+    Function Operator <> (enumObj As T) As Boolean
+        Return Not( This = enumObj)
     End Function
 
-    Function Operator or (enumBase As EnumBase) As Boolean
-        Return ( This.value or enumBase.value ) <> 0
+    Function Operator or (enumObj As T) As Boolean
+        Return ( This.value or enumObj.value ) <> 0
     End Function
 
-    Function Operator and (enumBase As EnumBase) As Boolean
-        Return ( This.value and enumBase.value ) <> 0
+    Function Operator and (enumObj As T) As Boolean
+        Return ( This.value and enumObj.value ) <> 0
     End Function
 
-    Function Operator or (enumBase As EnumBase) As EnumBase
-        Return New EnumBase( This.value or enumBase.value, This.lpszName )
+    Function Operator or (enumObj As T) As T
+        Return New EnumBase( This.value or enumObj.value, This.lpszName )
     End Function
 
-    Function Operator and (enumBase As EnumBase) As EnumBase
-        Return New EnumBase( This.value and enumBase.value, This.lpszName )
+    Function Operator and (enumObj As T) As T
+        Return New EnumBase( This.value and enumObj.value, This.lpszName )
     End Function
 /*