Changeset 325 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Sep 25, 2007, 8:56:38 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common

Files:

• include/Class.h (modified) (2 diffs)
• include/Delegate.h (modified) (1 diff)
• include/Parameter.h (modified) (1 diff)
• src/Class.cpp (modified) (1 diff)
• src/Delegate.cpp (modified) (1 diff)
• src/Parameter.cpp (modified) (1 diff)
• src/Source.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -10 +10 @@
 class UserProc;
 class CClass;
+class Delegate;
 
 class InheritedInterface
@@ -366 +367 @@
     }
 
+    // デリゲート情報を取得
+    const ::Delegate &GetDelegate() const;
+
     // vtblに存在する仮想関数の数
     int GetVtblNum() const

trunk/abdev/BasicCompiler_Common/include/Delegate.h

@@ -2 +2 @@
 
 #include <Hashmap.h>
-#include <Symbol.h>
+#include <Procedure.h>
 
 class Delegate : public Procedure, public Jenga::Common::ObjectInHashmap<Delegate>

trunk/abdev/BasicCompiler_Common/include/Parameter.h

@@ -146 +146 @@
 
     bool Analyze( const char *sourceOfParams, int nowLine );
+
+    std::string GetString() const;
 };

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -589 +589 @@
 
     return 0;
+}
+
+const ::Delegate &CClass::GetDelegate() const
+{
+    const ::Delegate *dg = compiler.GetObjectModule().meta.GetDelegates().GetHashArrayElement( GetName().c_str() );
+    while( dg )
+    {
+        if( dg->IsEqualSymbol( GetNamespaceScopes(), GetName() ) ){
+            //名前空間とクラス名が一致した
+            return *dg;
+        }
+        dg = dg->GetChainNext();
+    }
+
+    Jenga::Throw( "CClass::GetDelegateメソッドに失敗" );
+    static ::Delegate dummy;
+    return dummy;
 }
 

trunk/abdev/BasicCompiler_Common/src/Delegate.cpp

@@ -120 +120 @@
 
         std::map<std::string,std::string> values;
-        values.insert( std::map<std::string,std::string>::value_type( "name", dg.GetName() ) );
-        values.insert( std::map<std::string,std::string>::value_type( "params", "" ) );
+
+        if( dg.GetNamespaceScopes().size() )
+        {
+            std::string namespaceScopesCommandStr = "";
+            std::string endNamespaceScopesCommandStr = "";
+            BOOST_FOREACH( const std::string &namespaceStr, dg.GetNamespaceScopes() )
+            {
+                if( namespaceScopesCommandStr.size() )
+                {
+                    namespaceScopesCommandStr += ":";
+                    endNamespaceScopesCommandStr += ":";
+                }
+                namespaceScopesCommandStr += "Namespace " + namespaceStr;
+                endNamespaceScopesCommandStr += "End Namespace";
+            }
+
+            values.insert( std::map<std::string,std::string>::value_type(
+                "#namespace_begin#",
+                namespaceScopesCommandStr
+            ) );
+            values.insert( std::map<std::string,std::string>::value_type(
+                "#namespace_end#",
+                endNamespaceScopesCommandStr
+            ) );
+        }
+        else
+        {
+            values.insert( std::map<std::string,std::string>::value_type( "#namespace_begin#", "" ) );
+            values.insert( std::map<std::string,std::string>::value_type( "#namespace_end#", "" ) );
+        }
+
+        values.insert( std::map<std::string,std::string>::value_type( "#name#", dg.GetName() ) );
+
+        std::string paramsStr = dg.Params().GetString();
+
+        if( dg.IsFunction() )
+        {
+            values.insert( std::map<std::string,std::string>::value_type(
+                "#call_method_begin#",
+                (string)"Function Call(" + paramsStr + ") As " + compiler.TypeToString( dg.ReturnType() )
+            ) );
+
+            values.insert( std::map<std::string,std::string>::value_type(
+                "#call_method_end#",
+                "End Function"
+            ) );
+
+            values.insert( std::map<std::string,std::string>::value_type( "#result#", "Call=" ) );
+        }
+        else
+        {
+            values.insert( std::map<std::string,std::string>::value_type(
+                "#call_method_begin#",
+                (string)"Sub Call(" + paramsStr + ")"
+            ) );
+
+            values.insert( std::map<std::string,std::string>::value_type(
+                "#call_method_end#",
+                "End Sub"
+            ) );
+
+            values.insert( std::map<std::string,std::string>::value_type( "#result#", "" ) );
+        }
+
+        values.insert( std::map<std::string,std::string>::value_type( "#params#", paramsStr ) );
+
         destSource += sourceTemplate.GetResult( values );
     }
+
+    ts( destSource.c_str() );
 }

trunk/abdev/BasicCompiler_Common/src/Parameter.cpp

@@ -159 +159 @@
     return true;
 }
+
+std::string Parameters::GetString() const
+{
+    std::string result;
+
+    const Parameters &params = *this;
+    BOOST_FOREACH( const Parameter *pParam, params )
+    {
+        if( result.size() )
+        {
+            result += ",";
+        }
+
+        result += pParam->GetVarName() + " As " + compiler.TypeToString( *pParam );
+    }
+    return result;
+}

trunk/abdev/BasicCompiler_Common/src/Source.cpp

@@ -1048 +1048 @@
         while( true )
         {
-            std::string::size_type index = result.find( "#" + it->first + "#" );
+            std::string::size_type index = result.find( it->first );
             if( index == std::string::npos )
             {
@@ -1054 +1054 @@
             }
 
-            result = result.substr( 0, index ) + it->second + result.substr( index + it->first.length() + 2 );
+            result = result.substr( 0, index ) + it->second + result.substr( index + it->first.length() );
         }
         it++;