Changeset 828 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/include/Messenger.h

Timestamp:

Mar 19, 2012, 1:59:48 AM (12 years ago)

Author:

イグトランス (egtra)

Message:

egtraブランチの内容をマージ。

Location:

trunk

Files:

• . (modified) (1 prop)
• ab5.0/abdev (modified) (1 prop)
• ab5.0/abdev/BasicCompiler_Common/include/Messenger.h (modified) (4 diffs)

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

@@ +1 @@
+#pragma once
 
 class Messenger
@@ -23 +24 @@
     {
     }
+
     ErrorInfo( int errorCode, const std::string &keyword, int sourceIndex );
+
+    ErrorInfo(ErrorInfo&& y)
+        : errorCode(std::move(y.errorCode))
+        , keyword(std::move(y.keyword))
+        , sourceFilePath(std::move(y.sourceFilePath))
+        , sourceLineNum(std::move(y.sourceLineNum))
+        , errorLineNum(std::move(y.errorLineNum))
+    {
+    }
+
+    ErrorInfo(ErrorInfo const& y)
+        : errorCode(y.errorCode)
+        , keyword(y.keyword)
+        , sourceFilePath(y.sourceFilePath)
+        , sourceLineNum(y.sourceLineNum)
+        , errorLineNum(y.errorLineNum)
+    {
+    }
+
+    ErrorInfo& operator =(ErrorInfo&& y)
+    {
+        errorCode = std::move(y.errorCode);
+        keyword = std::move(y.keyword);
+        sourceFilePath = std::move(y.sourceFilePath);
+        sourceLineNum = std::move(y.sourceLineNum);
+        errorLineNum = std::move(y.errorLineNum);
+        return *this;
+    }
+
+    ErrorInfo& operator =(ErrorInfo const& y)
+    {
+        return *this = std::move(ErrorInfo(y));
+    }
 
     int GetErrorCode() const
@@ -62 +97 @@
 
 public:
+    ErrorMessenger() {}
+
     void Output( const ErrorInfo &errorInfo );
     void Output( int errorCode, const std::string &keyword, int sourceIndex = -1 );
@@ -74 +111 @@
 
     void ShowErrorLine( int errorLineNum );
+
+private:
+    ErrorMessenger(ErrorMessenger const&);
+    ErrorMessenger& operator =(ErrorMessenger const&);
 };