Changeset 632 in dev for trunk/ab5.0/abdev/ab_common/src/Lexical

Timestamp:

Jun 5, 2008, 10:04:39 PM (16 years ago)

Author:

dai_9181

Message:

ジェネリッククラスの型パラメータに値型が指定されたときに限り、テンプレート展開を行うようにした。

TODO: libファイルを跨ってテンプレート展開ができていないため、ソースコード管理部分に手を加える必要あり。

Location:

trunk/ab5.0/abdev/ab_common/src/Lexical

Files:

• Class.cpp (modified) (1 diff)
• Member.cpp (added)
• Meta.cpp (modified) (1 diff)
• Parameter.cpp (modified) (1 diff)
• Procedure.cpp (modified) (2 diffs)
• Symbol.cpp (modified) (1 diff)
• Template.cpp (added)
• Type.cpp (modified) (2 diffs)
• TypeDef.cpp (modified) (1 diff)

trunk/ab5.0/abdev/ab_common/src/Lexical/Class.cpp

@@ -1 +1 @@
 #include "stdafx.h"
+
+
+CClass::CClass( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const std::string &name )
+    : ClassPrototype( namespaceScopes, name )
+    , importedNamespaces( importedNamespaces )
+    , classType( Class )
+    , pSuperClass( NULL )
+    , blittableType( Type() )
+    , isReady( false )
+    , fixedAlignment( 0 )
+    , ConstructorMemberSubIndex( -1 )
+    , DestructorMemberSubIndex( -1 )
+    , vtblNum( 0 )
+    , vtbl_offset( -1 )
+    , comVtblOffset( 0 )
+    , isCompilingConstructor( false )
+    , isCompilingDestructor( false )
+    , cacheSize( 0 )
+{
+}
+
+CClass::CClass( const NamespaceScopes &namespaceScopes,
+    const NamespaceScopesCollection &importedNamespaces,
+    const std::string &name,
+    ClassType classType,
+    const GenericTypes &formalGenericTypes,
+    const Types &superClassActualTypeParameters,
+    int ConstructorMemberSubIndex,
+    int DestructorMemberSubIndex,
+    int vtblNum,
+    int fixedAlignment )
+    : ClassPrototype( namespaceScopes, name )
+    , importedNamespaces( importedNamespaces )
+    , classType( classType )
+    , formalGenericTypes( formalGenericTypes )
+    , pSuperClass( NULL )
+    , superClassActualTypeParameters( superClassActualTypeParameters )
+    , blittableType( Type() )
+    , isReady( false )
+    , ConstructorMemberSubIndex( ConstructorMemberSubIndex )
+    , DestructorMemberSubIndex( DestructorMemberSubIndex )
+    , vtblNum( vtblNum )
+    , fixedAlignment( fixedAlignment )
+    , vtbl_offset( -1 )
+    , comVtblOffset( 0 )
+    , isCompilingConstructor( false )
+    , isCompilingDestructor( false )
+    , cacheSize( 0 )
+{
+}
+
+CClass::CClass()
+    : ClassPrototype()
+    , importedNamespaces()
+    , classType()
+    , pSuperClass( NULL )
+    , blittableType( Type() )
+    , isReady( false )
+    , fixedAlignment( 0 )
+    , ConstructorMemberSubIndex( -1 )
+    , DestructorMemberSubIndex( -1 )
+    , vtblNum( 0 )
+    , vtbl_offset( -1 )
+    , comVtblOffset( 0 )
+    , isCompilingConstructor( false )
+    , isCompilingDestructor( false )
+    , cacheSize( 0 )
+{
+}
+
+CClass::~CClass()
+{
+    // 動的メンバ
+    BOOST_FOREACH( Member *member, dynamicMembers )
+    {
+        delete member;
+    }
+
+    // 静的メンバ
+    BOOST_FOREACH( Member *member, staticMembers )
+    {
+        delete member;
+    }
+
+    // インターフェイス
+    BOOST_FOREACH( ::Interface *pInterface, interfaces )
+    {
+        delete pInterface;
+    }
+
+    // テンプレート展開済みのクラス
+    BOOST_FOREACH( ExpandedTemplateClass *pExpandedTemplateClass, expandedTemplateClasses )
+    {
+        delete pExpandedTemplateClass;
+    }
+}
 
 void CClass::Using() const

trunk/ab5.0/abdev/ab_common/src/Lexical/Meta.cpp

@@ -186 +186 @@
 
     // TypeDefも見る
-    int index = this->GetTypeDefs().GetIndex( symbol );
-    if( index != -1 ){
-        Type type = this->GetTypeDefs()[index].GetBaseType();
-        if( type.IsObject() ){
+    const TypeDef *pTypeDef = this->GetTypeDefs().Find( symbol );
+    if( pTypeDef )
+    {
+        Type type = pTypeDef->GetBaseType();
+        if( type.IsObject() )
+        {
             return &type.GetClass();
         }

trunk/ab5.0/abdev/ab_common/src/Lexical/Parameter.cpp

@@ -1 +1 @@
 #include "stdafx.h"
+
+Parameter::Parameter( const std::string &varName, const Type &type, bool isRef, const std::string initValue )
+    : Type( type )
+    , varName( varName )
+    , isRef( isRef )
+    , isArray( false )
+    , initValue( initValue )
+{
+}
+
+Parameter::Parameter( const Parameter &param, const Type &type )
+    : Type( type )
+    , varName( param.varName )
+    , isRef( param.isRef )
+    , isArray( param.isArray )
+    , subscripts( param.subscripts )
+    , initValue( param.initValue )
+{
+}
+
+Parameter::Parameter( const Parameter &param )
+    : Type( param )
+    , varName( param.varName )
+    , isRef( param.isRef )
+    , isArray( param.isArray )
+    , subscripts( param.subscripts )
+    , initValue( param.initValue )
+{
+}
+
+Parameter::Parameter()
+{
+}
+
+Parameter::~Parameter()
+{
+}
 
 bool Parameter::Equals( const Parameter &param, bool isContravariant ) const

trunk/ab5.0/abdev/ab_common/src/Lexical/Procedure.cpp

@@ -1 +1 @@
 #include "stdafx.h"
+
+int id_base = 0;
+
+UserProc::UserProc( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const std::string &name, Kind kind, bool isMacro, bool isCdecl, bool isExport )
+    : Procedure( namespaceScopes, name, kind, isCdecl )
+    , importedNamespaces( importedNamespaces )
+    , pParentClass( NULL )
+    , pInterface( NULL )
+    , pMethod( NULL )
+    , isMacro( isMacro )
+    , secondParmNum( 0 )
+    , realSecondParmNum( 1 )
+    , isExport( isExport )
+    , isSystem( false )
+    , isAutoGeneration( false )
+    , isCompiled( false )
+    , beginOpAddress( 0 )
+    , endOpAddress( 0 )
+    , id( id_base ++ )
+{
+}
+
+UserProc::UserProc( const UserProc &userProc, const CClass *pParentClass )
+    : Procedure( userProc )
+    , _paramStr( userProc._paramStr )
+    , importedNamespaces( userProc.importedNamespaces )
+    , pParentClass( pParentClass )
+    , pInterface( NULL )
+    , pMethod( NULL )
+    , isMacro( userProc.isMacro )
+    , secondParmNum( userProc.secondParmNum )
+    , realParams( userProc.realParams )
+    , realSecondParmNum( userProc.realSecondParmNum )
+    , isExport( userProc.isExport )
+    , isSystem( userProc.isSystem )
+    , isAutoGeneration( userProc.isAutoGeneration )
+    , isCompiled( false )
+    , beginOpAddress( 0 )
+    , endOpAddress( 0 )
+    , localVars( Variables() )
+    , id( id_base ++ )
+    , nativeCode( NativeCode() )
+{
+}
+
+UserProc::UserProc()
+{
+}
+
+UserProc::~UserProc()
+{
+    BOOST_FOREACH( Parameter *pParam, realParams ){
+        delete pParam;
+    }
+}
 
 bool UserProc::IsEqualForOverride( const Types &actualTypeParametersForThisProc, const UserProc *pUserProc ) const
@@ -54 +109 @@
 const NamespaceScopes &UserProc::GetNamespaceScopes() const
 {
-    if( HasParentClass() ){
+    if( HasParentClass() )
+    {
         return GetParentClassPtr()->GetNamespaceScopes();
     }

trunk/ab5.0/abdev/ab_common/src/Lexical/Symbol.cpp

@@ -5 +5 @@
 const NamespaceSupporter *Symbol::namespaceSupporter = NULL;
 
-char *calcNames[255] = {
+char *calcNames[256] = {
     "xor",
 };

trunk/ab5.0/abdev/ab_common/src/Lexical/Type.cpp

@@ -384 +384 @@
     return false;
 }
+
+bool Type::IsValueType() const
+{
+    return ( IsWhole() || IsReal() );
+}
+
 bool Type::IsProcPtr() const
 {
@@ -550 +556 @@
 }
 
+bool Types::IsEquals( const Types &types ) const
+{
+    if( this->size() != types.size() )
+    {
+        // アイテム数が違う
+        return false;
+    }
+
+    const Types &thisTypes = *this;
+    for( int i=0; i<static_cast<int>(this->size()); i++ )
+    {
+        if( !thisTypes[i].Equals( types[i] ) )
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
 
 void ResolveFormalGenericTypeParameter( Type &typeParameter, const Type &classType, const UserProc *pUserProc )

trunk/ab5.0/abdev/ab_common/src/Lexical/TypeDef.cpp

@@ -17 +17 @@
 }
 
-int TypeDefCollection::GetIndex( const Symbol &symbol ) const{
-    int max = (int)(*this).size();
-    for( int i=0; i<max; i++ ){
-        if( (*this)[i].IsEqualSymbol( symbol ) ){
-            return i;
+const TypeDef *TypeDefCollection::Find( const Symbol &symbol ) const
+{
+    const TypeDefCollection &typeDefs = *this;
+    BOOST_FOREACH( const TypeDef &typeDef, typeDefs )
+    {
+        if( typeDef.IsEqualSymbol( symbol ) )
+        {
+            return &typeDef;
         }
     }
-    return -1;
+    return NULL;
 }