Changeset 69 in dev for BasicCompiler_Common/preprocessor.cpp

Timestamp:

Mar 13, 2007, 4:52:59 AM (18 years ago)

Author:

dai_9181

Message:

一時文字列をNewしたときに、bUseHeapフラグを立たせないようにした（bUseHeapが立つのは一時構造体のときのみ）。
DEF_PTR_CHARを廃止し、typeOfPtrCharを導入。

File:

• BasicCompiler_Common/preprocessor.cpp (modified) (3 diffs)

BasicCompiler_Common/preprocessor.cpp

@@ -26 +26 @@
         free( ppFilePath );
     }
-    bool IsIncluded( const char *FilePath ){
-        for( int i = 0; i < count; i++ ){
-            if( lstrcmpi( ppFilePath[i], FilePath ) == 0 ){
+    bool IsIncluded( const char *includeFilePath ){
+        // '/' → '\\'
+        char tempPath[MAX_PATH];
+        lstrcpy( tempPath, includeFilePath );
+        for( int i=0; tempPath[i]; i++ ){
+            if( tempPath[i] == '/' ){
+                tempPath[i] = '\\';
+            }
+        }
+
+        for( int i=0; i<count; i++ ){
+            if( lstrcmpi( ppFilePath[i], tempPath ) == 0 ){
                 return true;
             }
@@ -34 +43 @@
         return false;
     }
-    void Add( const char *FilePath ){
+    void Add( const char *includeFilePath ){
+        // '/' → '\\'
+        char tempPath[MAX_PATH];
+        lstrcpy( tempPath, includeFilePath );
+        for( int i=0; tempPath[i]; i++ ){
+            if( tempPath[i] == '/' ){
+                tempPath[i] = '\\';
+            }
+        }
+
         //既に読み込まれているとき
-        if( IsIncluded( FilePath ) ) return;
+        if( IsIncluded( tempPath ) ) return;
 
         //追加
         ppFilePath = (char **)realloc(ppFilePath, ( count + 1 ) * sizeof(char *) );
-        ppFilePath[count] = (char *)malloc( lstrlen(FilePath) + 1 );
-        lstrcpy( ppFilePath[count], FilePath );
+        ppFilePath[count] = (char *)malloc( lstrlen(tempPath) + 1 );
+        lstrcpy( ppFilePath[count], tempPath );
         count++;
     }
@@ -84 +102 @@
     }
 
-    // TODO: 削除
-    add( "__STRING_IS_NOT_ALWAYS_UNICODE" );
-
     char temporary[255];
     sprintf(temporary,"_AB_VER%d",MAJOR_VER);