Changeset 322 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Sep 24, 2007, 2:58:10 PM (17 years ago)

Author:

dai_9181

Message:

コンパイラ組み込みテンプレートエンジンを実装。
静的リンクライブラリ、デバッグ情報の内部形式をテキストからバイナリに変更した。

Location:

trunk/abdev/BasicCompiler_Common

Files:

• BasicCompiler.cpp (modified) (2 diffs)
• Compile.cpp (modified) (1 diff)
• Enum.cpp (modified) (1 diff)
• Enum.h (modified) (1 diff)
• Intermediate_Step1.cpp (modified) (1 diff)
• Intermediate_Step2.cpp (modified) (2 diffs)
• MakeExe.cpp (modified) (1 diff)
• common.h (modified) (2 diffs)
• include/BoostSerializationSupport.h (modified) (1 diff)
• include/Compiler.h (modified) (1 diff)
• include/Delegate.h (added)
• include/Meta.h (modified) (4 diffs)
• include/Parameter.h (modified) (1 diff)
• include/Source.h (modified) (4 diffs)
• src/BoostSerializationSupport.cpp (modified) (3 diffs)
• src/Class.cpp (modified) (3 diffs)
• src/Delegate.cpp (added)
• src/ObjectModule.cpp (modified) (5 diffs)
• src/Parameter.cpp (added)
• src/Procedure.cpp (modified) (1 diff)
• src/Source.cpp (modified) (3 diffs)

trunk/abdev/BasicCompiler_Common/BasicCompiler.cpp

@@ -90 +90 @@
     MessageBox(0,temporary,"TestMessage",0);
 }
-void ts(char *msg){
+void ts(const char *msg){
     MessageBox(0,msg,"TestMessage",0);
 }
-void ts(char *msg,char *title){
+void ts(const char *msg,const char *title){
     MessageBox(0,msg,title,0);
 }
@@ -207 +207 @@
     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/abdev/BasicCompiler_Common/Compile.cpp

@@ -181 +181 @@
                     // ローカル領域をコンパイルしているとき
                     SetError(65,"TypeDef",cp );
+                }
+
+                //既に収集済み
+                break;
+
+            case ESC_DELEGATE:
+                if( UserProc::IsLocalAreaCompiling() ){
+                    // ローカル領域をコンパイルしているとき
+                    SetError(65,"Delegate",cp );
                 }
 

trunk/abdev/BasicCompiler_Common/Enum.cpp

@@ -168 +168 @@
 }
 
-char *CEnumParent::GenerateCodes(void){
+char *CEnumParent::GenerateSourceCode(void){
     char *buffer;
     int MaxSize,length;

trunk/abdev/BasicCompiler_Common/Enum.h

@@ -37 +37 @@
     static void DestroyEnum(void);
 
-    static char *GenerateCodes(void);
+    static char *GenerateSourceCode(void);
 };
 extern CEnumParent **ppobj_EnumParent;

trunk/abdev/BasicCompiler_Common/Intermediate_Step1.cpp

@@ -674 +674 @@
                         temporary[i2]=ESC_DEF;
                     }
+                    else if( lstrcmpi(temporary+i3,"Delegate")==0 )
+                    {
+                        i2=i3;
+                        temporary[i2++]=1;
+                        temporary[i2]=ESC_DELEGATE;
+                    }
                     break;
                 case 'e':

trunk/abdev/BasicCompiler_Common/Intermediate_Step2.cpp

@@ -261 +261 @@
                 KillStringSpaces(Command+2);
                 i2 = 2;
-                if( Command[i2] == 1 && Command[i2+1] == ESC_ENUM ){
+                if( Command[i2] == 1 && Command[i2+1] == ESC_ENUM )
+                {
                     i2 += 2;
                 }
-                else if( memicmp( Command + i2, "Blittable(", 10 ) == 0 ){
+                else if( Command[i2] == 1 && Command[i2+1] == ESC_DELEGATE )
+                {
+                    i2 += 2;
+                }
+                else if( memicmp( Command + i2, "Blittable(", 10 ) == 0 )
+                {
                     i2 += 10;
                     i2 = JumpStringInPare(Command,i2)+1;
@@ -316 +322 @@
             case ESC_NAMESPACE:
             case ESC_IMPORTS:
+            case ESC_DELEGATE:
                 KillStringSpaces(Command+2);
                 break;

trunk/abdev/BasicCompiler_Common/MakeExe.cpp

@@ -13 +13 @@
 }
 
-void AddSourceCode(char *buffer){
+void AddSourceCode(const char *buffer){
     char *temp;
     temp=(char *)HeapAlloc(hHeap,0,lstrlen(buffer)+8192);
     lstrcpy(temp,buffer);
+
+    // 改行コードをCRLFからLFにする
+    ChangeReturnCode(temp);
+
+    // コメントを除去
+    DeleteComment( temp );
 
     //エスケープシーケンス設定

trunk/abdev/BasicCompiler_Common/common.h

@@ -216 +216 @@
 void ts(int i);
 void ts(int i,int i2);
-void ts(char *msg);
-void ts(char *msg,char *title);
+void ts(const char *msg);
+void ts(const char *msg,const char *title);
 void epi_check();
 void GetRelationalPath(char *path,char *dir);
 void GetFullPath( char *path, const 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);
@@ -273 +274 @@
 //MakeExe.cpp
 void StepCompileProgress(void);
-void AddSourceCode(char *buffer);
+void AddSourceCode(const char *buffer);
 void OutputExe(void);
 int MainThread(DWORD dummy);

trunk/abdev/BasicCompiler_Common/include/BoostSerializationSupport.h

@@ -28 +28 @@
     bool WriteXmlString( std::string &xmlString ) const;
 
-    bool ReadBinary( const std::string &filePath, bool isShowExceptionMessage = true );
-    bool WriteBinary( const std::string &filePath, bool isShowExceptionMessage = true ) const;
+    bool ReadBinaryFile( const std::string &filePath, bool isShowExceptionMessage = true );
+    bool WriteBinaryFile( const std::string &filePath, bool isShowExceptionMessage = true ) const;
+    bool ReadBinaryString( const std::string &binaryString );
+    bool WriteBinaryString( std::string &binaryString ) const;
 
     bool ReadText( const std::string &filePath, bool isShowExceptionMessage = true );

trunk/abdev/BasicCompiler_Common/include/Compiler.h

@@ -8 +8 @@
 #include <ObjectModule.h>
 #include <Linker.h>
+#include <Delegate.h>
 
 class Compiler

trunk/abdev/BasicCompiler_Common/include/Meta.h

@@ -10 +10 @@
 #include <Variable.h>
 #include <Const.h>
+#include <Delegate.h>
 
 class Meta
@@ -43 +44 @@
     ProcPointers procPointers;
 
+    // デリゲート
+    Delegates delegates;
+
     // XMLシリアライズ用
 private:
@@ -60 +64 @@
         ar & BOOST_SERIALIZATION_NVP( typeDefs );
         ar & BOOST_SERIALIZATION_NVP( procPointers );
+        ar & BOOST_SERIALIZATION_NVP( delegates );
     }
 
@@ -150 +155 @@
     }
 
-    // 関数ポインタ
     ProcPointers &GetProcPointers()
     {
         return procPointers;
     }
+
+    Delegates &GetDelegates()
+    {
+        return delegates;
+    }
 };

trunk/abdev/BasicCompiler_Common/include/Parameter.h

@@ -144 +144 @@
         return (int)this->size() * PTR_SIZE;
     }
+
+    bool Analyze( const char *sourceOfParams, int nowLine );
 };

trunk/abdev/BasicCompiler_Common/include/Source.h

@@ -1 +1 @@
 #pragma once
 
+#include <map>
+#include <string>
 #include <vector>
-#include <string>
 
 #include <windows.h>
@@ -202 +203 @@
     void RemoveReturnLineUnderbar();
 
+    void Initialize( const std::string &source );
+
 public:
     BasicSource(){}
@@ -209 +212 @@
     {
     }
+    BasicSource( const std::string &source )
+    {
+        Initialize( source );
+    }
     ~BasicSource(){}
 
@@ -257 +264 @@
 };
 typedef std::vector<BasicSource> BasicSources;
+
+class SourceTemplate
+{
+    std::string source;
+public:
+    SourceTemplate( const std::string &filePath );
+    ~SourceTemplate()
+    {
+    }
+
+    std::string GetResult( const std::map<std::string,std::string> &values );
+};

trunk/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp

@@ -190 +190 @@
 }
 
-template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadBinary( const string &filePath, bool isShowExceptionMessage )
-{
-    // 入力アーカイブの作成
-    std::ifstream ifs( filePath.c_str() );
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadBinaryFile( const string &filePath, bool isShowExceptionMessage )
+{
+    // 入力アーカイブの作成
+    std::ifstream ifs( filePath.c_str(), ios::in | ios::binary );
 
     bool isSuccessful = false;
@@ -228 +228 @@
     return true;
 }
-template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::WriteBinary( const string &filePath, bool isShowExceptionMessage ) const
-{
-    // 出力アーカイブの作成
-    std::ofstream ofs( filePath.c_str() );
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::WriteBinaryFile( const string &filePath, bool isShowExceptionMessage ) const
+{
+    // 出力アーカイブの作成
+    std::ofstream ofs( filePath.c_str(), ios::out | ios::binary );
 
     bool isSuccessful = false;
@@ -267 +267 @@
 }
 
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadBinaryString( const std::string &binaryString )
+{
+    bool isSuccessful = false;
+
+    // 入力アーカイブの作成
+    std::istringstream iss( binaryString, ios::in | ios::binary );
+
+    try{
+        boost::archive::binary_iarchive ia(iss);
+
+        // 文字列ストリームから読込
+        ia >> boost::serialization::make_nvp( RootTagName(), *(T_xml_schema *)this );
+
+        isSuccessful = true;
+    }
+    catch( boost::archive::archive_exception e )
+    {
+        echo( e.what() );
+    }
+    catch(...){
+        echo( "archive_exception以外の不明な例外" );
+    }
+
+    return isSuccessful;
+}
+template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::WriteBinaryString( std::string &binaryString ) const
+{
+    // 出力アーカイブの作成
+    std::ostringstream oss( "", ios::out | ios::binary );
+
+    bool isSuccessful = false;
+    try{
+        boost::archive::binary_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以外の不明な例外" );
+    }
+
+    binaryString = oss.str();
+
+    return isSuccessful;
+}
+
 template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadText( const string &filePath, bool isShowExceptionMessage )
 {

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -957 +957 @@
 
             bool isEnum = false;
+            bool isDelegate = false;
             if( source[i] == 1 && source[i+1] == ESC_ENUM ){
                 // 列挙型の場合
                 isEnum = true;
 
-                i+=2;
+                i += 2;
+            }
+            else if( source[i] == 1 && source[i+1] == ESC_DELEGATE )
+            {
+                // デリゲートの場合
+                isDelegate = true;
+
+                i += 2;
             }
 
@@ -976 +984 @@
             if( pClass ){
                 if( source[nowLine+1] == ESC_CLASS ){
-                    if( isEnum ){
+                    if( isEnum )
+                    {
                         pClass->SetClassType( CClass::Enum );
+                    }
+                    else if( isDelegate )
+                    {
+                        pClass->SetClassType( CClass::Delegate );
                     }
                     else{
@@ -1310 +1323 @@
             }
 
-            if( basbuf[i] == 1 && basbuf[i+1] == ESC_ENUM ){
+            if( basbuf[i] == 1 && basbuf[i+1] == ESC_ENUM )
+            {
                 // 列挙型の場合
-                i+=2;
+                i += 2;
+            }
+            else if( basbuf[i] == 1 && basbuf[i+1] == ESC_DELEGATE )
+            {
+                // デリゲートの場合
+                i += 2;
             }
 

trunk/abdev/BasicCompiler_Common/src/ObjectModule.cpp

@@ -9 +9 @@
     ObjectModuleDataTypeBinaly,
 };
-const ObjectModuleDataType objectModuleDataType = ObjectModuleDataTypeText;
+const ObjectModuleDataType objectModuleDataType = ObjectModuleDataTypeBinaly;
 
 
@@ -48 +48 @@
         return ReadText( filePath );
     case ObjectModuleDataTypeBinaly:
-        return ReadBinary( filePath );
+        return ReadBinaryFile( filePath );
     default:
         Jenga::Throw( "" );
@@ -64 +64 @@
         return WriteText( filePath );
     case ObjectModuleDataTypeBinaly:
-        return WriteBinary( filePath );
+        return WriteBinaryFile( filePath );
     default:
         Jenga::Throw( "" );
@@ -80 +80 @@
         return ReadTextString( str );
     case ObjectModuleDataTypeBinaly:
-        Jenga::Throw( "" );
-        break;
+        return ReadBinaryString( str );
     default:
         Jenga::Throw( "" );
@@ -97 +96 @@
         return WriteTextString( str );
     case ObjectModuleDataTypeBinaly:
-        Jenga::Throw( "" );
-        break;
+        return WriteBinaryString( str );
     default:
         Jenga::Throw( "" );

trunk/abdev/BasicCompiler_Common/src/Procedure.cpp

@@ -55 +55 @@
     //ソースコードの位置
     this->codePos = nowLine;
+    if( nowLine == 0x10b )
+    {
+        int test=0;
+    }
 
     //パラメータ

trunk/abdev/BasicCompiler_Common/src/Source.cpp

@@ -422 +422 @@
     int i,i2;
 
+    bool isMustChange = false;
+    for( i=0; ; i++ ){
+        if( buffer[i] == '\0' ){
+            break;
+        }
+        if( buffer[i]=='\n' )
+        {
+            if( i>0 )
+            {
+                if( buffer[i-1] == '\r' )
+                {
+                    isMustChange = true;
+                }
+            }
+        }
+    }
+
+    if( !isMustChange )
+    {
+        // 改行コードの変換は必要ない
+        return;
+    }
+
 #ifdef _DEBUG
     //改行コードの整合性チェック
@@ -806 +829 @@
 }
 
+void BasicSource::Initialize( const std::string &source )
+{
+    Clear();
+    Add( source );
+
+    // 改行コードをCRLFからLFに変換
+    ChangeReturnLineChar();
+
+    // コメントを削除
+    RemoveComments();
+
+    //最終行には文字を含ませないようにする
+    if( lstrlen(buffer)>0 && buffer[lstrlen(buffer)-1] != '\n' )
+    {
+        Realloc( length + 1 );
+        lstrcat( buffer, "\n" );
+    }
+
+    // アンダーバーによる改行を正規表現に戻す
+    RemoveReturnLineUnderbar();
+}
+
 void BasicSource::SetBuffer( const char *buffer ){
     this->buffer = (char *)calloc( lstrlen(buffer) + 1, 1 );
@@ -987 +1032 @@
     return 1;
 }
+
+
+SourceTemplate::SourceTemplate( const std::string &filePath )
+{
+    Jenga::Common::File file = Jenga::Common::File( GetApplicationBaseFullPath( filePath ) );
+    source = file.Read();
+}
+std::string 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() + 2 );
+        }
+        it++;
+    }
+
+    return result;
+}