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

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

trunk/ab5.0/abdev/BasicCompiler_Common/include

Files:

• Class.h (modified) (4 diffs)
• LexicalAnalyzer.h (modified) (1 diff)
• Procedure.h (modified) (9 diffs)
• Variable.h (modified) (1 diff)

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

@@ -411 +411 @@
 
     // クラス継承
-    bool Inherits( const char *inheritNames, int nowLine );
     bool InheritsClass( const CClass &inheritsClass, const Types &actualTypeParameters, int nowLine );
-    bool InheritsInterface( const CClass &inheritsClass, int nowLine );
 
     // インターフェイス実装
     bool Implements( const CClass &interfaceClass, const Types &actualTypeParameters, int nowLine );
-    bool Implements( const char *interfaceNames, int nowLine );
 
     //メンバ、メソッドの追加
@@ -423 +420 @@
     void AddMember( Prototype::Accessibility accessibility, bool idConst, bool isRef, char *buffer, int nowLine );
     void AddStaticMember( Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine );
-
-    void AddMethod(CClass *pobj_c, Prototype::Accessibility accessibility, BOOL bStatic, bool isConst, bool isAbstract,
-        bool isVirtual, bool isOverride, bool isAutoGeneration, char *buffer, int nowLine);
 
     //重複チェック
@@ -593 +587 @@
     bool Insert( CClass *pClass, int nowLine );
     CClass *Add( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name,int nowLine);
-    virtual void CollectClassesForNameOnly( const BasicSource &source );
 
     // vtblを一時的に生成
@@ -603 +596 @@
     virtual void InitStaticMember();
 
-private:
-    bool MemberVar_LoopRefCheck(const CClass &objClass);
-public:
-    virtual void GetClass_recur(const char *lpszInheritsClass);
-    void LookaheadClass( const char *className );
-    bool LoopRefCheck( const CClass &objClass );
-    virtual void GetAllClassInfo();
     virtual void Compile_System_InitializeUserTypes();
     virtual void Compile_System_InitializeUserTypesForBaseType();

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

@@ -7 +7 @@
 {
 public:
+
+    // 名前空間を収集
     static bool CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection );
+
+    // フルネーム識別子をシンボルに変換する
     static Symbol FullNameToSymbol( const char *fullName );
     static Symbol FullNameToSymbol( const std::string &fullName );
+
+    // クラスの名前情報を収集する
+    static void CollectClassesForNameOnly( const char *source, Classes &classes );
+
+    // クラスを収集する
+    static void AddMethod(CClass *pobj_c, UserProc *pUserProc, Prototype::Accessibility accessibility, BOOL bStatic, bool isConst, bool isAbstract,
+        bool isVirtual, bool isOverride, const char *interfaceName, bool isAutoGeneration, int nowLine);
+    static bool Inherits( CClass &currentClass, const char *inheritNames, int nowLine );
+    static bool Implements( CClass &currentClass, const char *interfaceNames, int nowLine );
+    static void LookaheadClass( const char *className, Classes &classes );
+    static bool LoopRefCheck( const CClass &objClass );
+    static void CollectClasses( const char *source, Classes &classes );
+
+    // グローバルプロシージャを収集する
+    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 );
 };
 

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
 {

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

@@ -57 +57 @@
 
 public:
-    Variable( const string &name, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData )
-        : Symbol( ActiveBasic::Compiler::LexicalAnalyzer::FullNameToSymbol( name ) )
-        , type( type )
-        , isConst( isConst )
-        , isRef( isRef )
-        , isArray( false )
-        , isParameter( false)
-        , paramStrForConstructor( paramStrForConstructor )
-        , hasInitData( hasInitData )
-    {
-    }
-    Variable( const NamespaceScopes &namespaceScopes, const string &name, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData )
-        : Symbol( namespaceScopes, name )
-        , type( type )
-        , isConst( isConst )
-        , isRef( isRef )
-        , isArray( false )
-        , isParameter( false)
-        , paramStrForConstructor( paramStrForConstructor )
-        , hasInitData( hasInitData )
-    {
-    }
-    Variable( const Variable &var )
-        : Symbol( var )
-        , type( var.type )
-        , isConst( var.isConst )
-        , isRef( var.isRef )
-        , isArray( var.isArray )
-        , subscripts( var.subscripts )
-        , isParameter( false )
-        , paramStrForConstructor( var.paramStrForConstructor )
-        , hasInitData( var.hasInitData )
-    {
-    }
-    Variable()
-    {
-    }
-    ~Variable()
-    {
-    }
+    Variable( const string &name, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData );
+    Variable( const NamespaceScopes &namespaceScopes, const string &name, const Type &type, bool isConst, bool isRef, const std::string &paramStrForConstructor, bool hasInitData );
+    Variable( const Variable &var );
+    Variable();
 
     void SetArray( const Subscripts &subscripts ){