Changeset 511 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src/Procedure.cpp

Timestamp:

Apr 30, 2008, 8:04:04 PM (16 years ago)

Author:

dai_9181

Message:

幾つかの構文解析系の処理をLexicalAnalyzerに実装し直した

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/src/Procedure.cpp (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/src/Procedure.cpp

@@ -502 +502 @@
     return true;
 }
-UserProc *UserProcs::AddUserProc( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, char *buffer,int nowLine,bool isVirtual,CClass *pobj_c, bool isStatic, char *interfaceName )
-{
-    int i2,i3;
-    char temporary[8192];
-
-    int i=1;
-
-    Procedure::Kind kind = Procedure::Sub;
-    bool isMacro = false;
-    if(buffer[i]==ESC_FUNCTION) kind = Procedure::Function;
-    if(buffer[i]==ESC_MACRO){
-        isMacro = true;
-    }
-
-    i++;
-
-    bool isCdecl = false;
-    bool isExport = false;
-    while(1){
-        if(buffer[i]==1&&buffer[i+1]==ESC_CDECL&& isCdecl == false ){
-            isCdecl = true;
-
-            i+=2;
-        }
-        else if(buffer[i]==1&&buffer[i+1]==ESC_EXPORT&& isExport == false ){
-            isExport = true;
-
-            i+=2;
-        }
-        else break;
-    }
-
-    i2=0;
-    if(buffer[i]==1&&buffer[i+1]==ESC_OPERATOR){
-        if(!pobj_c){
-            compiler.errorMessenger.Output(126,NULL,nowLine);
-            return 0;
-        }
-
-        //オペレータの場合
-        temporary[i2++]=buffer[i++];
-        temporary[i2++]=buffer[i++];
-
-        int iCalcId;
-        if(buffer[i]=='='&&buffer[i+1]=='='){
-            iCalcId=CALC_EQUAL;
-            i3=2;
-        }
-        else if(buffer[i]=='='){
-            iCalcId=CALC_SUBSITUATION;
-            i3=1;
-        }
-        else if(buffer[i]=='('){
-            iCalcId=CALC_AS;
-            i3=0;
-        }
-        else if(buffer[i]=='['&&buffer[i+1]==']'&&buffer[i+2]=='='){
-            iCalcId=CALC_ARRAY_SET;
-            i3=3;
-        }
-        else if(buffer[i]=='['&&buffer[i+1]==']'){
-            iCalcId=CALC_ARRAY_GET;
-            i3=2;
-        }
-        else{
-            iCalcId=GetCalcId(buffer+i,&i3);
-            i3++;
-        }
-        if(!iCalcId){
-            compiler.errorMessenger.Output(1,NULL,nowLine);
-            return 0;
-        }
-        temporary[i2++]=iCalcId;
-        temporary[i2]=0;
-
-        i+=i3;
-    }
-    else{
-        if(pobj_c){
-            //クラスメンバの場合、デストラクタには~が付くことを考慮
-            if(buffer[i]=='~'){
-                temporary[i2]='~';
-                i++;
-                i2++;
-            }
-        }
-
-        for(;;i++,i2++){
-            if(!IsVariableChar(buffer[i])){
-                temporary[i2]=0;
-                break;
-            }
-            temporary[i2]=buffer[i];
-        }
-
-        char parentName[VN_SIZE], memberName[VN_SIZE];
-        ReferenceKind refKind;
-        if( SplitMemberName( temporary, parentName, memberName, refKind ) )
-        {
-            if( pobj_c )
-            {
-                if( interfaceName )
-                {
-                    lstrcpy( interfaceName, parentName );
-                }
-                else
-                {
-                    compiler.errorMessenger.OutputFatalError();
-                    return NULL;
-                }
-
-                char dummyMemberName[VN_SIZE];
-                if( SplitMemberName( memberName, parentName, dummyMemberName, refKind ) )
-                {
-                    compiler.errorMessenger.Output(69,temporary,nowLine);
-                    return NULL;
-                }
-            }
-            else
-            {
-                compiler.errorMessenger.Output(68,temporary,nowLine);
-                return NULL;
-            }
-
-            lstrcpy( temporary, memberName );
-        }
-    }
-
-    if( isMacro ){
-        //大文字に変換
-        CharUpper(temporary);
-
-        //マクロ関数の場合は名前リストに追加
-        macroNames.push_back( temporary );
-    }
-
-    if(!pobj_c){
-        //クラスメンバ以外の場合のみ
-        //重複チェック
-
-        if(GetDeclareHash(temporary)){
-            compiler.errorMessenger.Output(15,temporary,nowLine);
-            return 0;
-        }
-    }
-
-    // 識別ID
-    static int id_base=0;
-
-    UserProc *pUserProc = new UserProc( namespaceScopes, importedNamespaces, temporary, kind, isMacro, isCdecl, isExport, (id_base++) );
-    pUserProc->SetParentClass( pobj_c );
-
-    // 親インターフェイスをセット
-    if( interfaceName && interfaceName[0] )
-    {
-        ::Interface *pTargetInterface = NULL;
-        BOOST_FOREACH( ::Interface *pInterface, pobj_c->GetInterfaces() )
-        {
-            if( pInterface->GetClass().GetName() == interfaceName )
-            {
-                pTargetInterface = pInterface;
-                break;
-            }
-        }
-        pUserProc->SetInterface( pTargetInterface );
-    }
-
-    if(isExport){
-        pUserProc->Using();
-    }
-
-    // パラメータを解析
-    // ※第1パラメータにに指定するデータの例："( s As String ) As String"
-    pUserProc->SetParamsAndReturnType( buffer + i, nowLine, isStatic );
-
-    pUserProc->_paramStr = buffer + i;
-
-    // ハッシュに追加
-    if( !Insert( pUserProc, nowLine ) )
-    {
-        return NULL;
-    }
-
-    return pUserProc;
-}
+
 void UserProcs::EnumGlobalProcs( const char *simpleName, const char *localName, std::vector<const UserProc *> &subs )
 {