Changeset 198

Timestamp:

Apr 1, 2007, 2:27:00 AM (18 years ago)

Author:

dai

Message:

TypeInfoの修正。

File:

• Include/Classes/System/TypeInfo.ab (modified) (6 diffs)

Include/Classes/System/TypeInfo.ab

@@ -42 +42 @@
     Inherits TypeInfo
 
+    strNamespace As String
     name As String
-    strNamespace As String
 
     baseType As TypeInfo
@@ -51 +51 @@
 
     Sub TypeBaseImpl()
+        strNamespace = ""
         name = ""
-        strNamespace = ""
         baseType = Nothing
     End Sub
 
-    Sub TypeBaseImpl( name As String, strNamespace As String )
+    Sub TypeBaseImpl( strNamespace As String, name As String )
+        This.strNamespace = strNamespace
         This.name = name
+        This.baseType = Nothing
+    End Sub
+
+    Sub TypeBaseImpl( strNamespace As String, name As String, baseType As TypeInfo )
         This.strNamespace = strNamespace
-        This.baseType = Nothing
-    End Sub
-
-    Sub TypeBaseImpl( name As String, strNamespace As String, baseType As TypeInfo )
         This.name = name
+        This.baseType = baseType
+    End Sub
+
+    /*
+    Sub TypeBaseImpl( strNamespace As String, name As String, baseType As Type, interfaces As ... )
         This.strNamespace = strNamespace
+        This.name = name
         This.baseType = baseType
-    End Sub
-
-    /*
-    Sub TypeBaseImpl( name As String, strNamespace As String, baseType As Type, interfaces As ... )
-        TypeBaseImpl( name, strNamespace, baseType )
+        This.interfaces = interfaces
     End Sub
     */
@@ -139 +142 @@
 Public
     Sub _System_TypeForValueType( name As String )
-        TypeInfo( name, "" )
+        TypeInfo( "", name )
     End Sub
 
@@ -151 +154 @@
     Inherits TypeBaseImpl
 Public
-    Sub _System_TypeForClass( name As String, strNamespace As String, baseType As TypeInfo )
-        TypeBaseImpl( name, strNamespace, baseType )
+    Sub _System_TypeForClass( strNamespace As String, name As String, baseType As TypeInfo )
+        TypeBaseImpl( strNamespace, name, baseType )
     End Sub
     Sub ~_System_TypeForClass()
@@ -159 +162 @@
         Return True
     End Function
+
+    Sub SetBaseType( baseType As TypeInfo )
+        This.baseType = baseType
+    End Sub
 End Class
 
@@ -232 +239 @@
         ' このメソッドの実装はコンパイラが自動生成する
 
+#generate InitializeUserTypes
+
         '例:
-        'obj.Add( New _System_TypeForClass( "String", "", obj.Search( "Object" ) ) )
+        'obj.Add( New _System_TypeForClass( "System", "String" ) )
+        'obj.Search( "String" ).SetBaseType( Search( "Object" ) )
     End Sub