Changeset 465 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src/Exception.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/src/Exception.cpp (modified) (13 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/src/Exception.cpp

@@ -120 +120 @@
         if( isDefinedFinally )
         {
-            SetError(71,NULL,cp);
+            compiler.errorMessenger.Output(71,NULL,cp);
             return;
         }
@@ -146 +146 @@
         if( isDefinedFinally )
         {
-            SetError(70,NULL,cp);
+            compiler.errorMessenger.Output(70,NULL,cp);
             return;
         }
@@ -173 +173 @@
         if( !isDefinedFinally )
         {
-            SetError();
+            compiler.errorMessenger.OutputFatalError();
         }
 
@@ -259 +259 @@
     if( tryScopes.size() == 0 )
     {
-        SetError(1,NULL,cp);
+        compiler.errorMessenger.Output(1,NULL,cp);
         return;
     }
@@ -271 +271 @@
         if( !typeName[0] )
         {
-            SetError(72,NULL,cp);
+            compiler.errorMessenger.Output(72,NULL,cp);
         }
         else
@@ -277 +277 @@
             if( !compiler.StringToType( typeName, paramType ) )
             {
-                SetError(74,typeName,cp);
+                compiler.errorMessenger.Output(74,typeName,cp);
             }
             else
@@ -283 +283 @@
                 if( !paramType.IsObject() )
                 {
-                    SetError(73,typeName,cp);
+                    compiler.errorMessenger.Output(73,typeName,cp);
                 }
             }
@@ -296 +296 @@
     if( paramType.IsObject() )
     {
-        sprintf( temporary, "Dim %s = Thread.CurrentThread().__GetThrowintParamObject() As %s", varName, paramType.GetClass().GetFullName().c_str() );
+        sprintf( temporary, "Dim %s = System.Threading.Thread.CurrentThread().__GetThrowintParamObject() As %s", varName, paramType.GetClass().GetFullName().c_str() );
         MakeMiddleCode( temporary );
         ChangeOpcode( temporary );
     }
-    lstrcpy( temporary, "Thread.CurrentThread().__Catched()" );
+    lstrcpy( temporary, "System.Threading.Thread.CurrentThread().__Catched()" );
     MakeMiddleCode( temporary );
     ChangeOpcode( temporary );
@@ -326 +326 @@
     if( tryScopes.size() == 0 )
     {
-        SetError(12,"End Try",cp);
+        compiler.errorMessenger.Output(12,"End Try",cp);
         return;
     }
@@ -333 +333 @@
     {
         // CatchもFinallyも存在しないとき
-        SetError(-108,NULL,tryScopes.back().GetSourceCodePos() );
+        compiler.errorMessenger.Output(-108,NULL,tryScopes.back().GetSourceCodePos() );
     }
 
@@ -364 +364 @@
     while( tryScopes.size() > 0 )
     {
-        SetError(22, "Try", tryScopes.back().GetSourceCodePos() );
+        compiler.errorMessenger.Output(22, "Try", tryScopes.back().GetSourceCodePos() );
 
         EndTryCommand( true );
@@ -393 +393 @@
     if( tryScopes.size() == 0 )
     {
-        SetError(1,NULL,cp);
+        compiler.errorMessenger.Output(1,NULL,cp);
         return;
     }
@@ -424 +424 @@
     if( tryScopes.size() == 0 )
     {
-        SetError(1,NULL,cp);
+        compiler.errorMessenger.Output(1,NULL,cp);
         return;
     }