Changeset 116 in dev

Timestamp:

May 12, 2007, 4:34:39 PM (17 years ago)

Author:

dai_9181

Message:

暗黙的なアップキャストを可能にした

Files:

• BasicCompiler32/Compile_Calc.cpp (modified) (1 diff)
• BasicCompiler32/Compile_Var.cpp (modified) (1 diff)
• BasicCompiler64/Compile_Calc.cpp (modified) (1 diff)
• BasicCompiler64/Compile_Var.cpp (modified) (1 diff)
• BasicCompiler_Common/NumOpe_GetType.cpp (modified) (1 diff)
• BasicCompiler_Common/ParamImpl.cpp (modified) (1 diff)
• BasicCompiler_Common/Procedure.cpp (modified) (1 diff)
• BasicCompiler_Common/Procedure.h (modified) (2 diffs)
• BasicCompiler_Common/Type.cpp (modified) (2 diffs)
• BasicCompiler_Common/VariableOpe.cpp (modified) (1 diff)

BasicCompiler32/Compile_Calc.cpp

@@ -606 +606 @@
 
     if( calcType.IsObject() && !calcType.Equals( varType ) ){
-        //キャスト演算子のオーバーロードに対応する
-        CallCastOperatorProc(calcType,bCalcUseHeap,varType);
+        bool isUpCast = false;
+        if( varType.IsObject() ){
+            if( varType.GetClass().IsEqualsOrSubClass( &calcType.GetClass() ) ){
+                isUpCast = true;
+            }
+        }
+        if( !isUpCast ){
+            //キャスト演算子のオーバーロードに対応する
+            CallCastOperatorProc(calcType,bCalcUseHeap,varType);
+        }
     }
 

BasicCompiler32/Compile_Var.cpp

@@ -513 +513 @@
                 CClass::RefType refType;
                 GetVarFormatString(temporary,tempArray,lpPtrOffset,tempMember, refType );
+            }
+
+            int typeDefIndex = Smoothie::Meta::typeDefs.GetIndex( VarName );
+            if( typeDefIndex != -1 ){
+                // TypeDef後の型名だったとき
+                lstrcpy( VarName, Smoothie::Meta::typeDefs[typeDefIndex].GetBaseName().c_str() );
             }
 

BasicCompiler64/Compile_Calc.cpp

@@ -215 +215 @@
 
     if( calcType.IsObject() && !calcType.Equals( varType ) ){
-        //キャスト演算子のオーバーロードに対応する
-        CallCastOperatorProc(REG_RAX,calcType,bCalcUseHeap,varType);
+        bool isUpCast = false;
+        if( varType.IsObject() ){
+            if( varType.GetClass().IsEqualsOrSubClass( &calcType.GetClass() ) ){
+                isUpCast = true;
+            }
+        }
+        if( !isUpCast ){
+            //キャスト演算子のオーバーロードに対応する
+            CallCastOperatorProc(REG_RAX,calcType,bCalcUseHeap,varType);
+        }
     }
 

BasicCompiler64/Compile_Var.cpp

@@ -537 +537 @@
                 CClass::RefType refType;
                 GetVarFormatString(temporary,tempArray,lpPtrOffset,tempMember, refType );
+            }
+
+            int typeDefIndex = Smoothie::Meta::typeDefs.GetIndex( VarName );
+            if( typeDefIndex != -1 ){
+                // TypeDef後の型名だったとき
+                lstrcpy( VarName, Smoothie::Meta::typeDefs[typeDefIndex].GetBaseName().c_str() );
             }
 

BasicCompiler_Common/NumOpe_GetType.cpp

@@ -614 +614 @@
                     // As演算子の右辺値
                     //型名
+                    if( (string)term=="Hoge"){
+                        int test=0;
+                    }
                     if( Type::StringToType( term, resultType ) ){
                         resultType.SetBasicType( resultType.GetBasicType() | FLAG_CAST );

BasicCompiler_Common/ParamImpl.cpp

@@ -284 +284 @@
     if( SecondParmNum == -1 ) SecondParmNum = (int)params.size();
 
-    if(ParmsNum>(int)params.size()){
+    if(ParmsNum>(int)params.size() && params.size() != 0){
         if(params[params.size()-1]->GetBasicType()!=DEF_ELLIPSE){
             //パラメータが多すぎるとき

BasicCompiler_Common/Procedure.cpp

@@ -518 +518 @@
     return true;
 }*/
+const NamespaceScopes &GlobalProc::GetNamespaceScopes() const
+{
+    if( HasParentClass() ){
+        return GetParentClassPtr()->GetNamespaceScopes();
+    }
+    return namespaceScopes;
+}
 bool GlobalProc::IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const
 {

BasicCompiler_Common/Procedure.h

@@ -161 +161 @@
         this->pParentClass = pParentClass;
     }
-    const CClass *GetParentClassPtr()
+    const CClass *GetParentClassPtr() const
     {
         return pParentClass;
@@ -274 +274 @@
     bool AddGlobalProc( const NamespaceScopes &namespaceScopes, char *buffer,int nowLine );
 */
-    virtual const NamespaceScopes &GetNamespaceScopes() const
-    {
-        return namespaceScopes;
-    }
+    virtual const NamespaceScopes &GetNamespaceScopes() const;
     virtual const NamespaceScopesCollection &GetImportedNamespaces() const
     {

BasicCompiler_Common/Type.cpp

@@ -89 +89 @@
     // TypeDefされた型
     ////////////////////
-    int i=Smoothie::Meta::typeDefs.GetIndex( typeName.c_str() );
+    int i=Smoothie::Meta::typeDefs.GetIndex( typeName );
     if(i!=-1){
         type = Smoothie::Meta::typeDefs[i].GetBaseType();
@@ -96 +96 @@
 
     //クラス
-    const CClass *pobj_c = pobj_DBClass->Find( typeName.c_str() );
+    const CClass *pobj_c = pobj_DBClass->Find( typeName );
     if(pobj_c){
         type.pClass = pobj_c;

BasicCompiler_Common/VariableOpe.cpp

@@ -732 +732 @@
         }
 
-        // TODO: TypeDefされたクラスの静的メンバに未対応
+        int typeDefIndex = Smoothie::Meta::typeDefs.GetIndex( VarName );
+        if( typeDefIndex != -1 ){
+            // TypeDef後の型名だったとき
+            lstrcpy( VarName, Smoothie::Meta::typeDefs[typeDefIndex].GetBaseName().c_str() );
+        }
 
         char temp2[VN_SIZE];