Changeset 182 in dev for trunk/abdev/BasicCompiler_Common/Subroutine.cpp

Timestamp:

Jun 24, 2007, 6:49:13 PM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/Subroutine.cpp (modified) (7 diffs)

trunk/abdev/BasicCompiler_Common/Subroutine.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
+
+#include <ProcedureImpl.h>
+
 #include "../BasicCompiler_Common/common.h"
 
@@ -83 +88 @@
     }
 }
-bool SplitMemberName( const char *desc, char *object, char *member, CClass::RefType &refType ){
-    int lastIndex = -1;
-    for( int i=0; desc[i]; i++ ){
-        if( desc[i] == '(' ){
-            i=JumpStringInPare(desc,i+1);
-            continue;
-        }
-        else if( desc[i] == '[' ){
-            i=JumpStringInBracket(desc,i+1);
-            continue;
-        }
-        else if(desc[i]=='.'||(desc[i]==1&&desc[i+1]==ESC_PSMEM)){
-            lastIndex = i;
-        }
-    }
-    if( lastIndex == -1 ){
-        lstrcpy( member, desc );
-        return false;
-    }
-
-    if(desc[lastIndex]=='.'){
-        lstrcpy(member,desc+lastIndex+1);
-        refType = CClass::Dot;
-    }
-    else{
-        lstrcpy(member,desc+lastIndex+2);
-        refType = CClass::Pointer;
-    }
-
-    if( object ){
-        lstrcpy( object, desc );
-        object[lastIndex]=0;
-    }
-
-    return true;
-}
-bool SplitMemberName( const char *desc, char *object, char *member ){
-    CClass::RefType dummyRefType;
-    return SplitMemberName( desc, object, member, dummyRefType );
-}
 
 bool CallProc( int kind, const void *pProc, const char *fullCallName, const char *lpszParms, Type &resultType, bool isCallOn ){
@@ -199 +164 @@
         GetVarType(fullCallName,type,false);
 
-        ProcPointer *pProcPtr = Smoothie::meta.procPointers[type.GetIndex()];
+        ProcPointer *pProcPtr = Smoothie::GetMeta().GetProcPointers()[type.GetIndex()];
         resultType = pProcPtr->ReturnType();
 
@@ -402 +367 @@
 
     // オブジェクトを生成
-    DllProc *pDllProc = new DllProc( namespaceScopes, procName, kind, isCdecl, dllFileName, alias );
+    DllProc *pDllProc = new DllProcImpl( namespaceScopes, procName, kind, isCdecl, dllFileName, alias );
 
     // パラメータを解析
@@ -409 +374 @@
 
     // パラメータのエラーチェック
-    foreach( const Parameter *pParam, pDllProc->Params() ){
+    BOOST_FOREACH( const Parameter *pParam, pDllProc->Params() ){
         if( pParam->IsObject() ){
             SetError(25,pParam->GetVarName(),nowLine);
@@ -662 +627 @@
 
     // 名前空間管理
-    NamespaceScopes &namespaceScopes = Smoothie::Lexical::liveingNamespaceScopes;
+    NamespaceScopes &namespaceScopes = Smoothie::Temp::liveingNamespaceScopes;
     namespaceScopes.clear();
 
@@ -852 +817 @@
 }
 
-
-
-///////////////////////
-// 関数ポインタの管理
-///////////////////////
-
-int AddProcPtrInfo( const string &typeExpression, int nowLine ){
-    DWORD dwProcType = (DWORD)typeExpression[2];
-    const string &paramStr = typeExpression.substr( 3 );
-
-    Procedure::Kind kind = Procedure::Sub;
-    if( dwProcType == ESC_FUNCTION ){
-        kind = Procedure::Function;
-    }
-
-    ProcPointer *pProcPointer = new ProcPointer( kind );
-
-    //buffer[0]は'('となっている
-    pProcPointer->SetParamsAndReturnType( paramStr.c_str(), nowLine );
-
-    Smoothie::meta.procPointers.push_back( pProcPointer );
-
-    return (int)Smoothie::meta.procPointers.size()-1;
-}
-void DeleteProcPtrInfo(void){
-    BOOST_FOREACH( ProcPointer *pProcPointer, Smoothie::meta.procPointers ){
-        delete pProcPointer;
-    }
-
-    Smoothie::meta.procPointers.clear();
-}
-
-
-
 bool IsNeedProcCompile(){
     for(int i2=0;i2<MAX_HASH;i2++){