Changeset 425 in dev


Ignore:
Timestamp:
Mar 10, 2008, 5:40:46 PM (17 years ago)
Author:
dai_9181
Message:

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

Location:
trunk/abdev/BasicCompiler64
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/abdev/BasicCompiler64/Compile_Func.cpp

    r370 r425  
    304304
    305305        //オーバーロードを解決
    306         pUserProc=OverloadSolution( name, subs, *pBaseParams, Type() );
     306        pUserProc=OverloadSolution( name, subs, *pBaseParams, Type(), Type() );
    307307
    308308        if( isCallOn && baseType.IsDelegate() )
  • trunk/abdev/BasicCompiler64/Compile_Statement.cpp

    r416 r425  
    781781
    782782                        //オーバーロードを解決
    783                         const UserProc *pUserProc = OverloadSolution("==",subs, params, NULL);
     783                        const UserProc *pUserProc = OverloadSolution( "==", subs, params, Type( DEF_BOOLEAN ), type1 );
    784784
    785785                        delete params[0];
  • trunk/abdev/BasicCompiler64/Compile_Var.cpp

    r421 r425  
    453453                int ptrLevel = PTR_LEVEL( resultType.GetBasicType() );
    454454
    455                 // TODO: ベースオブジェクト(指定されていないときはObjectクラス)にセットする
     455                // 制約クラス(指定されていないときはObjectクラス)にセットする
    456456                resultType.SetBasicType( DEF_OBJECT );
    457457
  • trunk/abdev/BasicCompiler64/Opcode.h

    r416 r425  
    289289
    290290private:
    291     bool EvaluateOverloadScore( int level, const Parameters &targetParms, const Type &targetResultType, bool &isErrored );
    292 
    293 public:
    294     const UserProc *_OverloadSolution( const char *name, std::vector<const UserProc *> &subs, bool isEnabledReturnType = false );
    295     const UserProc *OverloadSolution( const char *name, std::vector<const UserProc *> &subs, bool isEnabledReturnType = false );
     291    bool EvaluateOverloadScore( int level, const Parameters &targetParms, const Type &targetResultType, const Type &leftType, const UserProc &userProc, bool &isErrored );
     292
     293public:
     294    const UserProc *_OverloadSolution( const char *name, std::vector<const UserProc *> &subs, const Type &leftType, bool isEnabledReturnType );
     295    const UserProc *OverloadSolution( const char *name, std::vector<const UserProc *> &subs, const Type &leftType, bool isEnabledReturnType = false );
    296296
    297297    void ApplyDefaultParameters( const Parameters &params );
  • trunk/abdev/BasicCompiler64/OperatorProc.cpp

    r402 r425  
    6666    if(idCalc==CALC_EQUAL) lstrcpy(temporary,"==");
    6767    else GetCalcName(idCalc,temporary);
    68     const UserProc *pUserProc = OverloadSolution( temporary, subs, params, baseType );
     68    const UserProc *pUserProc = OverloadSolution( temporary, subs, params, baseType, leftType );
    6969
    7070    if(!pUserProc){
Note: See TracChangeset for help on using the changeset viewer.