Changeset 172 in dev for trunk/jenga

Timestamp:

Jun 19, 2007, 4:02:00 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/jenga

Files:

• include/smoothie/Class.h (modified) (3 diffs)
• include/smoothie/LexicalScoping.h (deleted)
• include/smoothie/ObjectModule.h (modified) (2 diffs)
• include/smoothie/Smoothie.h (modified) (3 diffs)
• include/smoothie/SmoothieException.h (modified) (1 diff)
• include/smoothie/Type.h (modified) (1 diff)
• include/smoothie/Variable.h (modified) (1 diff)
• projects/smoothie/smoothie.vcproj (modified) (7 diffs)
• src/smoothie/Class.cpp (added)
• src/smoothie/Method.cpp (modified) (1 diff)
• src/smoothie/Smoothie.cpp (modified) (1 diff)
• src/smoothie/Type.cpp (added)

trunk/jenga/include/smoothie/Class.h

@@ -138 +138 @@
         return dynamicMembers;
     }
+    const Members &GetStaticMembers() const
+    {
+        return staticMembers;
+    }
+    Members &GetDynamicMembers()
+    {
+        return dynamicMembers;
+    }
+    Members &GetStaticMembers()
+    {
+        return staticMembers;
+    }
 
     const Methods &GetMethods() const
@@ -144 +156 @@
     }
     const Methods &GetStaticMethods() const
+    {
+        return staticMethods;
+    }
+    Methods &GetMethods()
+    {
+        return methods;
+    }
+    Methods &GetStaticMethods()
     {
         return staticMethods;
@@ -266 +286 @@
 };
 
+#define MAX_CLASS_HASH 65535
 class Classes
 {
+    int hash(const char *name) const;
+    void DestroyClass(CClass *pobj_c);
+public:
+    CClass *pobj_ClassHash[MAX_CLASS_HASH];
+
+    Classes();
+    ~Classes();
+
+    const CClass *Find( const string &fullName ) const;
+    const CClass *Find( const NamespaceScopes &namespaceScopes, const string &name ) const;
+
+    CClass *AddClass( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name,int nowLine);
+
+    void ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection);
+
+private:
+    void AddMethod(CClass *pobj_c, Prototype::Accessibility accessibility, BOOL bStatic, bool isConst, bool isAbstract,
+        bool isVirtual, bool isOverride, char *buffer, int nowLine);
+    BOOL MemberVar_LoopRefCheck(const CClass &objClass);
+public:
+    void GetAllClassInfo(void);
+    void Compile_System_InitializeUserTypes();
+
+
+    /////////////////////////////
+    // 特殊クラス
+    /////////////////////////////
+    CClass *pStringClass;
+    CClass *pObjectClass;
+    CClass *GetStringClassPtr() const;
+    CClass *GetObjectClassPtr() const;
+
+
+    /////////////////////////////
+    // 現在コンパイル中の情報
+    /////////////////////////////
+private:
+    const CClass *pCompilingClass;
+    const CMethod *pCompilingMethod;
+public:
+    //コンパイル開始の通知を受け取るメソッド
+    void StartCompile( UserProc *pUserProc );
+
+    //現在コンパイル中のメソッド情報を取得
+    const CClass *GetNowCompilingClass() const;
+    const CMethod *GetNowCompilingMethodInfo();
+
+
+    /////////////////////
+    // イテレータ
+    /////////////////////
+private:
+    CClass **ppobj_IteClass;
+    int iIteMaxNum;
+    int iIteNextNum;
+public:
+    void Iterator_Init(void);
+    void Iterator_Reset(void);
+    BOOL Iterator_HasNext(void);
+    CClass *Iterator_GetNext(void);
+    int Iterator_GetMaxCount(void);
 };

trunk/jenga/include/smoothie/ObjectModule.h

@@ -4 +4 @@
 #include "Namespace.h"
 #include "Procedure.h"
+#include "Class.h"
 
 // プロジェクト中に存在するメタ情報
@@ -12 +13 @@
 
     // クラス
+    Classes classes;
 
     // TypeDef

trunk/jenga/include/smoothie/Smoothie.h

@@ -3 +3 @@
 #include "Source.h"
 #include "ObjectModule.h"
-#include "LexicalScoping.h"
 
 class Smoothie{
@@ -13 +12 @@
         static BasicSource source;
         static NamespaceScopes liveingNamespaceScopes;
-        static CLexicalScopes lexicalScopes;
     };
 
@@ -21 +19 @@
         // 現在インポートされている名前空間
         static NamespaceScopesCollection importedNamespaces;
+
+        static const CClass *pCompilingClass;
     };
 

trunk/jenga/include/smoothie/SmoothieException.h

@@ -22 +22 @@
     {
     }
+    SmoothieException()
+        : errorCode( 300 )
+        , keyword( "" )
+        , nowLine( -1 )
+    {
+    }
 
     int GetErrorCode() const

trunk/jenga/include/smoothie/Type.h

@@ -103 +103 @@
     bool IsBoolean() const;
 
+    static bool IsPointer( int basicType );
     bool IsPointer() const;
     bool IsSigned() const;

trunk/jenga/include/smoothie/Variable.h

@@ -139 +139 @@
 
     int source_code_address;
+
+
+    static int GetSubScriptCounts(const int *ss){
+        // 配列の要素数を取得
+        int i,i2;
+        for(i=0,i2=1;i<255;i++){
+            if(ss[i]==-1) break;
+            i2*=ss[i]+1;
+        }
+        return i2;
+    }
 };
 

trunk/jenga/projects/smoothie/smoothie.vcproj

@@ -59 +59 @@
             <Tool
                 Name="VCLibrarianTool"
+                OutputFile="..\..\lib\amd64\$(ProjectName)d.lib"
             />
             <Tool
@@ -118 +119 @@
             <Tool
                 Name="VCLibrarianTool"
+                OutputFile="..\..\lib\amd64\$(ProjectName).lib"
             />
             <Tool
@@ -177 +179 @@
             <Tool
                 Name="VCLibrarianTool"
+                OutputFile="..\..\lib\x86\$(ProjectName)d.lib"
             />
             <Tool
@@ -238 +241 @@
             <Tool
                 Name="VCLibrarianTool"
+                OutputFile="..\..\lib\x86\$(ProjectName)d.lib"
             />
             <Tool
@@ -265 +269 @@
             >
             <File
+                RelativePath="..\..\src\smoothie\Class.cpp"
+                >
+            </File>
+            <File
                 RelativePath="..\..\src\smoothie\Method.cpp"
                 >
@@ -286 +294 @@
             <File
                 RelativePath="..\..\src\smoothie\Symbol.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\..\src\smoothie\Type.cpp"
                 >
             </File>
@@ -303 +315 @@
             </File>
             <File
-                RelativePath="..\..\include\smoothie\LexicalScoping.h"
-                >
-            </File>
-            <File
                 RelativePath="..\..\include\smoothie\Member.h"
                 >

trunk/jenga/src/smoothie/Method.cpp

@@ -1 @@
-#include <jenga/include/smoothie/Method.h>
+#include <jenga/include/smoothie/Class.h>
 
 

trunk/jenga/src/smoothie/Smoothie.cpp

@@ -6 +6 @@
 Meta Smoothie::meta;
 NamespaceScopesCollection Smoothie::Temp::importedNamespaces;
+const CClass *Smoothie::Temp::pCompilingClass = NULL;
 
 bool Smoothie::isFullCompile = false;