Changeset 336 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Sep 29, 2007, 12:45:16 PM (17 years ago)

Author:

dai_9181

Message:

静的メソッドのデリゲートに対応

Location:

trunk/abdev/BasicCompiler_Common

Files:

• include/Method.h (modified) (3 diffs)
• include/Procedure.h (modified) (1 diff)
• include/ver.h (modified) (1 diff)
• src/Procedure.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/include/Method.h

@@ -55 +55 @@
     virtual bool IsVirtual() const = 0;
     virtual bool IsConst() const = 0;
+    virtual bool IsDynamic() const = 0;
     virtual bool IsStatic() const = 0;
     virtual const CClass *GetInheritsClassPtr() const = 0;
@@ -118 +119 @@
         return isConst;
     }
+    virtual bool IsDynamic() const
+    {
+        return true;
+    }
     virtual bool IsStatic() const
     {
@@ -159 +164 @@
     }
     virtual bool IsConst() const{SetError();return false;}
+    virtual bool IsDynamic() const
+    {
+        return false;
+    }
     virtual bool IsStatic() const
     {

trunk/abdev/BasicCompiler_Common/include/Procedure.h

@@ -348 +348 @@
         this->pMethod = pMethod;
     }
+    const CMethod &GetMethod() const;
 
     bool SetParamsAndReturnType( const char *sourceOfParams, int nowLine, bool isStatic );

trunk/abdev/BasicCompiler_Common/include/ver.h

@@ -6 +6 @@
 // バージョン付加文字列
 #ifdef _AMD64_
-#define VER_INFO        "(x64) (rev.338)"
+#define VER_INFO        "(x64) (rev.342)"
 #else
-#define VER_INFO        "(rev.338)"
+#define VER_INFO        "(rev.342)"
 #endif

trunk/abdev/BasicCompiler_Common/src/Procedure.cpp

@@ -46 +46 @@
     }
     return ( pMethod->IsVirtual() != 0 );
+}
+const CMethod &UserProc::GetMethod() const
+{
+    if( !HasParentClass() )
+    {
+        Jenga::Throw( "グローバル関数に対してUserProc::GetMethodメソッドが呼ばれた" );
+    }
+    return *pMethod;
 }