Changeset 525 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/include

Timestamp:

May 1, 2008, 11:46:43 PM (17 years ago)

Author:

dai_9181

Message:

デリゲート収集コードの実装をLexicalAnalyzerクラスに移動した。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common/include

Files:

• Delegate.h (modified) (4 diffs)
• LexicalAnalyzer.h (modified) (1 diff)

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

@@ -1 +1 @@
 #pragma once
-
-class Delegates;
 
 class Delegate
@@ -7 +5 @@
     , public Jenga::Common::ObjectInHashmap<Delegate>
 {
-    friend Delegates;
-
     // importされている名前空間
     NamespaceScopesCollection importedNamespaces;
@@ -43 +39 @@
     }
 
+    const std::string &GetParamStr() const
+    {
+        return paramStr;
+    }
+    const std::string &GetReturnTypeName() const
+    {
+        return returnTypeName;
+    }
+
     void RefleshParameterAndReturnType();
 
@@ -61 +66 @@
     bool IsSimilar( const Delegate &dgt ) const;
 };
-
-class Delegates : public Jenga::Common::Hashmap<Delegate>
-{
-public:
-    void Collect( const BasicSource &source );
-    void GenerateSourceCode( std::string &destSource );
-    void RefleshParameterAndReturnType();
-};
+typedef Jenga::Common::Hashmap<Delegate> Delegates;

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

@@ -30 +30 @@
     static UserProc* ParseUserProc( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, char *buffer,int nowLine,bool isVirtual,CClass *pobj_c, bool isStatic, char *interfaceName = NULL );
     static void CollectProcedures( const BasicSource &source, UserProcs &userProcs, DllProcs &dllProcs );
+
+    // デリゲートを収集する
+    static void CollectDelegates( const BasicSource &source, Delegates &delegates );
+    static std::string GenerateDelegatesSourceCode( const Delegates &delegates );
+    static void RefleshDelegatesParameterAndReturnType( Delegates &delegates );
 };