Changeset 87 in dev for BasicCompiler_Common

Timestamp:

Apr 1, 2007, 2:28:03 AM (18 years ago)

Author:

dai_9181

Message:

House::Metaを追加。
Source.h/Source.cppを追加（実装はこれから）。

Location:

BasicCompiler_Common

Files:

• Class.cpp (modified) (1 diff)
• Class.h (modified) (1 diff)
• DebugMiddleFile.cpp (modified) (3 diffs)
• Subroutine.cpp (modified) (2 diffs)
• Type.cpp (modified) (2 diffs)
• TypeDef.cpp (modified) (2 diffs)
• VariableOpe.cpp (modified) (1 diff)
• include/House.h (modified) (1 diff)
• include/Source.h (added)
• src/House.cpp (modified) (1 diff)
• src/Source.cpp (added)

BasicCompiler_Common/Class.cpp

@@ -1424 +1424 @@
 }
 
+void CDBClass::GenerateRuntimeTypeInfo(){
+}
+
+
+
 CClass *CDBClass::GetStringClass() const
 {

BasicCompiler_Common/Class.h

@@ -217 +217 @@
     void GetClass_recur(const char *lpszInheritsClass);
     void GetAllClassInfo(void);
+    void GenerateRuntimeTypeInfo();
 
 

BasicCompiler_Common/DebugMiddleFile.cpp

@@ -138 +138 @@
     // TypeDef情報
     //////////////////
-    *(long *)(buffer+i2)=(int)House::typeDefs.size();
-    i2+=sizeof(long);
-    for(i3=0;i3<(int)House::typeDefs.size();i3++){
-        lstrcpy(buffer+i2,House::typeDefs[i3].GetNewName().c_str() );
-        i2+=lstrlen(buffer+i2)+1;
-
-        lstrcpy(buffer+i2,House::typeDefs[i3].GetBaseName().c_str() );
+    *(long *)(buffer+i2)=(int)House::Meta::typeDefs.size();
+    i2+=sizeof(long);
+    for(i3=0;i3<(int)House::Meta::typeDefs.size();i3++){
+        lstrcpy(buffer+i2,House::Meta::typeDefs[i3].GetNewName().c_str() );
+        i2+=lstrlen(buffer+i2)+1;
+
+        lstrcpy(buffer+i2,House::Meta::typeDefs[i3].GetBaseName().c_str() );
         i2+=lstrlen(buffer+i2)+1;
 
@@ -505 +505 @@
 
     //初期化
-    House::typeDefs.clear();
+    House::Meta::typeDefs.clear();
 
     //個数を取得
@@ -514 +514 @@
         i2+=lstrlen(buffer+i2)+1;
 
-        House::typeDefs.push_back( TypeDef( temp5, buffer+i2 ) );
+        House::Meta::typeDefs.push_back( TypeDef( temp5, buffer+i2 ) );
 
         i2+=lstrlen(buffer+i2)+1;

BasicCompiler_Common/Subroutine.cpp

@@ -180 +180 @@
         GetVarType(fullCallName,type,false);
 
-        ProcPointer *pProcPtr = House::procPointers[type.GetIndex()];
+        ProcPointer *pProcPtr = House::Meta::procPointers[type.GetIndex()];
         resultType = pProcPtr->ReturnType();
 
@@ -781 +781 @@
     pProcPointer->SetParamsAndReturnType( paramStr.c_str(), nowLine );
 
-    House::procPointers.push_back( pProcPointer );
-
-    return (int)House::procPointers.size()-1;
+    House::Meta::procPointers.push_back( pProcPointer );
+
+    return (int)House::Meta::procPointers.size()-1;
 }
 void DeleteProcPtrInfo(void){
-    BOOST_FOREACH( ProcPointer *pProcPointer, House::procPointers ){
+    BOOST_FOREACH( ProcPointer *pProcPointer, House::Meta::procPointers ){
         delete pProcPointer;
     }
 
-    House::procPointers.clear();
-}
+    House::Meta::procPointers.clear();
+}

BasicCompiler_Common/Type.cpp

@@ -89 +89 @@
     // TypeDefされた型
     ////////////////////
-    int i=House::typeDefs.GetIndex( typeName.c_str() );
+    int i=House::Meta::typeDefs.GetIndex( typeName.c_str() );
     if(i!=-1){
-        type = House::typeDefs[i].GetBaseType();
+        type = House::Meta::typeDefs[i].GetBaseType();
         return true;
     }
@@ -463 +463 @@
         }
         else{
-            if( House::procPointers[index]->ReturnType().IsNull() ){
+            if( House::Meta::procPointers[index]->ReturnType().IsNull() ){
                 return "*Sub";
             }

BasicCompiler_Common/TypeDef.cpp

@@ -126 +126 @@
     cp = nowLine;
 
-    House::typeDefs.Add(temporary,pTemp);
+    House::Meta::typeDefs.Add(temporary,pTemp);
 }
 
@@ -164 +164 @@
                     if(basbuf[i]=='\0') break;
                 }
-                House::typeDefs.Add(temporary,"Long");
+                House::Meta::typeDefs.Add(temporary,"Long");
             }
         }

BasicCompiler_Common/VariableOpe.cpp

@@ -220 +220 @@
         if(lpIndex==-1) lstrcpy(name,"VoidPtr");
         else{
-            if( House::procPointers[lpIndex]->ReturnType().IsNull() )
+            if( House::Meta::procPointers[lpIndex]->ReturnType().IsNull() )
                 lstrcpy(name,"*Sub");
             else lstrcpy(name,"*Function");

BasicCompiler_Common/include/House.h

@@ -1 +1 @@
 #pragma once
 
+#include "Source.h"
 #include "../TypeDef.h"
 
 class House{
 public:
-    // TypeDef
-    static TypeDefCollection typeDefs;
-    static vector<ProcPointer *> procPointers;
+
+    class Lexical{
+    public:
+        static BasicSource source;
+    };
+
+    class Meta{
+    public:
+        // TypeDef
+        static TypeDefCollection typeDefs;
+        static vector<ProcPointer *> procPointers;
+    };
 };

BasicCompiler_Common/src/House.cpp

@@ -1 +1 @@
 #include <..\common.h>
 
-TypeDefCollection House::typeDefs;
-vector<ProcPointer *> House::procPointers;
+TypeDefCollection House::Meta::typeDefs;
+vector<ProcPointer *> House::Meta::procPointers;