Changeset 581 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Delegate.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Delegate.cpp (modified) (2 diffs)

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 );
+    }
+}