Changeset 180 in dev for trunk/jenga/src/smoothie

Timestamp:

Jun 21, 2007, 3:26:21 AM (17 years ago)

Author:

dai_9181

Message:

Meta::GetClassesメソッドを追加

Location:

trunk/jenga/src/smoothie

Files:

• Class.cpp (modified) (5 diffs)
• Smoothie.cpp (modified) (1 diff)
• Type.cpp (modified) (4 diffs)

trunk/jenga/src/smoothie/Class.cpp

@@ -140 +140 @@
 
         //継承元クラスを取得
-        const CClass *pInheritsClass = Smoothie::meta.classes.Find(temporary);
+        const CClass *pInheritsClass = Smoothie::meta.GetClasses().Find(temporary);
         if( !pInheritsClass ){
             throw SmoothieException(106,temporary,nowLine);
@@ -170 +170 @@
     if( !isInheritsClass ){
         // クラスを一つも継承していないとき
-        const CClass *pObjectClass = Smoothie::meta.classes.Find("Object");
+        const CClass *pObjectClass = Smoothie::meta.GetClasses().Find("Object");
         if( !pObjectClass ){
             throw SmoothieException(106,"Object",i);
@@ -194 +194 @@
 
         //継承元クラスを取得
-        const CClass *pInheritsClass = Smoothie::meta.classes.Find(temporary);
+        const CClass *pInheritsClass = Smoothie::meta.GetClasses().Find(temporary);
         if( !pInheritsClass ){
             throw SmoothieException(106,temporary,nowLine);
@@ -234 +234 @@
         //継承先が読み取られていないとき
         pobj_LoopRefCheck->add(this->GetName().c_str());
-        Smoothie::meta.classes.GetClass_recur(inheritsClass.GetName().c_str());
+        Smoothie::meta.GetClasses().GetClass_recur(inheritsClass.GetName().c_str());
         pobj_LoopRefCheck->del(this->GetName().c_str());
     }
@@ -296 +296 @@
         //継承先が読み取られていないとき
         pobj_LoopRefCheck->add(this->GetName().c_str());
-        Smoothie::meta.classes.GetClass_recur(inheritsInterface.GetName().c_str());
+        Smoothie::meta.GetClasses().GetClass_recur(inheritsInterface.GetName().c_str());
         pobj_LoopRefCheck->del(this->GetName().c_str());
     }

trunk/jenga/src/smoothie/Smoothie.cpp

@@ -4 +4 @@
 NamespaceScopes Smoothie::Lexical::liveingNamespaceScopes;
 
-Meta Smoothie::meta;
 NamespaceScopesCollection Smoothie::Temp::importedNamespaces;
 const CClass *Smoothie::Temp::pCompilingClass = NULL;

trunk/jenga/src/smoothie/Type.cpp

@@ -93 +93 @@
     // Object型だったとき
     if( typeName == "Object" ){
-        type.SetType( DEF_OBJECT, Smoothie::meta.classes.GetObjectClassPtr() );
+        type.SetType( DEF_OBJECT, Smoothie::meta.GetClasses().GetObjectClassPtr() );
         return true;
     }
@@ -99 +99 @@
     // String型だったとき
     if( typeName == "String" ){
-        type.SetType( DEF_OBJECT, Smoothie::meta.classes.GetStringClassPtr() );
+        type.SetType( DEF_OBJECT, Smoothie::meta.GetClasses().GetStringClassPtr() );
         return true;
     }
@@ -114 +114 @@
 
     //クラス
-    const CClass *pobj_c = Smoothie::meta.classes.Find( typeName );
+    const CClass *pobj_c = Smoothie::meta.GetClasses().Find( typeName );
     if(pobj_c){
         type.pClass = pobj_c;
@@ -539 +539 @@
 
 Type Type::String(){
-    return Type( DEF_OBJECT, *Smoothie::meta.classes.GetStringClassPtr() );
+    return Type( DEF_OBJECT, *Smoothie::meta.GetClasses().GetStringClassPtr() );
 }*/