Changeset 635 in dev for trunk/ab5.0

Timestamp:

Jun 7, 2008, 10:57:53 AM (16 years ago)

Author:

dai_9181

Message:

リファクタリング（ヒープ制御をstlに置き換え）

Location:

trunk/ab5.0/abdev/ab_common/src

Files:

• Lexical/Source.cpp (modified) (5 diffs)
• ResourceManager/ResourceManager.cpp (modified) (1 diff)

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

@@ -23 +23 @@
 //////////////////////////////////////
 class CRequireFiles{
-    char **ppFilePath;
-    int count;
+    Jenga::Common::Strings filepaths;
 public:
-    CRequireFiles(){
-        ppFilePath = (char **)malloc( 1 );
-        count = 0;
-    }
-    ~CRequireFiles(){
-        for( int i = 0; i < count; i++ ){
-            free( ppFilePath[i] );
-        }
-        free( ppFilePath );
-    }
+
     void clear(){
-        for( int i = 0; i < count; i++ ){
-            free( ppFilePath[i] );
-        }
-        free( ppFilePath );
-
-        ppFilePath = (char **)malloc( 1 );
-        count = 0;
+        filepaths.clear();
     }
     bool IsIncluded( const char *includeFilePath ){
@@ -55 +39 @@
         }
 
-        for( int i=0; i<count; i++ ){
-            if( lstrcmpi( ppFilePath[i], tempPath ) == 0 ){
+        BOOST_FOREACH( const std::string &filepath, filepaths )
+        {
+            if( lstrcmpi( filepath.c_str(), tempPath ) == 0 )
+            {
                 return true;
             }
@@ -76 +62 @@
 
         //追加
-        ppFilePath = (char **)realloc(ppFilePath, ( count + 1 ) * sizeof(char *) );
-        ppFilePath[count] = (char *)malloc( lstrlen(tempPath) + 1 );
-        lstrcpy( ppFilePath[count], tempPath );
-        count++;
+        filepaths.push_back( tempPath );
     }
 };
@@ -116 +99 @@
     add(temporary);
 }
-BOOL CDefine::add(char *name){
-    extern HANDLE hHeap;
-
+BOOL CDefine::add(char *name)
+{
     //重複チェック
     if(check(name)) return 0;
@@ -535 +517 @@
 }
 
-void BasicSource::DirectiveIncludeOrRequire( const std::string &mainSourceFilePath, const std::string &includeDirPath ){
-    extern HANDLE hHeap;
+void BasicSource::DirectiveIncludeOrRequire( const std::string &mainSourceFilePath, const std::string &includeDirPath )
+{
     int i,i2,i3,sw1,LineNum,FileLayer[255],layer,LastFileByte[255];
     char temporary[MAX_PATH],temp2[MAX_PATH+255],*LayerDir[255];

trunk/ab5.0/abdev/ab_common/src/ResourceManager/ResourceManager.cpp

@@ -28 +28 @@
     }
     i2=GetFileSize(hFile,NULL);
-    extern HANDLE hHeap;
     char *_buf = (char *)malloc(i2+i2);
     ReadFile(hFile,_buf,i2,(DWORD *)&i3,NULL);