Changeset 465 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/include

Timestamp:

Mar 24, 2008, 8:05:20 PM (16 years ago)

Author:

dai_9181

Message:

Messenger/ErrorMessengerクラスを導入。SetError関数によるエラー生成を廃止した。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common/include

Files:

• Compiler.h (modified) (2 diffs)
• Messenger.h (added)
• Method.h (modified) (4 diffs)
• NativeCode.h (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/include/Compiler.h

@@ -1 +1 @@
 #pragma once
 
+#include <Messenger.h>
 #include <CodeGenerator.h>
 #include <NamespaceSupporter.h>
@@ -85 +86 @@
         return namespaceSupporter;
     }
+
+    // メッセンジャー
+    Messenger messenger;
+    ErrorMessenger errorMessenger;
 
     // コード生成機構

trunk/ab5.0/abdev/BasicCompiler_Common/include/Method.h

@@ -5 +5 @@
 class UserProc;
 class CClass;
-void SetError();
 
 class CMethod : public MemberPrototype
@@ -175 +174 @@
     }
 
-    virtual bool Override( const UserProc *pUserProc, Prototype::Accessibility accessibility, bool isOverrideModifier ){SetError();return false;}
-
-    virtual bool IsAbstract() const{SetError();return false;}
-    virtual void SetAbstractMark( bool isAbstract ){SetError();}
+    virtual bool Override( const UserProc *pUserProc, Prototype::Accessibility accessibility, bool isOverrideModifier )
+    {
+        throw;
+    }
+
+    virtual bool IsAbstract() const
+    {
+        throw;
+    }
+    virtual void SetAbstractMark( bool isAbstract )
+    {
+        throw;
+    }
     virtual bool IsVirtual() const{
         return false;
     }
-    virtual bool IsConst() const{SetError();return false;}
+    virtual bool IsConst() const
+    {
+        throw;
+    }
     virtual bool IsDynamic() const
     {
@@ -191 +202 @@
         return true;
     }
-    virtual const CClass *GetInheritsClassPtr() const{SetError();return NULL;}
-    virtual void SetInheritsClassPtr( const CClass *pInheritsClass ){SetError();}
+    virtual const CClass *GetInheritsClassPtr() const
+    {
+        throw;
+    }
+    virtual void SetInheritsClassPtr( const CClass *pInheritsClass )
+    {
+        throw;
+    }
     virtual bool IsNotUse() const
     {
@@ -199 +216 @@
     virtual void SetNotUseMark( bool isNotUse )
     {
-        SetError();
+        throw;
     }
 };

trunk/ab5.0/abdev/BasicCompiler_Common/include/NativeCode.h

@@ -119 +119 @@
         return lpValue;
     }
-    const ::DllProc &GetDllProc() const
-    {
-        if( type != Schedule::DllProc )
-        {
-            SetError();
-        }
-        return *pDllProc;
-    }
-    const ::UserProc &GetUserProc() const
-    {
-        if( !( type == Schedule::UserProc || type == Schedule::AddressOf || type == Schedule::CatchAddress ) )
-        {
-            SetError();
-        }
-        return *pUserProc;
-    }
-    const ::CClass &GetClass() const
-    {
-        if( !( type == Schedule::ComVtbl || type == Schedule::Vtbl || type == Schedule::TypeInfo ) )
-        {
-            SetError();
-        }
-        return *pClass;
-    }
-
-    void SpecifyAddressOf()
-    {
-        if( type != Schedule::UserProc )
-        {
-            SetError();
-        }
-        type = Schedule::AddressOf;
-    }
-    void SpecifyCatchAddress()
-    {
-        if( type != Schedule::UserProc )
-        {
-            SetError();
-        }
-        type = Schedule::CatchAddress;
-    }
+    const ::DllProc &GetDllProc() const;
+    const ::UserProc &GetUserProc() const;
+    const ::CClass &GetClass() const;
+
+    void SpecifyAddressOf();
+    void SpecifyCatchAddress();
 };
 typedef std::vector<Schedule> Schedules;