Changeset 209 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Jul 13, 2007, 4:22:02 AM (17 years ago)

Author:

dai_9181

Message:

DllProcsクラスを追加。

Location:

trunk/abdev/BasicCompiler_Common

Files:

• BasicCompiler.h (modified) (1 diff)
• MakeExe.cpp (modified) (1 diff)
• Subroutine.cpp (modified) (4 diffs)
• common.h (modified) (3 diffs)
• hash.cpp (modified) (1 diff)
• include/MetaImpl.h (modified) (3 diffs)
• include/Procedure.h (modified) (5 diffs)
• src/Procedure.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/BasicCompiler.h

@@ -23 +23 @@
 DWORD ImageBase;
 INCLUDEFILEINFO IncludeFileInfo;
-DllProc **ppDeclareHash;
 
 ERRORINFO *pErrorInfo;

trunk/abdev/BasicCompiler_Common/MakeExe.cpp

@@ -164 +164 @@
     extern LINEINFO *pLineInfo;
     HeapDefaultFree(pLineInfo);
-
-    //Declare（DLL関数）情報のメモリ解放
-    DeleteDeclareInfo();
 
     //コンパイルダイアログのプログレスバーを上げる

trunk/abdev/BasicCompiler_Common/Subroutine.cpp

@@ -277 +277 @@
 }
 
-
-void AddDeclareData(const NamespaceScopes &namespaceScopes, char *buffer,int nowLine){
-    extern HANDLE hHeap;
-    int i2;
-
-    int i=0;
-
-    //Sub/Function
-    Procedure::Kind kind = Procedure::Sub;
-    if(buffer[i]==ESC_SUB){
-    }
-    else if(buffer[i]==ESC_FUNCTION){
-        kind = Procedure::Function;
-    }
-    else{
-        SetError(1,NULL,nowLine);
-        return;
-    }
-    i++;
-
-    //プロシージャ名
-    char procName[VN_SIZE];
-    bool isCdecl = false;
-    for(i2=0;;i++,i2++){
-        if(buffer[i]==1&&buffer[i+1]==ESC_CDECL){
-            isCdecl = true;
-
-            i+=2;
-            procName[i2]=0;
-            break;
-        }
-        if(buffer[i]==','){
-            procName[i2]=0;
-            break;
-        }
-        if(buffer[i]=='\0'){
-            SetError(1,NULL,nowLine);
-            return;
-        }
-        procName[i2]=buffer[i];
-    }
-    i++;
-
-    //ユーザー定義関数との重複チェック
-    if(GetSubHash(procName)){
-        SetError(15,procName,nowLine);
-        return;
-    }
-
-
-    //ライブラリ
-    char dllFileName[MAX_PATH];
-    i = GetOneParameter( buffer, i, dllFileName );
-    Type resultType;
-    _int64 i64data;
-    if( !StaticCalculation( true, dllFileName, 0, &i64data, resultType ) ){
-        return;
-    }
-    if( resultType.GetBasicType() != typeOfPtrChar ){
-        SetError(1,NULL,nowLine);
-        return;
-    }
-    lstrcpy( dllFileName, (char *)i64data );
-    CharUpper(dllFileName);
-    if(!strstr(dllFileName,".")){
-        lstrcat(dllFileName,".DLL");
-        if(lstrlen(dllFileName)>=16){
-            SetError(7,NULL,nowLine);
-            return;
-        }
-    }
-
-    //エイリアス
-    char alias[VN_SIZE];
-    i = GetOneParameter( buffer, i, alias );
-    if( alias[0] ){
-        if( !StaticCalculation( true, alias, 0, &i64data, resultType ) ){
-            return;
-        }
-        if( resultType.GetBasicType() != typeOfPtrChar ){
-            SetError(1,NULL,nowLine);
-            return;
-        }
-        lstrcpy( alias, (char *)i64data );
-    }
-    else{
-        //省略されたときは関数名
-        lstrcpy( alias, procName );
-    }
-
-
-    // オブジェクトを生成
-    DllProc *pDllProc = new DllProc( namespaceScopes, procName, kind, isCdecl, dllFileName, alias );
-
-    // パラメータを解析
-    // ※第1パラメータにに指定するデータの例："( s As String ) As String"
-    pDllProc->SetParamsAndReturnType( buffer + i, nowLine );
-
-    // パラメータのエラーチェック
-    BOOST_FOREACH( const Parameter *pParam, pDllProc->Params() ){
-        if( pParam->IsObject() ){
-            SetError(25,pParam->GetVarName(),nowLine);
-        }
-        if( !pParam->IsRef() ){
-            if( pParam->IsStruct() ){
-                SetError(28,pParam->GetVarName(),nowLine);
-            }
-        }
-    }
-
-    //戻り値のエラーチェック
-    if( pDllProc->IsFunction() ){
-        // Function定義
-
-        if( pDllProc->ReturnType().IsObject() ){
-            // DLL関数ではオブジェクトを戻り値にできない
-            SetError(40,pDllProc->GetName(),nowLine);
-        }
-    }
-
-
-    /////////////////////////////////
-    // 格納位置を計算してppDeclareHashにセット
-    /////////////////////////////////
-
-    //ハッシュ値を取得
-    int key;
-    key=hash_default(procName);
-
-    extern DllProc **ppDeclareHash;
-    if(ppDeclareHash[key]){
-        DllProc *pTempProc = ppDeclareHash[key];
-        while(1){
-            if( pTempProc->IsEqualSymbol( pDllProc->GetNamespaceScopes(), pDllProc->GetName() ) ){
-                //重複エラー
-                SetError(15,procName,nowLine);
-                return;
-            }
-
-            if(pTempProc->pNextData==0){
-                pTempProc->pNextData=pDllProc;
-                break;
-            }
-            pTempProc=pTempProc->pNextData;
-        }
-        pTempProc=pTempProc->pNextData;
-    }
-    else{
-        ppDeclareHash[key]=pDllProc;
-    }
-}
-
-void UserProcs::CollectUserProcs( const BasicSource &source, UserProcs &userProcs )
+void CollectProcedures( const BasicSource &source, UserProcs &userProcs, DllProcs &dllProcs )
 {
     extern HANDLE hHeap;
@@ -435 +283 @@
     char temporary[8192];
 
-    //Declare（DLL関数）情報を初期化
-    extern DllProc **ppDeclareHash;
-    ppDeclareHash=(DllProc **)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,MAX_HASH*sizeof(DllProc *));
-
     //サブルーチン（ユーザー定義）情報を初期化
     userProcs.Clear();
+
+    //Declare（DLL関数）情報を初期化
+    dllProcs.Clear();
 
     // 名前空間管理
@@ -522 +369 @@
                 if(source[i]=='\0') break;
             }
-            AddDeclareData(namespaceScopes,temporary,i);
+            dllProcs.Add(namespaceScopes,temporary,i);
 
             continue;
@@ -600 +447 @@
     delete pDllProc;
 }
-void DeleteDeclareInfo(void){
-    //DLL情報を解放
-    extern DllProc **ppDeclareHash;
-    int i;
-    for(i=0;i<MAX_HASH;i++){
-        if(!ppDeclareHash[i]) continue;
-
-        Delete_di(ppDeclareHash[i]);
-    }
-    HeapDefaultFree(ppDeclareHash);
-}
 
 bool IsNeedProcCompile(){

trunk/abdev/BasicCompiler_Common/common.h

@@ -232 +232 @@
 //hash.cpp
 int hash_default(const char *name);
-DllProc *GetDeclareHash(char *name);
+DllProc *GetDeclareHash(const char *name);
 void GetOverloadSubHash( const char *lpszName, std::vector<const UserProc *> &subs );
 const UserProc *GetSubHash(const char *name,BOOL bError=0);
@@ -278 +278 @@
 //MakeExe.cpp
 void StepCompileProgress(void);
-void DeleteDeclareInfo(void);
 void AddSourceCode(char *buffer);
 void OutputExe(void);
@@ -364 +363 @@
 bool GetReturnTypeOfPropertyMethod( const char *variable, const char *rightSide, Type &resultType );
 bool GetReturnTypeOfIndexerGetterProc( const CClass &objClass, Type &resultType );
-void DeleteDeclareInfo(void);
 int AddProcPtrInfo( const string &typeExpression, int nowLine );
 bool IsNeedProcCompile();

trunk/abdev/BasicCompiler_Common/hash.cpp

@@ -23 +23 @@
 }
 
-DllProc *GetDeclareHash(char *fullName){
-    char ObjName[VN_SIZE];      //オブジェクト変数
-    char NestMember[VN_SIZE];   //入れ子メンバ
-    bool isObjectMember = SplitMemberName( fullName, ObjName, NestMember );
+DllProc *GetDeclareHash(const char *fullName){
+    char namespaceStr[VN_SIZE];     //オブジェクト変数
+    char simpleName[VN_SIZE];   //入れ子メンバ
+    bool isObjectMember = SplitMemberName( fullName, namespaceStr, simpleName );
 
-    //ハッシュ値を取得
-    int key;
-    key=hash_default(NestMember);
+    ///////////////////////////
+    // グローバル関数を検索
+    ///////////////////////////
 
-    //格納位置を取得
-    extern DllProc **ppDeclareHash;
-    DllProc *pDllProc;
-    pDllProc=ppDeclareHash[key];
+    // ハッシュ値を取得
+    DllProc *pDllProc = compiler.GetMeta().GetDllProcs().GetHashArrayElement( simpleName );
     while(pDllProc){
-        // TODO: Declare名前空間対応
         if( pDllProc->IsEqualSymbol( fullName ) ){
-            break;
+            return pDllProc;
         }
 
-        pDllProc=pDllProc->pNextData;
+        pDllProc=pDllProc->GetChainNext();
     }
 
-    return pDllProc;
+    return NULL;
 }
 

trunk/abdev/BasicCompiler_Common/include/MetaImpl.h

@@ -18 +18 @@
     // 関数・メソッド
     UserProcs userProcs;
+
+    // DLL関数
+    DllProcs dllProcs;
 
     // クラス
@@ -53 +56 @@
         ar & BOOST_SERIALIZATION_NVP( namespaceScopesCollection );
         ar & BOOST_SERIALIZATION_NVP( userProcs );
+        ar & BOOST_SERIALIZATION_NVP( dllProcs );
         ar & BOOST_SERIALIZATION_NVP( classesImpl );
         ar & BOOST_SERIALIZATION_NVP( globalVars );
@@ -87 +91 @@
     {
         return userProcs;
+    }
+
+    const DllProcs &GetDllProcs() const
+    {
+        return dllProcs;
+    }
+    DllProcs &GetDllProcs()
+    {
+        return dllProcs;
     }
 

trunk/abdev/BasicCompiler_Common/include/Procedure.h

@@ -205 +205 @@
     }
 
-    bool IsMacro() const
-    {
-        return isMacro;
-    }
-
-    int GetSecondParmNum() const
-    {
-        return secondParmNum;
-    }
-    const Parameters &RealParams() const
-    {
-        return realParams;
-    }
-    int GetRealSecondParmNum() const
-    {
-        return realSecondParmNum;
-    }
-
-    void ExportOff(){
-        isExport = false;
-    }
-    bool IsExport() const
-    {
-        return isExport;
-    }
-    void ThisIsSystemProc() const
-    {
-        isSystem = true;
-    }
-    bool IsSystem() const
-    {
-        return isSystem;
-    }
-    void ThisIsAutoGenerationProc() const
-    {
-        isAutoGeneration = true;
-    }
-    bool IsAutoGeneration() const
-    {
-        return isAutoGeneration;
-    }
-    void CompleteCompile() const
-    {
-        isCompiled = true;
-    }
-    void KillCompileStatus() const
-    {
-        isCompiled = false;
-    }
-    bool IsCompiled() const
-    {
-        return isCompiled;
-    }
-    bool IsDestructor() const
-    {
-        return ( GetName()[0] == '~' );
-    }
-
-    // バイナリコード位置とサイズ
-    DWORD GetBeginOpAddress() const
-    {
-        return beginOpAddress;
-    }
-    void SetBeginOpAddress( DWORD beginOpAddress ) const
-    {
-        this->beginOpAddress = beginOpAddress;
-    }
-    DWORD GetEndOpAddress() const
-    {
-        return endOpAddress;
-    }
-    void SetEndOpAddress( DWORD endOpAddress ) const
-    {
-        this->endOpAddress = endOpAddress;
-    }
-    int GetCodeSize() const
-    {
-        return endOpAddress - beginOpAddress;
-    }
-
-    virtual const NamespaceScopes &GetNamespaceScopes() const;
-    const NamespaceScopesCollection &GetImportedNamespaces() const;
-
-    Variables &GetLocalVars() const
-    {
-        return localVars;
-    }
-
-    int GetId() const
-    {
-        return id;
-    }
-
-    std::string GetFullName() const;
-
     virtual bool IsDuplication( const UserProc *pUserProc ) const
     {
@@ -311 +216 @@
     }
 
+    bool IsMacro() const
+    {
+        return isMacro;
+    }
+
+    int GetSecondParmNum() const
+    {
+        return secondParmNum;
+    }
+    const Parameters &RealParams() const
+    {
+        return realParams;
+    }
+    int GetRealSecondParmNum() const
+    {
+        return realSecondParmNum;
+    }
+
+    void ExportOff(){
+        isExport = false;
+    }
+    bool IsExport() const
+    {
+        return isExport;
+    }
+    void ThisIsSystemProc() const
+    {
+        isSystem = true;
+    }
+    bool IsSystem() const
+    {
+        return isSystem;
+    }
+    void ThisIsAutoGenerationProc() const
+    {
+        isAutoGeneration = true;
+    }
+    bool IsAutoGeneration() const
+    {
+        return isAutoGeneration;
+    }
+    void CompleteCompile() const
+    {
+        isCompiled = true;
+    }
+    void KillCompileStatus() const
+    {
+        isCompiled = false;
+    }
+    bool IsCompiled() const
+    {
+        return isCompiled;
+    }
+    bool IsDestructor() const
+    {
+        return ( GetName()[0] == '~' );
+    }
+
+    // バイナリコード位置とサイズ
+    DWORD GetBeginOpAddress() const
+    {
+        return beginOpAddress;
+    }
+    void SetBeginOpAddress( DWORD beginOpAddress ) const
+    {
+        this->beginOpAddress = beginOpAddress;
+    }
+    DWORD GetEndOpAddress() const
+    {
+        return endOpAddress;
+    }
+    void SetEndOpAddress( DWORD endOpAddress ) const
+    {
+        this->endOpAddress = endOpAddress;
+    }
+    int GetCodeSize() const
+    {
+        return endOpAddress - beginOpAddress;
+    }
+
+    virtual const NamespaceScopes &GetNamespaceScopes() const;
+    const NamespaceScopesCollection &GetImportedNamespaces() const;
+
+    Variables &GetLocalVars() const
+    {
+        return localVars;
+    }
+
+    int GetId() const
+    {
+        return id;
+    }
+
+    std::string GetFullName() const;
+
     bool IsVirtual() const;
 
@@ -393 +393 @@
 
     void EnumGlobalProcs( const char *simpleName, const char *localName, std::vector<const UserProc *> &subs );
-
-    static void CollectUserProcs( const BasicSource &source, UserProcs &userProcs );
-};
-
-class DllProc : public Procedure
+};
+
+class DllProc : public Procedure, public Jenga::Common::ObjectInHashmap<DllProc>
 {
     string dllFileName;
@@ -428 +426 @@
     {
     }
-    ~DllProc(){}
+    ~DllProc()
+    {
+    }
+
+    virtual const std::string &GetKeyName() const
+    {
+        return GetName();
+    }
+
+    virtual bool IsDuplication( const DllProc *pDllProc ) const
+    {
+        if( pDllProc->IsEqualSymbol( *this )
+            && this->Params().Equals( pDllProc->Params() ) )
+        {
+            return true;
+        }
+        return false;
+    }
 
     const string &GetDllFileName() const
@@ -449 +464 @@
     bool SetParamsAndReturnType( const char *sourceOfParams, int nowLine );
 };
+class DllProcs : public Jenga::Common::Hashmap<DllProc>
+{
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - DllProcs" );
+
+        ar & boost::serialization::make_nvp("Hashmap_DllProc",
+            boost::serialization::base_object<Jenga::Common::Hashmap<DllProc>>(*this));
+    }
+
+public:
+    void Add(const NamespaceScopes &namespaceScopes, char *buffer,int nowLine);
+};
+
+void CollectProcedures( const BasicSource &source, UserProcs &userProcs, DllProcs &dllProcs );
 
 class ProcPointer : public Procedure

trunk/abdev/BasicCompiler_Common/src/Procedure.cpp

@@ -759 +759 @@
 }
 
+void DllProcs::Add(const NamespaceScopes &namespaceScopes, char *buffer,int nowLine){
+    int i2;
+
+    int i=0;
+
+    //Sub/Function
+    Procedure::Kind kind = Procedure::Sub;
+    if(buffer[i]==ESC_SUB){
+    }
+    else if(buffer[i]==ESC_FUNCTION){
+        kind = Procedure::Function;
+    }
+    else{
+        SetError(1,NULL,nowLine);
+        return;
+    }
+    i++;
+
+    //プロシージャ名
+    char procName[VN_SIZE];
+    bool isCdecl = false;
+    for(i2=0;;i++,i2++){
+        if(buffer[i]==1&&buffer[i+1]==ESC_CDECL){
+            isCdecl = true;
+
+            i+=2;
+            procName[i2]=0;
+            break;
+        }
+        if(buffer[i]==','){
+            procName[i2]=0;
+            break;
+        }
+        if(buffer[i]=='\0'){
+            SetError(1,NULL,nowLine);
+            return;
+        }
+        procName[i2]=buffer[i];
+    }
+    i++;
+
+    //ユーザー定義関数との重複チェック
+    if(GetSubHash(procName)){
+        SetError(15,procName,nowLine);
+        return;
+    }
+
+
+    //ライブラリ
+    char dllFileName[MAX_PATH];
+    i = GetOneParameter( buffer, i, dllFileName );
+    Type resultType;
+    _int64 i64data;
+    if( !StaticCalculation( true, dllFileName, 0, &i64data, resultType ) ){
+        return;
+    }
+    if( resultType.GetBasicType() != typeOfPtrChar ){
+        SetError(1,NULL,nowLine);
+        return;
+    }
+    lstrcpy( dllFileName, (char *)i64data );
+    CharUpper(dllFileName);
+    if(!strstr(dllFileName,".")){
+        lstrcat(dllFileName,".DLL");
+        if(lstrlen(dllFileName)>=16){
+            SetError(7,NULL,nowLine);
+            return;
+        }
+    }
+
+    //エイリアス
+    char alias[VN_SIZE];
+    i = GetOneParameter( buffer, i, alias );
+    if( alias[0] ){
+        if( !StaticCalculation( true, alias, 0, &i64data, resultType ) ){
+            return;
+        }
+        if( resultType.GetBasicType() != typeOfPtrChar ){
+            SetError(1,NULL,nowLine);
+            return;
+        }
+        lstrcpy( alias, (char *)i64data );
+    }
+    else{
+        //省略されたときは関数名
+        lstrcpy( alias, procName );
+    }
+
+
+    // オブジェクトを生成
+    DllProc *pDllProc = new DllProc( namespaceScopes, procName, kind, isCdecl, dllFileName, alias );
+
+    // パラメータを解析
+    // ※第1パラメータにに指定するデータの例："( s As String ) As String"
+    pDllProc->SetParamsAndReturnType( buffer + i, nowLine );
+
+    // パラメータのエラーチェック
+    BOOST_FOREACH( const Parameter *pParam, pDllProc->Params() ){
+        if( pParam->IsObject() ){
+            SetError(25,pParam->GetVarName(),nowLine);
+        }
+        if( !pParam->IsRef() ){
+            if( pParam->IsStruct() ){
+                SetError(28,pParam->GetVarName(),nowLine);
+            }
+        }
+    }
+
+    //戻り値のエラーチェック
+    if( pDllProc->IsFunction() ){
+        // Function定義
+
+        if( pDllProc->ReturnType().IsObject() ){
+            // DLL関数ではオブジェクトを戻り値にできない
+            SetError(40,pDllProc->GetName(),nowLine);
+        }
+    }
+
+    // ハッシュマップに追加
+    this->Put( pDllProc );
+}
+
 bool ProcPointer::SetParamsAndReturnType( const char *sourceOfParams, int nowLine ){
     int i = 0;