Changeset 641 in dev for trunk/ab5.0/abdev/ab_common

Timestamp:

Jun 15, 2008, 11:59:46 PM (16 years ago)

Author:

dai_9181

Message:

・デバッグトレース時、グローバル領域の終端行でステップインまたはステップアウトしたときにデバッグ情報の取得に失敗して強制終了してしまう不具合を修正。
・グローバル領域のデバッグ実行ができなくなっている不具合を修正。

Location:

trunk/ab5.0/abdev/ab_common

Files:

• include/Lexical/NativeCode.h (modified) (1 diff)
• include/Lexical/Procedure.h (modified) (4 diffs)
• src/Lexical/NativeCode.cpp (modified) (3 diffs)
• src/Lexical/Procedure.cpp (modified) (3 diffs)
• src/Lexical/Source.cpp (modified) (1 diff)

trunk/ab5.0/abdev/ab_common/include/Lexical/NativeCode.h

@@ -244 +244 @@
         return sourceLines;
     }
-    void NextSourceLine( const SourceCodePosition &sourceCodePosition );
+    void NextSourceLine( const SourceCodePosition &sourceCodePosition, bool isInSystemProc );
 
     void ResetDataSectionBaseOffset( long dataSectionBaseOffset );

trunk/ab5.0/abdev/ab_common/include/Lexical/Procedure.h

@@ -136 +136 @@
     // 各種フラグ
     bool isExport;
-    mutable bool isSystem;
+    mutable bool isAutoGenerationSystem;
     mutable bool isAutoGeneration;
     mutable bool isCompiled;
@@ -180 +180 @@
         ar & BOOST_SERIALIZATION_NVP( realSecondParmNum );
         ar & BOOST_SERIALIZATION_NVP( isExport );
-        ar & BOOST_SERIALIZATION_NVP( isSystem );
+        ar & BOOST_SERIALIZATION_NVP( isAutoGenerationSystem );
         ar & BOOST_SERIALIZATION_NVP( isAutoGeneration );
         ar & BOOST_SERIALIZATION_NVP( isCompiled );
@@ -275 +275 @@
         return isExport;
     }
-    void ThisIsSystemProc() const
-    {
-        isSystem = true;
-    }
-    bool IsSystem() const
-    {
-        return isSystem;
+    void ThisIsAutoGenerationSystemProc() const
+    {
+        isAutoGenerationSystem = true;
+    }
+    bool IsAutoGenerationSystem() const
+    {
+        return isAutoGenerationSystem;
     }
     void ThisIsAutoGenerationProc() const
@@ -291 +291 @@
         return isAutoGeneration;
     }
+    bool IsSystem() const;
     void CompleteCompile() const
     {

trunk/ab5.0/abdev/ab_common/src/Lexical/NativeCode.cpp

@@ -161 +161 @@
 }
 
-void NativeCode::NextSourceLine( const SourceCodePosition &sourceCodePosition )
+void NativeCode::NextSourceLine( const SourceCodePosition &sourceCodePosition, bool isInSystemProc )
 {
     if( sourceLines.size() )
@@ -173 +173 @@
 
     extern BOOL bDebugSupportProc;
-    extern BOOL bSystemProc;
     DWORD sourceLineType = 0;
     if( bDebugSupportProc )
@@ -179 +178 @@
         sourceLineType |= CODETYPE_DEBUGPROC;
     }
-    if( bSystemProc )
+    if( isInSystemProc )
     {
         sourceLineType |= CODETYPE_SYSTEMPROC;

trunk/ab5.0/abdev/ab_common/src/Lexical/Procedure.cpp

@@ -44 +44 @@
     , realSecondParmNum( 1 )
     , isExport( isExport )
-    , isSystem( false )
+    , isAutoGenerationSystem( false )
     , isAutoGeneration( false )
     , isCompiled( false )
@@ -65 +65 @@
     , realSecondParmNum( userProc.realSecondParmNum )
     , isExport( userProc.isExport )
-    , isSystem( userProc.isSystem )
+    , isAutoGenerationSystem( userProc.isAutoGenerationSystem )
     , isAutoGeneration( userProc.isAutoGeneration )
     , isCompiled( false )
@@ -138 +138 @@
     return false;
 }
+bool UserProc::IsSystem() const
+{
+    // "_System_" を名前の先頭に含む関数
+    if( memcmp( this->GetName().c_str(), "_System_", 8 ) == 0 )
+    {
+        return true;
+    }
+
+    // "_System_" を名前の先頭に含むクラスのメソッド
+    if( this->HasParentClass() )
+    {
+        if( memcmp( this->GetParentClass().GetName().c_str(), "_System_", 8 ) == 0 )
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
 const NamespaceScopes &UserProc::GetNamespaceScopes() const
 {

trunk/ab5.0/abdev/ab_common/src/Lexical/Source.cpp

@@ -900 +900 @@
     }
 
-    if( includedFilesRelation.GetLineCounts() < i2 )
+    if( includedFilesRelation.GetLineCounts() <= i2 )
     {
         //Jenga::Throw( "BasicSource::GetLineInfoメソッドで不正な行の情報を取得しようとした" );