Changeset 57 in dev

Timestamp:

Feb 16, 2007, 2:15:46 AM (18 years ago)

Author:

dai_9181

Message:

バージョンをβ12に上げた。
Dimに初期値をしたとき、コピーコンストラクタが正常に呼び出せないバグを修正。

Files:

• BasicCompiler_Common/Class.cpp (modified) (1 diff)
• BasicCompiler_Common/Variable.cpp (modified) (1 diff)
• BasicCompiler_Common/common.h (modified) (1 diff)
• ProjectEditor/Common.h (modified) (1 diff)
• ProjectEditor/SubOperation.cpp (modified) (1 diff)

BasicCompiler_Common/Class.cpp

@@ -727 +727 @@
         //コピーコンストラクタ
         if(psi->ParmNum==1){
-            if(psi->pParmInfo[1].type==DEF_OBJECT&&
-                psi->pParmInfo[1].u.pobj_c==pobj_c) fConstructor=2;
+            if(psi->pParmInfo[0].type==DEF_OBJECT&&
+                psi->pParmInfo[0].u.pobj_c==pobj_c) fConstructor=2;
         }
 

BasicCompiler_Common/Variable.cpp

@@ -1096 +1096 @@
 
     if( pTypeInfo->type == DEF_OBJECT && InitBuf[0] != '\0' && InitBuf[0] != '[' && isRef == false ){
-        lstrcpy( ConstractParameter, InitBuf );
-        InitBuf[0] = 0;
+        if( pTypeInfo->u.pobj_Class->GetCopyConstructorMethod() ){
+            //オブジェクトでコピーコンストラクタが存在するとき
+            lstrcpy( ConstractParameter, InitBuf );
+            InitBuf[0] = 0;
+        }
     }
 

BasicCompiler_Common/common.h

@@ -43 +43 @@
 
 #ifdef _AMD64_
-#define VER_INFO        "β11 (x64)"
+#define VER_INFO        "β12 (x64)"
 #else
-#define VER_INFO        "β11"
+#define VER_INFO        "β12"
 #endif
 

ProjectEditor/Common.h

@@ -62 +62 @@
 #define APPLICATION_NAME "ActiveBasic 5.0"
 #define VERSION_APPLI_NAME APPLICATION_NAME
-#define VERSION_STRING "5.00.00 β11"
+#define VERSION_STRING "5.00.00 β12"
 
 #endif

ProjectEditor/SubOperation.cpp

@@ -525 +525 @@
     }
     else if(str[0]=='s'||str[0]=='S'){
+        if(lstrcmpi(str,"SByte")==0) return -1;
         if(lstrcmpi(str,"Select")==0) return COM_SELECT;
         if(lstrcmpi(str,"SelectCase")==0) return COM_SELECT;