Changeset 192 in dev for trunk/jenga/include

Timestamp:

Jun 26, 2007, 5:04:29 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/jenga/include/smoothie

Files:

• Class.h (modified) (2 diffs)
• Namespace.h (modified) (3 diffs)
• ObjectModule.h (modified) (3 diffs)
• Procedure.h (modified) (1 diff)
• Prototype.h (modified) (1 diff)
• Smoothie.h (modified) (1 diff)
• Type.h (modified) (3 diffs)
• TypeDef.h (deleted)
• Variable.h (modified) (2 diffs)

trunk/jenga/include/smoothie/Class.h

@@ -321 +321 @@
 class Classes
 {
+protected:
     int GetHashCode(const char *name) const;
     void DestroyClass(CClass *pobj_c);
@@ -331 +332 @@
 
     const CClass *Find( const string &fullName ) const;
-    const CClass *Find( const NamespaceScopes &namespaceScopes, const string &name ) const;
+    virtual const CClass *Find( const NamespaceScopes &namespaceScopes, const string &name ) const = 0;
 
     virtual CClass *Create( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name) = 0;

trunk/jenga/include/smoothie/Namespace.h

@@ -70 +70 @@
     }
 
-    bool IsImported() const;
-
     bool IsLiving() const;
 
@@ -82 +80 @@
     bool IsCoverd( const string &name ) const;
     bool IsCoverd( const NamespaceScopes &namespaceScopes ) const;
-
-    // 指定された名前空間が同一エリアと見なされるかどうかをチェック
-    static bool IsSameArea( const NamespaceScopes &baseNamespaceScopes, const NamespaceScopes &entryNamespaceScopes ){
-        if( entryNamespaceScopes.size() ){
-            if( baseNamespaceScopes.IsCoverd( entryNamespaceScopes ) ){
-                // 包括しているときは同一と見なす
-                return true;
-            }
-        }
-        else{
-            if( baseNamespaceScopes.size() ){
-                // 名前空間の判断が必要なとき
-                if( baseNamespaceScopes.IsImported()
-                    || baseNamespaceScopes.IsLiving() ){
-                    // Using指定があるとき
-                    // または
-                    // 指定された名前空間が現在の名前空間スコープと同一のとき
-                    return true;
-                }
-            }
-            else{
-                return true;
-            }
-        }
-
-        return false;
-    }
 };
 
@@ -128 +99 @@
         return IsExist( NamespaceScopes( namespaceStr ) );
     }
+
+    bool IsImported( const NamespaceScopes &namespaceScopes ) const
+    {
+        const NamespaceScopesCollection &namespaceScopesCollection = *this;
+        BOOST_FOREACH( const NamespaceScopes &tempNamespaceScopes, namespaceScopesCollection )
+        {
+            if( namespaceScopes.IsEqual( tempNamespaceScopes ) )
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
     void SplitNamespace( const char *fullName, char *namespaceStr, char *simpleName ) const;
-
-    bool Imports( const string &namespaceStr );
 
     static bool CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection );

trunk/jenga/include/smoothie/ObjectModule.h

@@ -1 +1 @@
 #pragma once
 
-#include "TypeDef.h"
 #include "Namespace.h"
 #include "Procedure.h"
@@ -24 +23 @@
     }
 
-    // 名前空間
-    NamespaceScopesCollection namespaceScopesCollection;
-
     // クラス
     virtual Classes &GetClasses() = 0;
     virtual void SetClasses( Classes *pClasses ) = 0;
     virtual bool AutoWrite( const std::string &filePath ) = 0;
-
-    // TypeDef
-    TypeDefCollection typeDefs;
 
     // 関数ポインタ
@@ -40 +33 @@
         return *pProcPointers;
     }
-
-    // blittable型
-    BlittableTypes blittableTypes;
 
     // XMLシリアライズ用

trunk/jenga/include/smoothie/Procedure.h

@@ -281 +281 @@
     ~DllProc(){}
 
-    bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
+    virtual bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const = 0;
     bool IsEqualSymbol( const string &name ) const;
 

trunk/jenga/include/smoothie/Prototype.h

@@ -51 +51 @@
 
     // シンボル比較
-    bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
+    virtual bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const = 0;
     bool IsEqualSymbol( const Prototype &prototype ) const;
     bool IsEqualSymbol( const string &name ) const;

trunk/jenga/include/smoothie/Smoothie.h

@@ -17 +17 @@
         Smoothie::isUnicode = isUnicode;
     }
-
-    static Meta &GetMeta();
 
     class Lexical{

trunk/jenga/include/smoothie/Type.h

@@ -59 +59 @@
     void SetIndex( LONG_PTR index ){
         this->index = index;
+    }
+    void SetClassPtr( const CClass *pClass )
+    {
+        this->pClass = pClass;
     }
     void SetNull(){
@@ -130 +134 @@
     }
 
-    static Type String();
-
 
 private:
@@ -138 +140 @@
 public:
     static bool StringToBasicType( const std::string &typeName, int &basicType );
-    static bool StringToType( const std::string &typeName, Type &type );
+    static const char *Type::BasicTypeToCharPtr( const Type &type );
     static int GetBasicTypeFromSimpleName( const char *variable );
 };

trunk/jenga/include/smoothie/Variable.h

@@ -52 +52 @@
     ~Variable(){}
 
+    const NamespaceScopes &GetNamespaceScopes() const
+    {
+        return namespaceScopes;
+    }
+
     void SetArray( const int *pSubScripts ){
         isArray = true;
@@ -62 +67 @@
     }
 
-    bool IsEqualSymbol( const Symbol &symbol, bool isSupportStaticMember = true ) const;
+    virtual bool IsEqualSymbol( const Symbol &symbol, bool isSupportStaticMember = true ) const = 0;
 
     void ConstOff(){