Changeset 193 in dev for trunk/abdev/BasicCompiler_Common/DebugMiddleFile.cpp

Timestamp:

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

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/DebugMiddleFile.cpp (modified) (14 diffs)

trunk/abdev/BasicCompiler_Common/DebugMiddleFile.cpp

@@ -1 +1 @@
 #include <jenga/include/smoothie/Smoothie.h>
 
+#include <Compiler.h>
 #include <ClassImpl.h>
+#include <VariableImpl.h>
 
 #include "../BasicCompiler_Common/common.h"
@@ -32 +34 @@
         (*p)+=lstrlen(buffer+(*p))+1;
 
-        type.SetIndex( (LONG_PTR)Smoothie::GetMeta().GetClasses().Find(szClassName) );
+        type.SetIndex( (LONG_PTR)compiler.GetMeta().GetClasses().Find(szClassName) );
     }
     else{
@@ -119 +121 @@
 
     //イテレータをリセット
-    Smoothie::GetMeta().GetClasses().Iterator_Reset();
+    compiler.GetMeta().GetClasses().Iterator_Reset();
 
     //個数
-    *(long *)(buffer+i2)=Smoothie::GetMeta().GetClasses().Iterator_GetMaxCount();
-    i2+=sizeof(long);
-
-    while(Smoothie::GetMeta().GetClasses().Iterator_HasNext()){
+    *(long *)(buffer+i2)=compiler.GetMeta().GetClasses().Iterator_GetMaxCount();
+    i2+=sizeof(long);
+
+    while(compiler.GetMeta().GetClasses().Iterator_HasNext()){
         CClass *pobj_c;
-        pobj_c=Smoothie::GetMeta().GetClasses().Iterator_GetNext();
+        pobj_c=compiler.GetMeta().GetClasses().Iterator_GetNext();
 
         //クラス名
@@ -139 +141 @@
     // TypeDef情報
     //////////////////
-    *(long *)(buffer+i2)=(int)Smoothie::GetMeta().typeDefs.size();
-    i2+=sizeof(long);
-    for(i3=0;i3<(int)Smoothie::GetMeta().typeDefs.size();i3++){
-        lstrcpy(buffer+i2,Smoothie::GetMeta().typeDefs[i3].GetName().c_str() );
-        i2+=lstrlen(buffer+i2)+1;
-
-        lstrcpy(buffer+i2,Smoothie::GetMeta().typeDefs[i3].GetBaseName().c_str() );
+    *(long *)(buffer+i2)=(int)compiler.GetMeta().GetTypeDefs().size();
+    i2+=sizeof(long);
+    for(i3=0;i3<(int)compiler.GetMeta().GetTypeDefs().size();i3++){
+        lstrcpy(buffer+i2,compiler.GetMeta().GetTypeDefs()[i3].GetName().c_str() );
+        i2+=lstrlen(buffer+i2)+1;
+
+        lstrcpy(buffer+i2,compiler.GetMeta().GetTypeDefs()[i3].GetBaseName().c_str() );
         i2+=lstrlen(buffer+i2)+1;
 
@@ -307 +309 @@
 
     //イテレータをリセット
-    Smoothie::GetMeta().GetClasses().Iterator_Reset();
-
-    while(Smoothie::GetMeta().GetClasses().Iterator_HasNext()){
+    compiler.GetMeta().GetClasses().Iterator_Reset();
+
+    while(compiler.GetMeta().GetClasses().Iterator_HasNext()){
         CClass *pobj_c;
-        pobj_c=Smoothie::GetMeta().GetClasses().Iterator_GetNext();
+        pobj_c=compiler.GetMeta().GetClasses().Iterator_GetNext();
 
 
@@ -497 +499 @@
     }
 
-    Smoothie::GetMeta().SetClasses( this->pobj_DBClass );
+    compiler.GetMeta().SetClasses( this->pobj_DBClass );
 
 
@@ -505 +507 @@
 
     //初期化
-    Smoothie::GetMeta().typeDefs.clear();
+    compiler.GetMeta().GetTypeDefs().clear();
 
     //個数を取得
@@ -515 +517 @@
 
         // 名前空間に未対応
-        Smoothie::GetMeta().typeDefs.push_back( TypeDef( NamespaceScopes(), temp5, buffer+i2, -1 ) );
+        compiler.GetMeta().GetTypeDefs().push_back( TypeDef( NamespaceScopes(), temp5, buffer+i2, -1 ) );
 
         i2+=lstrlen(buffer+i2)+1;
@@ -546 +548 @@
         bool isArray = (buffer[i2++]) ? true:false;
 
-        Variable *pVar = new Variable( name, type, false, isRef );
+        Variable *pVar = new VariableImpl( name, type, false, isRef );
 
         if(isArray){
@@ -592 +594 @@
         const CClass *pClass = NULL;
         if(szParentClassName[0]){
-            pClass=Smoothie::GetMeta().GetClasses().Find(szParentClassName);
+            pClass=compiler.GetMeta().GetClasses().Find(szParentClassName);
         }
 
@@ -636 +638 @@
             bool isArray = (buffer[i2++]) ? true:false;
 
-            Variable *pVar = new Variable( name, type, false, isRef );
+            Variable *pVar = new VariableImpl( name, type, false, isRef );
 
             if(isArray){
@@ -697 +699 @@
         i2+=lstrlen(buffer+i2)+1;
 
-        pobj_c =  const_cast<CClass *>( Smoothie::GetMeta().GetClasses().Find(szClassName) );
+        pobj_c =  const_cast<CClass *>( compiler.GetMeta().GetClasses().Find(szClassName) );
 
         //仮想関数の数
@@ -748 +750 @@
             const CClass *pobj_InheritsClass = NULL;
             if(szInherits[0]){
-                pobj_InheritsClass=Smoothie::GetMeta().GetClasses().Find(szInherits);
+                pobj_InheritsClass=compiler.GetMeta().GetClasses().Find(szInherits);
             }
 
@@ -945 +947 @@
 
     // クラス情報
-    Smoothie::GetMeta().SetClasses( this->pobj_DBClass );
+    compiler.GetMeta().SetClasses( this->pobj_DBClass );
 
     //定数を取得