Changeset 193 in dev for trunk/abdev/BasicCompiler_Common/include

Timestamp:

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

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• ClassImpl.h (modified) (2 diffs)
• Compiler.h (modified) (1 diff)
• MetaImpl.h (modified) (3 diffs)
• ProcedureImpl.h (modified) (1 diff)
• SmoothieImpl.h (modified) (2 diffs)
• TypeDef.h (added)
• VariableImpl.h (added)

trunk/abdev/BasicCompiler_Common/include/ClassImpl.h

@@ -14 +14 @@
     {
     }
+
+    virtual bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
 
     //継承させる
@@ -62 +64 @@
     virtual void Compile_System_InitializeUserTypes();
 
+    virtual const CClass *Find( const NamespaceScopes &namespaceScopes, const string &name ) const;
+
 
     // XMLシリアライズ用

trunk/abdev/BasicCompiler_Common/include/Compiler.h

@@ -2 +2 @@
 
 #include <CodeGenerator.h>
+#include <MetaImpl.h>
+
 class Compiler
 {
-    static NativeCode nativeCode;
+    NativeCode nativeCode;
+    MetaImpl metaImpl;
+
+    NamespaceScopesCollection importedNamespaces;
+
 public:
-    static NativeCode &GetNativeCode()
+    NativeCode &GetNativeCode()
     {
         return nativeCode;
     }
+
+    MetaImpl &GetMeta()
+    {
+        return metaImpl;
+    }
+
+    NamespaceScopesCollection &GetImportedNamespaces()
+    {
+        return importedNamespaces;
+    }
+    void SetImportedNamespaces( const NamespaceScopesCollection &namespaces )
+    {
+        this->importedNamespaces = namespaces;
+    }
+    bool ImportsNamespace( const std::string &namespaceStr )
+    {
+        NamespaceScopes namespaceScopes( namespaceStr );
+        if( !this->GetMeta().GetNamespaces().IsExist( namespaceScopes ) ){
+            return false;
+        }
+
+        this->importedNamespaces.push_back( namespaceScopes );
+
+        return true;
+    }
+
+    static bool StringToType( const std::string &typeName, Type &type );
+    static const std::string TypeToString( const Type &type );
+
+    // 指定された名前空間が同一エリアと見なされるかどうかをチェック
+    bool IsSameAreaNamespace( const NamespaceScopes &baseNamespaceScopes, const NamespaceScopes &entryNamespaceScopes ){
+        if( entryNamespaceScopes.size() ){
+            if( baseNamespaceScopes.IsCoverd( entryNamespaceScopes ) ){
+                // 包括しているときは同一と見なす
+                return true;
+            }
+        }
+        else{
+            if( baseNamespaceScopes.size() ){
+                // 名前空間の判断が必要なとき
+                if( this->importedNamespaces.IsImported( baseNamespaceScopes )
+                    || baseNamespaceScopes.IsLiving() ){
+                    // Using指定があるとき
+                    // または
+                    // 指定された名前空間が現在の名前空間スコープと同一のとき
+                    return true;
+                }
+            }
+            else{
+                return true;
+            }
+        }
+
+        return false;
+    }
 };
+
+static Compiler compiler;

trunk/abdev/BasicCompiler_Common/include/MetaImpl.h

@@ -7 +7 @@
 #include <ClassImpl.h>
 #include <ProcedureImpl.h>
+#include <TypeDef.h>
 
 class MetaImpl : public Meta
 {
+    // 名前空間
+    NamespaceScopesCollection namespaceScopesCollection;
+
+    // クラス
     ClassesImpl classesImpl;
     Classes *pNowClassesForDebugger;
 
+    // blittable型
+    BlittableTypes blittableTypes;
+
+    // TypeDef
+    TypeDefCollection typeDefs;
+
 public:
-    MetaImpl( ClassesImpl *pClasses )
+    MetaImpl()
         : Meta( new ProcPointersImpl() )
         , classesImpl()
@@ -20 +31 @@
     {
     }
-    MetaImpl()
-        : Meta()
+
+    const NamespaceScopesCollection &GetNamespaces() const
     {
+        return namespaceScopesCollection;
     }
-
+    NamespaceScopesCollection &GetNamespaces()
+    {
+        return namespaceScopesCollection;
+    }
 
     virtual Classes &GetClasses()
@@ -33 +48 @@
     {
         this->pNowClassesForDebugger = pClasses;
+    }
+
+    BlittableTypes &GetBlittableTypes()
+    {
+        return blittableTypes;
+    }
+
+    TypeDefCollection &GetTypeDefs()
+    {
+        return typeDefs;
     }
 

trunk/abdev/BasicCompiler_Common/include/ProcedureImpl.h

@@ -49 +49 @@
     }
 
+    virtual bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
+
     virtual bool SetParamsAndReturnType( const char *sourceOfParams, int nowLine );
 };

trunk/abdev/BasicCompiler_Common/include/SmoothieImpl.h

@@ -9 +9 @@
 {
     friend Smoothie;
-    static MetaImpl metaImpl;
+
 public:
     SmoothieImpl()
@@ -15 +15 @@
     {
     }
+
+    // blittable型
+    BlittableTypes blittableTypes;
 };