Changeset 581 in dev for trunk

Timestamp:

May 8, 2008, 3:52:48 PM (17 years ago)

Author:

dai_9181

Message:

DelegateクラスのLexicalAnalyzerクラスへの依存性をなくした。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• include/Delegate.h (modified) (3 diffs)
• include/LexicalAnalyzer.h (modified) (1 diff)
• src/Delegate.cpp (modified) (1 diff)
• src/LexicalAnalyzer_Delegate.cpp (modified) (2 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/include/Delegate.h

@@ -39 +39 @@
     }
 
+    const NamespaceScopesCollection &GetImportedNamespaces() const
+    {
+        return importedNamespaces;
+    }
+
     const std::string &GetParamStr() const
     {
@@ -47 +52 @@
         return returnTypeName;
     }
+    void SetReturnType( const Type &returnType )
+    {
+        this->returnType = returnType;
+    }
 
-    void RefleshParameterAndReturnType();
+    void SetSourceIndex( int sourceIndex )
+    {
+        this->sourceIndex = sourceIndex;
+    }
 
     virtual const std::string &GetKeyName() const
@@ -56 +68 @@
 
     const Parameters &GetDynamicParams() const
+    {
+        return dynamicParams;
+    }
+    Parameters &GetDynamicParams()
     {
         return dynamicParams;

trunk/ab5.0/abdev/BasicCompiler_Common/include/LexicalAnalyzer.h

@@ -66 +66 @@
     static void CollectDelegates( const char *source, Delegates &delegates );
     static std::string GenerateDelegatesSourceCode( const Delegates &delegates );
+    static void RefleshDelegateParameterAndReturnType( Delegate &dg );
     static void RefleshDelegatesParameterAndReturnType( Delegates &delegates );
 };

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

@@ -2 +2 @@
 
 #include <Delegate.h>
-
-void Delegate::RefleshParameterAndReturnType()
-{
-    compiler.GetNamespaceSupporter().SetImportedNamespaces( this->importedNamespaces );
-    compiler.GetNamespaceSupporter().SetLivingNamespaceScopes( this->GetNamespaceScopes() );
-
-    // パラメータを解析
-    Jenga::Common::Strings parameterStrings;
-    SplitParameter( paramStr, parameterStrings );
-    ActiveBasic::Compiler::LexicalAnalyzer::AnalyzeParameter( this->GetParameters(), parameterStrings, sourceIndex );
-
-    // 動的パラメータを作る
-    dynamicParams = this->GetParameters();
-    dynamicParams.insert( dynamicParams.begin(), new Parameter( "_System_LocalThis", Type( DEF_PTR_VOID ) ) );
-
-    if( IsFunction() )
-    {
-        // 戻り値を取得
-        if( !compiler.StringToType( returnTypeName, returnType ) )
-        {
-            compiler.errorMessenger.Output(3,returnTypeName,sourceIndex);
-        }
-    }
-}
 
 bool Delegate::IsSimilar( const Delegate &dgt ) const

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

@@ -213 +213 @@
 }
 
+void LexicalAnalyzer::RefleshDelegateParameterAndReturnType( Delegate &dg )
+{
+    compiler.GetNamespaceSupporter().SetImportedNamespaces( dg.GetImportedNamespaces() );
+    compiler.GetNamespaceSupporter().SetLivingNamespaceScopes( dg.GetNamespaceScopes() );
+
+    // パラメータを解析
+    Jenga::Common::Strings parameterStrings;
+    SplitParameter( dg.GetParamStr(), parameterStrings );
+    int sourceIndex;
+    ActiveBasic::Compiler::LexicalAnalyzer::AnalyzeParameter( dg.GetParameters(), parameterStrings, sourceIndex );
+    dg.SetSourceIndex( sourceIndex );
+
+    // 動的パラメータを作る
+    dg.GetDynamicParams() = dg.GetParameters();
+    dg.GetDynamicParams().insert( dg.GetDynamicParams().begin(), new Parameter( "_System_LocalThis", Type( DEF_PTR_VOID ) ) );
+
+    if( dg.IsFunction() )
+    {
+        // 戻り値を取得
+        Type returnType;
+        if( !compiler.StringToType( dg.GetReturnTypeName(), returnType ) )
+        {
+            compiler.errorMessenger.Output(3,dg.GetReturnTypeName(),sourceIndex);
+        }
+        else
+        {
+            dg.SetReturnType( returnType );
+        }
+    }
+}
+
 void LexicalAnalyzer::RefleshDelegatesParameterAndReturnType( Delegates &delegates )
 {
@@ -219 +250 @@
     {
         Delegate &dg = *delegates.Iterator_GetNext();
-        dg.RefleshParameterAndReturnType();
-    }
-}
+        RefleshDelegateParameterAndReturnType( dg );
+    }
+}