Changeset 575 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src

Timestamp:

May 7, 2008, 12:13:15 PM (17 years ago)

Author:

dai_9181

Message:

ProcPointers::Addメソッドを排除。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common/src

Files:

• Compiler.cpp (modified) (1 diff)
• Procedure.cpp (modified) (1 diff)

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

@@ -78 +78 @@
     if( typeName[0] == '*' ){
         if( typeName.size() >= 3
-            && typeName[1] == 1 && ( typeName[2] == ESC_FUNCTION || typeName[2] == ESC_SUB ) ){
-                //関数ポインタ（*Function）
-                type.SetBasicType( DEF_PTR_PROC );
-                type.SetIndex( this->GetObjectModule().meta.GetProcPointers().Add( typeName ) );
-                return true;
+            && typeName[1] == 1 && ( typeName[2] == ESC_FUNCTION || typeName[2] == ESC_SUB ) )
+        {
+            // 関数ポインタを追加する
+            {
+                DWORD dwProcType = (DWORD)typeName[2];
+                const std::string &paramStr = typeName.substr( 3 );
+
+                Procedure::Kind kind = ( dwProcType == ESC_FUNCTION )
+                    ? Procedure::Function
+                    : Procedure::Sub;
+
+                ProcPointer *pProcPointer = new ProcPointer( kind );
+
+                //buffer[0]は'('となっている
+                extern int cp;
+                ActiveBasic::Compiler::LexicalAnalyzer::SetParamsAndReturnType( pProcPointer, paramStr.c_str(), false, cp );
+
+                this->GetObjectModule().meta.GetProcPointers().push_back( pProcPointer );
+            }
+
+            //関数ポインタ（*Function）
+            type.SetBasicType( DEF_PTR_PROC );
+            type.SetIndex( this->GetObjectModule().meta.GetProcPointers().size() - 1 );
+            return true;
         }
 

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

@@ -118 +118 @@
 }
 
-int ProcPointers::Add( const std::string &typeExpression )
-{
-    DWORD dwProcType = (DWORD)typeExpression[2];
-    const std::string &paramStr = typeExpression.substr( 3 );
-
-    Procedure::Kind kind = Procedure::Sub;
-    if( dwProcType == ESC_FUNCTION ){
-        kind = Procedure::Function;
-    }
-
-    ProcPointer *pProcPointer = new ProcPointer( kind );
-
-    //buffer[0]は'('となっている
-    extern int cp;
-    LexicalAnalyzer::SetParamsAndReturnType( pProcPointer, paramStr.c_str(), false, cp );
-
-    this->push_back( pProcPointer );
-
-    return (int)this->size()-1;
-}
-
 void ProcPointers::Clear()
 {