Changeset 279 in dev for trunk/abdev/BasicCompiler_Common/src

Timestamp:

Aug 14, 2007, 3:22:02 AM (17 years ago)

Author:

dai_9181

Message:

sourceをObjectModuleに入れた

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

• BoostSerializationSupport.cpp (modified) (1 diff)
• ObjectModule.cpp (modified) (2 diffs)
• Source.cpp (modified) (6 diffs)

trunk/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp

@@ -115 +115 @@
     return result;
 }
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadXmlString( const std::string &xmlString )
+{
+    bool isSuccessful = false;
+
+    // 入力アーカイブの作成
+    std::istringstream iss( xmlString );
+
+    try{
+        boost::archive::xml_iarchive ia(iss);
+
+        // 文字列ストリームから読込
+        ia >> boost::serialization::make_nvp( RootTagName(), *(T_xml_schema *)this );
+
+        isSuccessful = true;
+    }
+    catch(...){
+        // 失敗
+    }
+
+    if( !isSuccessful )
+    {
+        return false;
+    }
+
+    return true;
+}
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::WriteXmlString( std::string &xmlString ) const
+{
+    // 出力アーカイブの作成
+    std::ostringstream oss;
+
+    bool isSuccessful = false;
+    try{
+        boost::archive::xml_oarchive oa(oss);
+
+        // 文字列ストリームに書き出し
+        oa << boost::serialization::make_nvp( RootTagName(), *(T_xml_schema *)this );
+
+        isSuccessful = true;
+    }
+    catch( boost::archive::archive_exception e )
+    {
+        echo( e.what() );
+    }
+    catch(...){
+        echo( "archive_exception以外の不明な例外" );
+    }
+
+    if( !isSuccessful )
+    {
+        return false;
+    }
+
+    xmlString = oss.str();
+
+    return true;
+}
 
 template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadBinary( const string &filePath, bool isShowExceptionMessage )

trunk/abdev/BasicCompiler_Common/src/ObjectModule.cpp

@@ -2 +2 @@
 
 #include <Compiler.h>
+
+enum ObjectModuleDataType
+{
+    ObjectModuleDataTypeXml,
+    ObjectModuleDataTypeText,
+    ObjectModuleDataTypeBinaly,
+};
+const ObjectModuleDataType objectModuleDataType = ObjectModuleDataTypeText;
+
 
 void ObjectModule::StaticLink( ObjectModule &objectModule )
@@ -15 +24 @@
     dataTable.Add( objectModule.dataTable );
 }
+
+bool ObjectModule::Read( const std::string &filePath )
+{
+    switch( objectModuleDataType )
+    {
+    case ObjectModuleDataTypeXml:
+        return ReadXml( filePath );
+    case ObjectModuleDataTypeText:
+        return ReadText( filePath );
+    case ObjectModuleDataTypeBinaly:
+        return ReadBinary( filePath );
+    default:
+        Jenga::Throw( "" );
+        break;
+    }
+    return false;
+}
+bool ObjectModule::Write( const std::string &filePath ) const
+{
+    switch( objectModuleDataType )
+    {
+    case ObjectModuleDataTypeXml:
+        return WriteXml( filePath );
+    case ObjectModuleDataTypeText:
+        return WriteText( filePath );
+    case ObjectModuleDataTypeBinaly:
+        return WriteBinary( filePath );
+    default:
+        Jenga::Throw( "" );
+        break;
+    }
+    return false;
+}
+bool ObjectModule::ReadString( const std::string &str )
+{
+    switch( objectModuleDataType )
+    {
+    case ObjectModuleDataTypeXml:
+        return ReadXmlString( str );
+    case ObjectModuleDataTypeText:
+        return ReadTextString( str );
+    case ObjectModuleDataTypeBinaly:
+        Jenga::Throw( "" );
+        break;
+    default:
+        Jenga::Throw( "" );
+        break;
+    }
+    return false;
+}
+bool ObjectModule::WriteString( std::string &str ) const
+{
+    switch( objectModuleDataType )
+    {
+    case ObjectModuleDataTypeXml:
+        return WriteXmlString( str );
+    case ObjectModuleDataTypeText:
+        return WriteTextString( str );
+    case ObjectModuleDataTypeBinaly:
+        Jenga::Throw( "" );
+        break;
+    default:
+        Jenga::Throw( "" );
+        break;
+    }
+    return false;
+}

trunk/abdev/BasicCompiler_Common/src/Source.cpp

@@ -13 +13 @@
 #include <Compiler.h>
 
-
-INCLUDEFILEINFO IncludeFileInfo;
 
 const string BasicSource::generateDirectiveName = "#generate";
@@ -537 +535 @@
     char temporary[MAX_PATH],temp2[MAX_PATH+255],*LayerDir[255];
 
-    IncludeFileInfo.ppFileNames=(char **)calloc(sizeof(char *),1);
-    extern char SourceFileName[MAX_PATH];
-    IncludeFileInfo.ppFileNames[0]=(char *)malloc(lstrlen(SourceFileName)+1);
-    lstrcpy(IncludeFileInfo.ppFileNames[0],SourceFileName);
-    IncludeFileInfo.FilesNum=1;
-
     layer=0;
     FileLayer[layer]=0;
@@ -548 +540 @@
     LineNum=0;
 
+    if( includedFilesRelation.GetLineCounts() != 0 )
+    {
+        Jenga::Throw( "インクルードファイル構造の初期値が不正" );
+    }
+
+    // メインソースコード
+    extern char SourceFileName[MAX_PATH];
+    FileLayer[layer] = includedFilesRelation.AddFile( SourceFileName );
+
     //参照ディレクトリ
     LayerDir[0]=(char *)malloc(lstrlen(BasicCurDir)+1);
@@ -554 +555 @@
     for(i=0;;i++){
         if(buffer[i]=='\0'){
-            IncludeFileInfo.LineOfFile[LineNum]=-1;
             break;
         }
         if(buffer[i]=='\n'){
-            IncludeFileInfo.LineOfFile[LineNum]=FileLayer[layer];
-            LineNum++;
+            includedFilesRelation.AddLine( FileLayer[layer] );
         }
         if(i>LastFileByte[layer]){
@@ -624 +623 @@
             }
 
-            IncludeFileInfo.ppFileNames=(char **)realloc(IncludeFileInfo.ppFileNames,(IncludeFileInfo.FilesNum+1)*sizeof(char *));
-            IncludeFileInfo.ppFileNames[IncludeFileInfo.FilesNum]=(char *)malloc(lstrlen(temporary)+1);
-            lstrcpy(IncludeFileInfo.ppFileNames[IncludeFileInfo.FilesNum],temporary);
-
             layer++;
-            FileLayer[layer]=IncludeFileInfo.FilesNum;
-            IncludeFileInfo.FilesNum++;
+            FileLayer[layer] = includedFilesRelation.AddFile( temporary );
 
             //#requireの場合では、既に読み込まれているファイルは読み込まないようにする
@@ -926 +920 @@
     lstrcat( this->buffer, buffer );
 }
+
+bool BasicSource::GetLineInfo( int sourceCodePos, int &line, std::string &filePath )
+{
+    int i2,i3,i4,i5;
+
+    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;
+    }
+
+    if( includedFilesRelation.GetLineCounts() < i2 )
+    {
+        Jenga::Throw( "BasicSource::GetLineInfoメソッドで不正な行の情報を取得しようとした" );
+
+        //ファイル・行番号を特定できなかった場合
+        line = -1;
+        filePath = "";
+        return false;
+    }
+
+    i4=0;
+    while( includedFilesRelation.GetFileNumber( i2 ) != includedFilesRelation.GetFileNumber( i4 ) )
+    {
+        i4++;
+    }
+    for(i3=0,i5=0;i5<i4;i3++){
+        if(buffer[i3]=='\n') i5++;
+        if(buffer[i3]=='\0') return 0;
+    }
+    for(i5=0;i4<i2;i3++){
+        if(buffer[i3]=='\n'){
+            i4++;
+            i5++;
+            if( includedFilesRelation.GetFileNumber( i2 ) < includedFilesRelation.GetFileNumber( i4 ) )
+            {
+                for( ;includedFilesRelation.GetFileNumber( i2 ) != includedFilesRelation.GetFileNumber( i4 ); i3++ ){
+                    if(buffer[i3]=='\n') i4++;
+                }
+            }
+        }
+        if(buffer[i3]=='\0') return 0;
+    }
+
+    //行番号をセット
+    line = i5;
+
+    //ファイル名をセット
+    filePath = includedFilesRelation.GetFilePath( i2 );
+
+    return 1;
+}