Changeset 425 in dev

Timestamp:

Mar 10, 2008, 5:40:46 PM (16 years ago)

Author:

dai_9181

Message:

[424]を64bit版にマージ。

Location:

trunk/abdev/BasicCompiler64

Files:

• Compile_Func.cpp (modified) (1 diff)
• Compile_Statement.cpp (modified) (1 diff)
• Compile_Var.cpp (modified) (1 diff)
• Opcode.h (modified) (1 diff)
• OperatorProc.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler64/Compile_Func.cpp

@@ -304 +304 @@
 
         //オーバーロードを解決
-        pUserProc=OverloadSolution( name, subs, *pBaseParams, Type() );
+        pUserProc=OverloadSolution( name, subs, *pBaseParams, Type(), Type() );
 
         if( isCallOn && baseType.IsDelegate() )

trunk/abdev/BasicCompiler64/Compile_Statement.cpp

@@ -781 +781 @@
 
                         //オーバーロードを解決
-                        const UserProc *pUserProc = OverloadSolution("==",subs, params, NULL);
+                        const UserProc *pUserProc = OverloadSolution( "==", subs, params, Type( DEF_BOOLEAN ), type1 );
 
                         delete params[0];

trunk/abdev/BasicCompiler64/Compile_Var.cpp

@@ -453 +453 @@
                 int ptrLevel = PTR_LEVEL( resultType.GetBasicType() );
 
-                // TODO: ベースオブジェクト（指定されていないときはObjectクラス）にセットする
+                // 制約クラス（指定されていないときはObjectクラス）にセットする
                 resultType.SetBasicType( DEF_OBJECT );
 

trunk/abdev/BasicCompiler64/Opcode.h

@@ -289 +289 @@
 
 private:
-    bool EvaluateOverloadScore( int level, const Parameters &targetParms, const Type &targetResultType, bool &isErrored );
-
-public:
-    const UserProc *_OverloadSolution( const char *name, std::vector<const UserProc *> &subs, bool isEnabledReturnType = false );
-    const UserProc *OverloadSolution( const char *name, std::vector<const UserProc *> &subs, bool isEnabledReturnType = false );
+    bool EvaluateOverloadScore( int level, const Parameters &targetParms, const Type &targetResultType, const Type &leftType, const UserProc &userProc, bool &isErrored );
+
+public:
+    const UserProc *_OverloadSolution( const char *name, std::vector<const UserProc *> &subs, const Type &leftType, bool isEnabledReturnType );
+    const UserProc *OverloadSolution( const char *name, std::vector<const UserProc *> &subs, const Type &leftType, bool isEnabledReturnType = false );
 
     void ApplyDefaultParameters( const Parameters &params );

trunk/abdev/BasicCompiler64/OperatorProc.cpp

@@ -66 +66 @@
     if(idCalc==CALC_EQUAL) lstrcpy(temporary,"==");
     else GetCalcName(idCalc,temporary);
-    const UserProc *pUserProc = OverloadSolution( temporary, subs, params, baseType );
+    const UserProc *pUserProc = OverloadSolution( temporary, subs, params, baseType, leftType );
 
     if(!pUserProc){