Changeset 69 in dev for BasicCompiler_Common

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

BasicCompiler_Common

Files:

• BasicCompiler.cpp (modified) (1 diff)
• BasicCompiler.h (modified) (1 diff)
• BasicFixed.h (modified) (1 diff)
• NumOpe_GetType.cpp (modified) (1 diff)
• Subroutine.cpp (modified) (2 diffs)
• calculation.cpp (modified) (2 diffs)
• common.h (modified) (1 diff)
• preprocessor.cpp (modified) (3 diffs)

BasicCompiler_Common/BasicCompiler.cpp

@@ -692 +692 @@
 
         //Unicode
-        else if( lstrcmp( temp2, "unicode" ) ==0 ) isUnicode = true;
+        else if( lstrcmp( temp2, "unicode" ) ==0 ){
+            isUnicode = true;
+            typeOfPtrChar = MAKE_PTR_TYPE(DEF_WORD,1);
+        }
 
         //埋め込み型コンパイラビュー

BasicCompiler_Common/BasicCompiler.h

@@ -83 +83 @@
 BOOL bDll;
 bool isUnicode = false;
+int typeOfPtrChar = MAKE_PTR_TYPE(DEF_SBYTE,1);
 
 char *basbuf;

BasicCompiler_Common/BasicFixed.h

@@ -63 +63 @@
 #define PTR_LEVEL_DOWN(t)   t = MAKE_PTR_TYPE(NATURAL_TYPE(t),PTR_LEVEL(t)-1)
 
-#define DEF_PTR_CHAR    MAKE_PTR_TYPE(DEF_CHAR,1)
 #define DEF_PTR_OBJECT  MAKE_PTR_TYPE(DEF_OBJECT,1)
 #define DEF_PTR_STRUCT  MAKE_PTR_TYPE(DEF_STRUCT,1)

BasicCompiler_Common/NumOpe_GetType.cpp

@@ -389 +389 @@
                     }
 
-                    type[sp]=DEF_PTR_CHAR;
+                    type[sp]=typeOfPtrChar;
                     bLiteralCalculation=0;
                 }

BasicCompiler_Common/Subroutine.cpp

@@ -460 +460 @@
     _int64 i64data;
     type = StaticCalculation( true, temporary, 0, &i64data, &lpIndex );
-    if( type != DEF_PTR_CHAR ){
+    if( type != typeOfPtrChar ){
         SetError(1,NULL,NowLine);
         return;
@@ -483 +483 @@
     if( temporary[0] ){
         type = StaticCalculation( true, temporary, 0, &i64data, &lpIndex );
-        if( type != DEF_PTR_CHAR ){
+        if( type != typeOfPtrChar ){
             SetError(1,NULL,NowLine);
             return;

BasicCompiler_Common/calculation.cpp

@@ -524 +524 @@
                         StrPtr[pnum][i2]=0;
 
-                        type[pnum]=DEF_PTR_CHAR;
+                        type[pnum]=typeOfPtrChar;
                         before_index[pnum]=LITERAL_STRING;
                     }
@@ -538 +538 @@
                         StrPtr[pnum][i2]=0;
 
-                        type[pnum]=DEF_PTR_CHAR;
+                        type[pnum]=typeOfPtrChar;
                         before_index[pnum]=LITERAL_STRING;
                     }

BasicCompiler_Common/common.h

@@ -89 +89 @@
 extern int cp;
 extern bool isUnicode;
+extern int typeOfPtrChar;
 
 

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);