Changeset 625 in dev for trunk/ab5.0/abdev/BasicCompiler_Common

Timestamp:

May 27, 2008, 9:17:34 PM (16 years ago)

Author:

dai_9181

Message:

・WindowInfoクラスをリファクタリング
・MdiInfoを単純配列からvectorに変更した。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• BasicCompiler.cpp (modified) (1 diff)
• common.h (modified) (1 diff)
• include/LexicalAnalyzer.h (modified) (1 diff)
• src/LexicalAnalyzer.cpp (modified) (1 diff)
• src/LexicalAnalyzer_Delegate.cpp (modified) (1 diff)

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

@@ -211 +211 @@
     lstrcat(temporary,path+i);
     lstrcpy(path,temporary);
-}
-std::string GetApplicationBaseFullPath( const std::string &relationalPath )
-{
-    char fullPath[1024];
-    lstrcpy( fullPath, relationalPath.c_str() );
-    GetFullPath( fullPath, Jenga::Common::Environment::GetAppDir() );
-    return fullPath;
 }
 

trunk/ab5.0/abdev/BasicCompiler_Common/common.h

@@ -217 +217 @@
 void GetRelationalPath(char *path,char *dir);
 void GetFullPath( char *path, const std::string &baseDirPath );
-std::string GetApplicationBaseFullPath( const std::string &relationalPath );
 void ShowErrorLine(int LineNum,const char *FileName);
 BOOL GetFilePathDialog(HWND hwnd,char *filename,LPSTR Filter,LPSTR Title,BOOL bOpen);

trunk/ab5.0/abdev/BasicCompiler_Common/include/LexicalAnalyzer.h

@@ -6 +6 @@
 class LexicalAnalyzer
 {
-    class SourceTemplate
-    {
-        std::string source;
-    public:
-        SourceTemplate( const std::string &filePath );
-        ~SourceTemplate()
-        {
-        }
-
-        std::string GetResult( const std::map<std::string,std::string> &values );
-    };
-
 public:
 

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

@@ -2 +2 @@
 
 using namespace ActiveBasic::Compiler;
-
-LexicalAnalyzer::SourceTemplate::SourceTemplate( const std::string &filePath )
-{
-    Jenga::Common::File file = Jenga::Common::File( GetApplicationBaseFullPath( filePath ) );
-    source = file.Read();
-}
-std::string LexicalAnalyzer::SourceTemplate::GetResult( const std::map<std::string,std::string> &values )
-{
-    std::string result = source;
-
-    std::map<std::string,std::string>::const_iterator it = values.begin();
-    while( it != values.end() )
-    {
-        while( true )
-        {
-            std::string::size_type index = result.find( it->first );
-            if( index == std::string::npos )
-            {
-                break;
-            }
-
-            result = result.substr( 0, index ) + it->second + result.substr( index + it->first.length() );
-        }
-        it++;
-    }
-
-    return result;
-}
-
 
 bool LexicalAnalyzer::CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection )

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

@@ -124 +124 @@
     std::string destSource = "";
 
-    SourceTemplate sourceTemplate( ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\templates\\delegate_class.tab" );
+    Jenga::Common::SourceTemplate sourceTemplate( ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\templates\\delegate_class.tab" );
 
     delegates.Iterator_Reset();