Changeset 412 in dev for trunk

Timestamp:

Mar 3, 2008, 10:11:34 PM (17 years ago)

Author:

dai_9181

Message:

CClass::GetStaticDefiningStringAsMemberOffsetsメソッドを追加。
エラーコード142を追加。

Location:

trunk/abdev

Files:

• BasicCompiler32/NumOpe.cpp (modified) (1 diff)
• BasicCompiler_Common/NumOpe_GetType.cpp (modified) (1 diff)
• BasicCompiler_Common/error.cpp (modified) (1 diff)
• BasicCompiler_Common/include/Class.h (modified) (1 diff)
• BasicCompiler_Common/src/Class.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler32/NumOpe.cpp

@@ -407 +407 @@
 
     if(lstrcmpi(termFull,"This")==0 && isProcedureCallOnly == false ){
+        if( compiler.pCompilingClass == NULL )
+        {
+            SetError(142,NULL,cp);
+            return false;
+        }
+
         //Thisオブジェクト
         resultType.SetType( DEF_OBJECT, compiler.pCompilingClass );

trunk/abdev/BasicCompiler_Common/NumOpe_GetType.cpp

@@ -438 +438 @@
 
     if(lstrcmpi(termFull,"This")==0){
+        if( compiler.pCompilingClass == NULL )
+        {
+            return false;
+        }
+
         //Thisオブジェクト
         resultType.SetType( DEF_OBJECT, compiler.pCompilingClass );

trunk/abdev/BasicCompiler_Common/error.cpp

@@ -213 +213 @@
     if(num==140) lstrcpy(msg,"Align修飾子を構造体以外の型に指定することはできません。");
     if(num==141) lstrcpy(msg,"Blittable修飾子をクラス以外の型に指定することはできません。");
+    if(num==142) lstrcpy(msg,"不正なThis参照です。");
 
     //Enum関連

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -564 +564 @@
     std::string GetStaticDefiningStringAsMemberNames() const;
     std::string GetStaticDefiningStringAsMemberTypeInfoNames() const;
+    std::string GetStaticDefiningStringAsMemberOffsets() const;
 
 

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -1382 +1382 @@
                 sprintf(
                     temporary,
-                    "tempType.SetMembers([%s],[%s],%d)",
+                    "tempType.SetMembers([%s],[%s],[%s],%d)",
                     objClass.GetStaticDefiningStringAsMemberNames().c_str(),
                     objClass.GetStaticDefiningStringAsMemberTypeInfoNames().c_str(),
+                    objClass.GetStaticDefiningStringAsMemberOffsets().c_str(),
                     objClass.GetDynamicMembers().size()
                 );
@@ -1555 +1556 @@
     return result;
 }
-
+std::string CClass::GetStaticDefiningStringAsMemberOffsets() const
+{
+    std::string result;
+
+    BOOST_FOREACH( const CMember *pMember, dynamicMembers )
+    {
+        if( result.size() )
+        {
+            result += ",";
+        }
+
+        int offset = this->GetMemberOffset( pMember->GetName().c_str() );
+
+        char temporary[255];
+        itoa( offset, temporary, 16 );
+
+        result += (std::string)"&H" + temporary;
+    }
+
+    return result;
+}