Changeset 739 in dev for trunk

Timestamp:

Sep 6, 2008, 11:32:10 PM (16 years ago)

Author:

dai

Message:

BasicSource::GetLineFromIndex関数を導入。

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/VarList.cpp (modified) (1 diff)
• ab_common/include/Lexical/Source.h (modified) (1 diff)
• ab_common/src/Lexical/Source.cpp (modified) (6 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/VarList.cpp

@@ -644 +644 @@
         extern HWND hMainDlg;
         //"デバッグ情報の取得に失敗"
-        MessageBox(hMainDlg,STRING_DEBUG_FAILED,"ActiveBasic error",MB_OK);
+        MyAssertMsg( false, STRING_DEBUG_FAILED );
         return 0;
     }

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

@@ -211 +211 @@
     void _ResetLength()
     {
-        length = strlen( buffer );
-    }
+        length = static_cast<int>(strlen( buffer ));
+    }
+
+    // 指定したインデックスが何行目かを取得
+    bool GetLineFromIndex( int index, int &result ) const;
 
     const IncludedFilesRelation &GetIncludedFilesRelation() const

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

@@ -353 +353 @@
 
 void BasicSource::ChangeReturnLineChar(){
-    int i,i2;
+    int i;
 
     bool isMustChange = false;
@@ -801 +801 @@
 }
 
+// 指定したインデックスが何行目かを取得
+bool BasicSource::GetLineFromIndex( int index, int &result ) const
+{
+    result = 0;
+    for( int i=2; i<index; i++ )
+    {
+        if( this->buffer[i] == '\n' )
+        {
+            result ++;
+        }
+        if( this->buffer[i] == '\0' )
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
 void BasicSource::SetBuffer( const char *buffer ){
     this->buffer = (char *)calloc( strlen(buffer) + 1, 1 );
@@ -869 +887 @@
 bool BasicSource::GetLineInfo( int sourceCodePos, int &line, std::string &filePath ) const
 {
+    const char *buffer = this->GetBuffer();
+    if( this->GetLength() < sourceCodePos )
+    {
+        char temp[256];
+        strncpy( temp, buffer, 100 );
+        strcat( temp, "..." );
+        MyAssertMsg( false, ( (std::string)"下記ソースコードの" + Jenga::Common::ToString( sourceCodePos ) + "バイト目（存在しない箇所）を参照しようとした。\n\n" + temp ).c_str() );
+        return false;
+    }
+
+    int i = sourceCodePos;
     int i2,i3,i4,i5;
-
-    const char *buffer = GetBuffer();
-    int i = sourceCodePos;
-
     if(buffer[i]=='\n') i--;
-    for(i3=0,i2=0;i3<i;i3++){
-        if(buffer[i3]=='\n') i2++;
-        if(buffer[i3]=='\0') return 0;
-    }
+    bool result = this->GetLineFromIndex( i, i2 );
+    MyAssert( result );
 
     if( includedFilesRelation.GetLineCounts() <= i2 )
     {
-        //Jenga::Throw( "BasicSource::GetLineInfoメソッドで不正な行の情報を取得しようとした" );
+        MyAssertMsg( false, "BasicSource::GetLineInfoメソッドで不正な行の情報を取得しようとした" );
 
         //ファイル・行番号を特定できなかった場合
@@ -897 +920 @@
     for(i3=0,i5=0;i5<i4;i3++){
         if(buffer[i3]=='\n') i5++;
-        if(buffer[i3]=='\0') return 0;
+        if(buffer[i3]=='\0')
+        {
+            MyAssert( false );
+            return false;
+        }
     }
     for(i5=0;i4<i2;i3++){
@@ -910 +937 @@
             }
         }
-        if(buffer[i3]=='\0') return 0;
+        if(buffer[i3]=='\0')
+        {
+            MyAssert( false );
+            return false;
+        }
     }
 
@@ -919 +950 @@
     filePath = includedFilesRelation.GetFilePath( i2 );
 
-    return 1;
+    return true;
 }