Changeset 77 in dev

Timestamp:

Mar 22, 2007, 2:41:19 AM (18 years ago)

Author:

dai_9181

Message:

デフォルトパラメータに対応。

Files:

• BasicCompiler32/Compile_CallProc.cpp (modified) (3 diffs)
• BasicCompiler32/Opcode.h (modified) (1 diff)
• BasicCompiler64/Compile_CallProc.cpp (modified) (3 diffs)
• BasicCompiler64/Opcode.h (modified) (1 diff)
• BasicCompiler_Common/ParamImpl.cpp (modified) (4 diffs)
• BasicCompiler_Common/Parameter.h (modified) (3 diffs)
• BasicCompiler_Common/Procedure.cpp (modified) (2 diffs)
• BasicCompiler_Common/StrOperation.cpp (modified) (2 diffs)
• BasicCompiler_Common/Type.cpp (modified) (1 diff)
• BasicCompiler_Common/Type.h (modified) (1 diff)
• BasicCompiler_Common/common.h (modified) (1 diff)

BasicCompiler32/Compile_CallProc.cpp

@@ -47 +47 @@
     ParamImpl *pobj_parameter=0;
     pobj_parameter=new ParamImpl(lpszParms);
+
+    // デフォルト引数を適用
+    pobj_parameter->ApplyDefaultParameters( pProcPointer->Params() );
 
     //エラーチェック
@@ -223 +226 @@
     pobj_parameter=new ParamImpl(temporary);
 
+    // デフォルト引数を適用
+    pobj_parameter->ApplyDefaultParameters( pUserProc->RealParams() );
+
     //エラーチェック
     if( !pobj_parameter->ErrorCheck(pUserProc->GetName(),pUserProc->RealParams(),pUserProc->GetSecondParmNum() ) ){
@@ -370 +376 @@
     pobj_parameter=new ParamImpl(lpszParms);
 
+    // デフォルト引数を適用
+    pobj_parameter->ApplyDefaultParameters( pDllProc->Params() );
+
     //エラーチェック
     if( !pobj_parameter->ErrorCheck( pDllProc->GetName(), pDllProc->Params() ) ){

BasicCompiler32/Opcode.h

@@ -224 +224 @@
     UserProc *OverloadSolution( const char *name, std::vector<UserProc *> &subs );
 
+    void ApplyDefaultParameters( const Parameters &params );
     bool ErrorCheck( const string &procName, const Parameters &params, int SecondParmNum = -1 );
     void MacroParameterSupport( const Parameters &params );

BasicCompiler64/Compile_CallProc.cpp

@@ -47 +47 @@
     ParamImpl *pobj_parameter=0;
     pobj_parameter=new ParamImpl(lpszParms);
+
+    // デフォルト引数を適用
+    pobj_parameter->ApplyDefaultParameters( pProcPointer->Params() );
 
     //エラーチェック
@@ -231 +234 @@
     pobj_parameter=new ParamImpl(temporary);
 
+    // デフォルト引数を適用
+    pobj_parameter->ApplyDefaultParameters( pUserProc->RealParams() );
+
     //エラーチェック
     if( !pobj_parameter->ErrorCheck(pUserProc->GetName(),pUserProc->RealParams(),pUserProc->GetSecondParmNum() ) ){
@@ -407 +413 @@
     pobj_parameter=new ParamImpl(lpszParms);
 
+    // デフォルト引数を適用
+    pobj_parameter->ApplyDefaultParameters( pDllProc->Params() );
+
     //エラーチェック
     if( !pobj_parameter->ErrorCheck( pDllProc->GetName(), pDllProc->Params() ) ){

BasicCompiler64/Opcode.h

@@ -357 +357 @@
     UserProc *OverloadSolution( const char *name, std::vector<UserProc *> &subs );
 
+    void ApplyDefaultParameters( const Parameters &params );
     bool ErrorCheck( const string &procName, const Parameters &params, int SecondParmNum = -1 );
     void MacroParameterSupport( const Parameters &params );

BasicCompiler_Common/ParamImpl.cpp

@@ -93 +93 @@
     //パラメータの個数が不一致の場合
     int max = (int)targetParms.size();
-    if(max!=ParmsNum){
+
+    if( ParmsNum > max ){
+        // 実引数が駆り引数より多いとき
+        // ※無条件で不一致
         return false;
     }
@@ -100 +103 @@
     for(int i=0;i<max;i++){
         Parameter &param = *targetParms[i];
+
+        if( i >= ParmsNum ){
+            // 引数が多いとき
+            if( param.GetInitValue().size() > 0 ){
+                // 初期値が指定されているパラメータを考慮
+                return true;
+            }
+            else{
+                return false;
+            }
+        }
 
         if(Parms[i]){
@@ -125 +139 @@
             }
             else if(level==OVERLOAD_LEVEL3){
-                if(argType.GetBasicType()==DEF_OBJECT||param.GetBasicType()==DEF_OBJECT) return 0;
+                if(argType.GetBasicType()==DEF_OBJECT||param.GetBasicType()==DEF_OBJECT) return false;
             }
         }
@@ -222 +236 @@
 
     return pUserProc;
+}
+
+void ParamImpl::ApplyDefaultParameters( const Parameters &params ){
+    if( ParmsNum == (int)params.size() ){
+        // デフォルト引数の適用が不必要なとき
+        return;
+    }
+
+    while( ParmsNum < (int)params.size() ){
+        Parameter &param = *params[ParmsNum];
+
+        Parms[ParmsNum]=(char *)HeapAlloc(hHeap,0,param.GetInitValue().size() + 1 );
+        lstrcpy(Parms[ParmsNum],param.GetInitValue().c_str() );
+        ParmsNum++;
+    }
 }
 

BasicCompiler_Common/Parameter.h

@@ -14 +14 @@
     int subScripts[MAX_ARRAYDIM];
 
+    const string initValue;
+
 public:
-    Parameter( const string &varName, const Type &type, bool isRef = false ):
+    Parameter( const string &varName, const Type &type, bool isRef = false, const string initValue = "" ):
         Type( type ),
         varName( varName ),
         isRef( isRef ),
-        isArray( false )
+        isArray( false ),
+        initValue( initValue )
     {
         subScripts[0] = -1;
@@ -27 +30 @@
         varName( param.varName ),
         isRef( param.isRef ),
-        isArray( false )
+        isArray( false ),
+        initValue( param.initValue )
     {
         subScripts[0] = -1;
@@ -55 +59 @@
     int *GetSubScriptsPtr(){
         return subScripts;
+    }
+
+    const string &GetInitValue() const
+    {
+        return initValue;
     }
 

BasicCompiler_Common/Procedure.cpp

@@ -85 +85 @@
         }
 
-        //型
         Type type( DEF_NON );
-        if(sourceOfParams[i]==1&&sourceOfParams[i+1]==ESC_AS){
+        char initValue[8192] = "";
+        if( sourceOfParams[i] == '=' ){
+            i++;
+            i = GetOneParameter( sourceOfParams, i, initValue );
+
+            //エラー用
+            cp = nowLine;
+
+            NumOpe_GetType( initValue, Type::String(), type );
+        }
+        else if(sourceOfParams[i]==1&&sourceOfParams[i+1]==ESC_AS){
             i+=2;
 
@@ -154 +163 @@
         }
 
-        Parameter *pParam = new Parameter( name, type, isRef );
+        Parameter *pParam = new Parameter( name, type, isRef, initValue );
         if( isArray ){
             pParam->SetArray( subScripts );

BasicCompiler_Common/StrOperation.cpp

@@ -175 +175 @@
     return 0;
 }
-int GetOneParameter(char *Parameter,int pos,char *retAns){
+int GetOneParameter(const char *Parameter,int pos,char *retAns){
     int i,i2,i3,IsStr;
     for(i=pos,i2=0,IsStr=0;;i++,i2++){
@@ -196 +196 @@
             break;
         }
+
+        if(IsCommandDelimitation(Parameter[i])&&IsStr==0
+            || Parameter[i] == ')' && IsStr == 0 ){
+                retAns[i2]=0;
+                break;
+        }
+
         retAns[i2]=Parameter[i];
-        if(IsCommandDelimitation(Parameter[i])&&IsStr==0){
-            retAns[i2]=0;
-            break;
-        }
     }
     return i;

BasicCompiler_Common/Type.cpp

@@ -486 +486 @@
     return (string)"(null)";
 }
+
+Type Type::String(){
+    extern CClass *pobj_StringClass;
+    if( pobj_StringClass == NULL ){
+        SetError();
+    }
+    return Type( DEF_OBJECT, *pobj_StringClass );
+}

BasicCompiler_Common/Type.h

@@ -122 +122 @@
         index = type.index;
     }
+
+    static Type String();
 };

BasicCompiler_Common/common.h

@@ -387 +387 @@
 _int8 IsCommandDelimitation(char c);
 BOOL IsBlank(char c);
-int GetOneParameter(char *Parameter,int pos,char *retAns);
+int GetOneParameter(const char *Parameter,int pos,char *retAns);
 int JumpOneParameter(char *Parameter,int i);
 int GetStringInQuotation(char *buffer,char *ReadBuffer);