Changeset 511 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/include/Procedure.h

Timestamp:

Apr 30, 2008, 8:04:04 PM (16 years ago)

Author:

dai_9181

Message:

幾つかの構文解析系の処理をLexicalAnalyzerに実装し直した

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/include/Procedure.h (modified) (9 diffs)

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

@@ -180 +180 @@
 public:
 
-    UserProc( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const string &name, Kind kind, bool isMacro, bool isCdecl, bool isExport, int id )
+    UserProc( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const string &name, Kind kind, bool isMacro, bool isCdecl, bool isExport )
         : Procedure( namespaceScopes, name, kind, isCdecl )
         , importedNamespaces( importedNamespaces )
@@ -187 +187 @@
         , pMethod( NULL )
         , isMacro( isMacro )
+        , secondParmNum( 0 )
+        , realSecondParmNum( 1 )
         , isExport( isExport )
         , isSystem( false )
@@ -193 +195 @@
         , beginOpAddress( 0 )
         , endOpAddress( 0 )
-        , id( id )
-    {
+    {
+        static int id_base=0;
+        id = ( id_base ++ );
     }
     UserProc()
@@ -204 +207 @@
             delete pParam;
         }
+    }
+
+    void SetReturnType( const Type &newReturnType )
+    {
+        returnType = newReturnType;
     }
 
@@ -244 +252 @@
         return realParams;
     }
+    void SetRealParams( const Parameters &params )
+    {
+        realParams = params;
+    }
     int GetRealSecondParmNum() const
     {
@@ -396 +408 @@
 class UserProcs : public Jenga::Common::Hashmap<UserProc>
 {
-    std::vector<std::string> macroNames;
-
     // XMLシリアライズ用
 private:
@@ -407 +417 @@
         ar & boost::serialization::make_nvp("Hashmap_UserProcImpl",
             boost::serialization::base_object<Jenga::Common::Hashmap<UserProc>>(*this));
-        ar & BOOST_SERIALIZATION_NVP( macroNames );
     }
 
@@ -420 +429 @@
 
     bool Insert( UserProc *pUserProc, int nowLine );
-
-    UserProc *AddUserProc( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, char *buffer,int nowLine,bool isVirtual,CClass *pobj_c, bool isStatic, char *interfaceName = NULL );
 
     void EnumGlobalProcs( const char *simpleName, const char *localName, std::vector<const UserProc *> &subs );
@@ -511 +518 @@
 };
 
-void CollectProcedures( const BasicSource &source, UserProcs &userProcs, DllProcs &dllProcs );
-
 class ProcPointer : public Procedure
 {