Changeset 371 in dev for trunk/abdev

Timestamp:

Nov 15, 2007, 6:57:26 PM (17 years ago)

Author:

dai_9181

Message:

パラメータなしのCatchが無限ループしてしまうバグを修正

Location:

trunk/abdev/BasicCompiler_Common

Files:

• include/ver.h (modified) (1 diff)
• src/Exception.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/include/ver.h

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

trunk/abdev/BasicCompiler_Common/src/Exception.cpp

@@ -173 +173 @@
         if( !isDefinedFinally )
         {
-            Finally();
+            SetError();
         }
 
@@ -284 +284 @@
     tryScopes.back().Catch( paramType );
 
+    int backCp = cp;
+
+    char temporary[1024];
     if( paramType.IsObject() )
     {
-        int backCp = cp;
-
-        char temporary[1024];
         sprintf( temporary, "Dim %s = Thread.CurrentThread().__GetThrowintParamObject() As %s", varName, paramType.GetClass().GetFullName().c_str() );
         MakeMiddleCode( temporary );
         ChangeOpcode( temporary );
-        lstrcpy( temporary, "Thread.CurrentThread().__Catched()" );
-        MakeMiddleCode( temporary );
-        ChangeOpcode( temporary );
-
-        cp = backCp;
-    }
+    }
+    lstrcpy( temporary, "Thread.CurrentThread().__Catched()" );
+    MakeMiddleCode( temporary );
+    ChangeOpcode( temporary );
+
+    cp = backCp;
 }
 void FinallyCommand()