Changeset 181 in dev for trunk/jenga/src/smoothie/Type.cpp

Timestamp:

Jun 24, 2007, 2:05:40 PM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/jenga/src/smoothie/Type.cpp (modified) (11 diffs)

trunk/jenga/src/smoothie/Type.cpp

@@ +1 @@
+#include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/Class.h>
 #include <jenga/include/smoothie/SmoothieException.h>
@@ -61 +62 @@
 }
 
-/*
+
 bool Type::StringToType( const string &typeName, Type &type ){
     type.index = -1;
@@ -70 +71 @@
                 //関数ポインタ（*Function）
                 type.basicType = DEF_PTR_PROC;
-                type.index = AddProcPtrInfo( typeName, cp );
+                type.index = Smoothie::GetMeta().GetProcPointers().Add( typeName );
                 return true;
         }
@@ -93 +94 @@
     // Object型だったとき
     if( typeName == "Object" ){
-        type.SetType( DEF_OBJECT, Smoothie::meta.GetClasses().GetObjectClassPtr() );
+        type.SetType( DEF_OBJECT, Smoothie::GetMeta().GetClasses().GetObjectClassPtr() );
         return true;
     }
@@ -99 +100 @@
     // String型だったとき
     if( typeName == "String" ){
-        type.SetType( DEF_OBJECT, Smoothie::meta.GetClasses().GetStringClassPtr() );
+        type.SetType( DEF_OBJECT, Smoothie::GetMeta().GetClasses().GetStringClassPtr() );
         return true;
     }
@@ -107 +108 @@
     // TypeDefされた型
     ////////////////////
-    int i=Smoothie::meta.typeDefs.GetIndex( typeName );
+    int i=Smoothie::GetMeta().typeDefs.GetIndex( typeName );
     if(i!=-1){
-        type = Smoothie::meta.typeDefs[i].GetBaseType();
+        type = Smoothie::GetMeta().typeDefs[i].GetBaseType();
         return true;
     }
 
     //クラス
-    const CClass *pobj_c = Smoothie::meta.GetClasses().Find( typeName );
+    const CClass *pobj_c = Smoothie::GetMeta().GetClasses().Find( typeName );
     if(pobj_c){
         type.pClass = pobj_c;
@@ -128 +129 @@
 
     return false;
-}*/
+}
 
 int Type::GetBasicSize( int basicType )
@@ -487 +488 @@
 }
 
-/*
+
 const string Type::ToString() const
 {
@@ -513 +514 @@
         }
         else{
-            if( Smoothie::meta.procPointers[index]->ReturnType().IsNull() ){
+            if( Smoothie::GetMeta().GetProcPointers()[index]->ReturnType().IsNull() ){
                 return "*Sub";
             }
@@ -532 +533 @@
     }
 
-    extern int cp;
-    SetError(1,NULL,cp);
+    throw SmoothieException( 1 );
 
     return (string)"(null)";
@@ -539 +539 @@
 
 Type Type::String(){
-    return Type( DEF_OBJECT, *Smoothie::meta.GetClasses().GetStringClassPtr() );
-}*/
+    return Type( DEF_OBJECT, *Smoothie::GetMeta().GetClasses().GetStringClassPtr() );
+}
 
 int Type::GetBasicTypeFromSimpleName( const char *variable ){