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

Timestamp:

Mar 19, 2012, 1:59:48 AM (13 years ago)

Author:

イグトランス (egtra)

Message:

egtraブランチの内容をマージ。

Location:

trunk

Files:

• . (modified) (1 prop)
• ab5.0/abdev (modified) (1 prop)
• ab5.0/abdev/BasicCompiler_Common/BasicCompiler.cpp (modified) (12 diffs)
• ab5.0/abdev/BasicCompiler_Common/BasicCompiler.h (modified) (1 diff)
• ab5.0/abdev/BasicCompiler_Common/CDebugThreadInfo.cpp (modified) (4 diffs)
• ab5.0/abdev/BasicCompiler_Common/Debug.cpp (modified) (9 diffs)
• ab5.0/abdev/BasicCompiler_Common/Diagnose.cpp (modified) (5 diffs)
• ab5.0/abdev/BasicCompiler_Common/MakeExe.cpp (modified) (1 diff)
• ab5.0/abdev/BasicCompiler_Common/NonVolatile.h (modified) (1 diff)
• ab5.0/abdev/BasicCompiler_Common/StrOperation.cpp (modified) (3 diffs)
• ab5.0/abdev/BasicCompiler_Common/StrOperation.h (modified) (1 diff)
• ab5.0/abdev/BasicCompiler_Common/Subroutine.cpp (modified) (3 diffs)
• ab5.0/abdev/BasicCompiler_Common/VarList.cpp (modified) (4 diffs)
• ab5.0/abdev/BasicCompiler_Common/common.h (modified) (8 diffs)
• ab5.0/abdev/BasicCompiler_Common/error.cpp (modified) (1 diff)
• ab5.0/abdev/BasicCompiler_Common/hash.cpp (modified) (2 diffs)
• ab5.0/abdev/BasicCompiler_Common/include/BreakPoint.h (modified) (2 diffs, 1 prop)
• ab5.0/abdev/BasicCompiler_Common/include/CodeGenerator.h (modified) (6 diffs)
• ab5.0/abdev/BasicCompiler_Common/include/Compiler.h (modified) (2 diffs)
• ab5.0/abdev/BasicCompiler_Common/include/Configuration.h (modified) (1 diff)
• ab5.0/abdev/BasicCompiler_Common/include/DataTableGenerator.h (modified) (1 diff)
• ab5.0/abdev/BasicCompiler_Common/include/Debugger.h (modified) (1 diff)
• ab5.0/abdev/BasicCompiler_Common/include/Enum.h (modified) (4 diffs)
• ab5.0/abdev/BasicCompiler_Common/include/LexicalAnalyzer.h (modified) (3 diffs)
• ab5.0/abdev/BasicCompiler_Common/include/Linker.h (modified) (1 diff)
• ab5.0/abdev/BasicCompiler_Common/include/Messenger.h (modified) (4 diffs)
• ab5.0/abdev/BasicCompiler_Common/include/Program.h (modified) (1 diff)
• ab5.0/abdev/BasicCompiler_Common/include/logger.h (modified) (1 diff)
• ab5.0/abdev/BasicCompiler_Common/src/BoostSerializationSupport.cpp (modified) (17 diffs)
• ab5.0/abdev/BasicCompiler_Common/src/Compiler.cpp (modified) (1 diff)
• ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer.cpp (modified) (3 diffs)
• ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Class.cpp (modified) (6 diffs)
• ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Const.cpp (modified) (9 diffs)
• ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Delegate.cpp (modified) (6 diffs)
• ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Procedure.cpp (modified) (2 diffs)
• ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_TypeDef.cpp (modified) (8 diffs)
• ab5.0/abdev/BasicCompiler_Common/src/Linker.cpp (modified) (1 diff)
• ab5.0/abdev/BasicCompiler_Common/src/ProcedureGenerator.cpp (modified) (3 diffs)
• ab5.0/abdev/BasicCompiler_Common/src/VtblGenerator.cpp (modified) (2 diffs)
• ab5.0/abdev/BasicCompiler_Common/stdafx.cpp (copied) (copied from branches/egtra/ab5.0/abdev/BasicCompiler_Common/stdafx.cpp )
• ab5.0/abdev/BasicCompiler_Common/stdafx.h (copied) (copied from branches/egtra/ab5.0/abdev/BasicCompiler_Common/stdafx.h )

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

@@ -253 +253 @@
 }
 
-BOOL GetFilePathDialog(HWND hwnd,char *filename,LPSTR Filter,LPSTR Title,BOOL bOpen){
+BOOL GetFilePathDialog(HWND hwnd,char *filename,LPCSTR Filter,LPCSTR Title,BOOL bOpen){
     OPENFILENAME ofstr;
     filename[0]=0;
@@ -325 +325 @@
         //生成するファイルの相対パスを取得
         char relationalPath[MAX_PATH];
-        lstrcpy( relationalPath, program.GetOutputFilePath().c_str() );
+        strcpy( relationalPath, program.GetOutputFilePath().c_str() );
         GetRelationalPath( relationalPath, BasicCurDir );
 
@@ -375 +375 @@
     SetWindowPos(hwnd,0,x,y,0,0,SWP_NOSIZE);
 }
-BOOL CALLBACK DlgCompile(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
+INT_PTR CALLBACK DlgCompile(HWND hwnd,UINT message,WPARAM wParam,LPARAM lParam){
     extern HANDLE hDebugProcess;
+    extern DWORD processIdDebug;
     char temporary[MAX_PATH];
     RECT rect;
@@ -444 +445 @@
                             TerminateProcess(hDebugProcess,0);
                             hDebugProcess=0;
+                            processIdDebug = 0;
 
                             //デバッグダイアログを終了
@@ -475 +477 @@
                         TerminateProcess(hDebugProcess,0);
                         hDebugProcess=0;
+                        processIdDebug = 0;
 
                         //デバッグダイアログを終了
@@ -587 +590 @@
 
     // グローバルローケルを日本語にする
-    std::locale::global(std::locale("japanese"));
-    _setmode(_fileno(stdout), _O_BINARY);
+    //std::locale::global(std::locale("japanese"));
+    //_setmode(_fileno(stdout), _O_BINARY);
 
     //_Test();
@@ -642 +645 @@
             if( program.IsDebugRun() || compiler.IsDebug() )
             {
-                lstrcat(tempOutputFileName,"_debug.abobj");
+                strcat(tempOutputFileName,"_debug.abobj");
             }
             else
             {
-                lstrcat(tempOutputFileName,".abobj");
+                strcat(tempOutputFileName,".abobj");
             }
         }
@@ -653 +656 @@
             if( program.IsDebugRun() || compiler.IsDebug() )
             {
-                lstrcat(tempOutputFileName,"_debug.exe");
+                strcat(tempOutputFileName,"_debug.exe");
             }
             else
             {
-                lstrcat(tempOutputFileName,".exe");
+                strcat(tempOutputFileName,".exe");
             }
         }
@@ -719 +722 @@
         }
         if(temporary[i]){
-            lstrcpy(szDebugCmdLine,temporary+i+2);
+            strcpy(szDebugCmdLine,temporary+i+2);
         }
     }
 
     _splitpath( program.GetSourceFilePath().c_str(), BasicCurDir,temporary,NULL,NULL);
-    lstrcat(BasicCurDir,temporary);
+    strcat(BasicCurDir,temporary);
 
     if( program.IsClipCompileView() ){
         //ProjectEditor埋め込み型インターフェイス
-        hMainDlg=CreateDialog(hInst,MAKEINTRESOURCE(IDD_CLIPMAIN),hOwnerEditor,(DLGPROC)DlgCompile);
+        hMainDlg=CreateDialog(hInst, MAKEINTRESOURCE(IDD_CLIPMAIN), hOwnerEditor, DlgCompile);
         ShowWindow(hMainDlg,SW_SHOW);
         SendMessage(hOwnerEditor,WM_SETCOMPILEVIEW,0,(LPARAM)hMainDlg);
@@ -759 +762 @@
             trace("Complete ActiveBasic Compiler!");
 
-            ExitProcess( program.GetExitCode() );
-            return 0;
+            return program.GetExitCode();
         }
         else
@@ -770 +772 @@
 
     //エラーリストをサブクラス化
-    OldErrorListProc=(WNDPROC)GetWindowLongPtr(GetDlgItem(hMainDlg,IDC_ERRORLIST),GWLP_WNDPROC);
-    SetWindowLongPtr(GetDlgItem(hMainDlg,IDC_ERRORLIST),GWLP_WNDPROC,(LONG_PTR)ErrorListProc);
+    OldErrorListProc = reinterpret_cast<WNDPROC>(SetWindowLongPtr(GetDlgItem(hMainDlg, IDC_ERRORLIST), GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(ErrorListProc)));
 
     //デバッグリストをサブクラス化
-    OldDebugListProc=(WNDPROC)GetWindowLongPtr(GetDlgItem(hMainDlg,IDC_DEBUGLIST),GWLP_WNDPROC);
-    SetWindowLongPtr(GetDlgItem(hMainDlg,IDC_DEBUGLIST),GWLP_WNDPROC,(LONG_PTR)DebugListProc);
+    OldDebugListProc = reinterpret_cast<WNDPROC>(SetWindowLongPtr(GetDlgItem(hMainDlg, IDC_DEBUGLIST), GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(DebugListProc)));
 
     if( program.IsKickedFromEditor() )
@@ -804 +804 @@
     trace("Complete ActiveBasic Compiler!");
 
-    ExitProcess( program.GetExitCode() );
-
-    return 0;
-}
+    return program.GetExitCode();
+}

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

@@ -1 +1 @@
 #include "../BasicCompiler_Common/common.h"
 
-LPSTR BasicFileFilter="プログラム ファイル(*.ab;*.bas;*.abp;*.sbp)\0*.ab;*.bas;*.abp;*sbp\0テキスト ファイル(*.txt)\0*.txt\0すべてのファイル(*.*)\0*\0\0";
-LPSTR ExeFileFilter="実行可能ファイル(*.exe)\0*.exe\0すべてのファイル(*.*)\0*\0\0";
+extern const LPCSTR BasicFileFilter = "プログラム ファイル(*.ab;*.bas;*.abp;*.sbp)\0*.ab;*.bas;*.abp;*sbp\0テキスト ファイル(*.txt)\0*.txt\0すべてのファイル(*.*)\0*\0\0";
+extern const LPCSTR ExeFileFilter = "実行可能ファイル(*.exe)\0*.exe\0すべてのファイル(*.*)\0*\0\0";
 
 HINSTANCE hInst;

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

@@ -4 +4 @@
 #include "DebugSection.h"
 
+#include <ProcessAndModule.h>
 
 //デバッグ用
@@ -10 +11 @@
 
 extern HANDLE hDebugProcess;
+extern DWORD processIdDebug;
 extern DebugSectionCollection debugSectionCollection;
 
@@ -67 +69 @@
 
     //マッピングされているモジュールのイメージベースを取得
-    HMODULE array_hModule[1024];
-    DWORD cbReturned;
-    if(!EnumProcessModules( hDebugProcess, array_hModule, sizeof(HMODULE)*1024, &cbReturned )) return 0;
+    //HMODULE array_hModule[1024];
+    //DWORD cbReturned;
+    //if(!EnumProcessModules( hDebugProcess, array_hModule, sizeof(HMODULE)*1024, &cbReturned )) return 0;
+    auto modules = ActiveBasic::Common::GetModules(processIdDebug);
 
-    int i;
     HMODULE hTargetModule=0;
-    for(i=0;i<(int)(cbReturned/sizeof(HMODULE));i++){
-        if((LONG_PTR)array_hModule[i]<=(LONG_PTR)EIP_RIP(Context)){
-            if(hTargetModule<array_hModule[i]) hTargetModule=array_hModule[i];
+    for (std::size_t i = 0; i < modules.size(); ++i)
+    {
+        if ((LONG_PTR)modules[i]<=(LONG_PTR)EIP_RIP(Context))
+        {
+            if (hTargetModule<modules[i])
+            {
+                hTargetModule=modules[i];
+            }
         }
     }
@@ -81 +88 @@
     extern DWORD ImageBase;
     if((HMODULE)(ULONG_PTR)ImageBase!=hTargetModule){
-        for(i=0;i<debugSectionCollection.debugSections.size();i++){
+        for(std::size_t i=0;i<debugSectionCollection.debugSections.size();i++){
             if((HMODULE)(ULONG_PTR)debugSectionCollection.debugSections[i]->dwImageBase==hTargetModule){
                 debugSectionCollection.choice(i);

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

@@ -9 +9 @@
 #include "../BasicCompiler_Common/debug.h"
 
+#include <Path.h>
+#include <ProcessAndModule.h>
+
 char *OpBuffer;
 
@@ -14 +17 @@
 
 HANDLE hDebugProcess;
+DWORD processIdDebug;
 
 DWORD _DebugSys_dwThreadID[MAX_DEBUG_THREAD];
@@ -155 +159 @@
     TerminateProcess(hDebugProcess,0);
     hDebugProcess=0;
+    processIdDebug = 0;
 
     //デバッグダイアログを終了
@@ -271 +276 @@
 UserProc *GetSubFromObp(ULONG_PTR pos)
 {
-    compiler.GetObjectModule().meta.GetUserProcs().Iterator_Reset();
-    while( compiler.GetObjectModule().meta.GetUserProcs().Iterator_HasNext() )
+    foreach (auto pUserProc, compiler.GetObjectModule().meta.GetUserProcs())
     {
-        UserProc *pUserProc = compiler.GetObjectModule().meta.GetUserProcs().Iterator_GetNext();
-
         if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pos  &&
             pos < rva_to_real(pUserProc->GetEndOpAddress()))
@@ -406 +408 @@
             //ユーザーに実行ファイルを選択させる
             extern HWND hOwnerEditor;
-            extern LPSTR ExeFileFilter;
+            extern const LPCSTR ExeFileFilter;
             if(!GetFilePathDialog(hOwnerEditor,ExeFilePathForDll,ExeFileFilter,"デバッグ用の実行可能ファイルを指定してください。",1)) return;
         }
@@ -435 +437 @@
     if( program.IsAttach() )
     {
-        //プロセスIDを元にハンドルを取得
-        HANDLE hProcess;
-        hProcess=OpenProcess(PROCESS_ALL_ACCESS,0, program.GetAttachProcessId() );
-        if(!hProcess) goto AttachError;
-
-        //そのプロセスにおける実行モジュールのインスタンスハンドルを取得
-        HINSTANCE hModule;
-        DWORD cbReturned;
-        if(!EnumProcessModules( hProcess, &hModule, sizeof(HINSTANCE), &cbReturned )) goto AttachError;
+        ////プロセスIDを元にハンドルを取得
+        //HANDLE hProcess = OpenProcess(PROCESS_ALL_ACCESS,0, program.GetAttachProcessId() );
+        //if(!hProcess)
+        //{
+        //  DebugMessage("アタッチに失敗しました。");
+        //  return;
+        //}
+
+        ////そのプロセスにおける実行モジュールのインスタンスハンドルを取得
+        //HINSTANCE hModule;
+        //DWORD cbReturned;
+        //if(!EnumProcessModules( hProcess, &hModule, sizeof(HINSTANCE), &cbReturned ))
+        //{
+        //  DebugMessage("アタッチに失敗しました。");
+        //  return;
+        //}
 
         //実行ファイル名を取得
-        char tempOutputFileName[MAX_PATH];
-        GetModuleFileNameEx(hProcess,hModule,tempOutputFileName,MAX_PATH);
-        program.SetOutputFilePath( tempOutputFileName );
-
-        CloseHandle(hProcess);
+        auto tempOutputFilePath = ActiveBasic::Common::GetExecutableModulePath(program.GetAttachProcessId());
+        program.SetOutputFilePath( tempOutputFilePath.string().c_str() );
+
+        //CloseHandle(hProcess);
 
 /*
@@ -456 +464 @@
         pobj_DebugSection->load(program.GetOutputFilePath().c_str());*/
 
-        if(!DebugActiveProcess( program.GetAttachProcessId() )){
-AttachError:
+        if(!DebugActiveProcess( program.GetAttachProcessId() ))
+        {
             DebugMessage("アタッチに失敗しました。");
             return;
@@ -532 +540 @@
             else{
 Attach_DllLoad:
-                //アタッチした場合
-                GetModuleFileNameEx(hDebugProcess,(HINSTANCE)de.u.LoadDll.lpBaseOfDll,temporary,MAX_PATH);
+                {
+                    //アタッチした場合
+                    auto path = ActiveBasic::Common::GetModuleFilePath(hDebugProcess, reinterpret_cast<HINSTANCE>(de.u.LoadDll.lpBaseOfDll));
+                    strncpy_s(temporary, path.string().c_str(), _TRUNCATE);
+                }
             }
 
@@ -562 +573 @@
             hDebugProcess=de.u.CreateProcessInfo.hProcess;
             hMainThread=de.u.CreateProcessInfo.hThread;
+            processIdDebug = de.dwProcessId;
 
             if(debugSectionCollection.add((HMODULE)de.u.CreateProcessInfo.lpBaseOfImage)){

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

@@ -34 +34 @@
         int codeSizeOfGlobalProc = 0;
         int codeSizeOfClassMethod = 0;
-        compiler.GetObjectModule().meta.GetUserProcs().Iterator_Reset();
-        while( compiler.GetObjectModule().meta.GetUserProcs().Iterator_HasNext() )
+        foreach (auto pUserProc, compiler.GetObjectModule().meta.GetUserProcs())
         {
-            UserProc *pUserProc = compiler.GetObjectModule().meta.GetUserProcs().Iterator_GetNext();
             if( pUserProc->IsCompiled() ){
                 if( pUserProc->HasParentClass() ){
@@ -60 +58 @@
         int codeSizeOfEnum = 0;
 
-        // イテレータをリセット
-        compiler.GetObjectModule().meta.GetClasses().Iterator_Reset();
-
-        while( compiler.GetObjectModule().meta.GetClasses().Iterator_HasNext() ){
+        foreach (auto pClass, compiler.GetObjectModule().meta.GetClasses())
+        {
             int codeSizeOfClass = 0;
 
-            CClass &objClass = *compiler.GetObjectModule().meta.GetClasses().Iterator_GetNext();
+            CClass &objClass = *pClass;
 
             if( !objClass.IsEnum() ){
@@ -82 +78 @@
             // 静的メソッド
             foreach( const CMethod *pMethod, objClass.GetStaticMethods() ){
-                    codeSizeOfClass += pMethod->GetUserProc().GetCodeSize();
+                codeSizeOfClass += pMethod->GetUserProc().GetCodeSize();
             }
 
@@ -99 +95 @@
         ///////////////////////////////////////////////////////////////////
 
-        // イテレータをリセット
-        compiler.GetObjectModule().meta.GetClasses().Iterator_Reset();
-
-        while( compiler.GetObjectModule().meta.GetClasses().Iterator_HasNext() ){
+        foreach (auto pClass, compiler.GetObjectModule().meta.GetClasses())
+        {
             int codeSizeOfClass = 0;
 
-            CClass &objClass = *compiler.GetObjectModule().meta.GetClasses().Iterator_GetNext();
+            CClass &objClass = *pClass;
 
             // 動的メソッド
@@ -116 +110 @@
             // 静的メソッド
             foreach( const CMethod *pMethod, objClass.GetStaticMethods() ){
-                    codeSizeOfClass += pMethod->GetUserProc().GetCodeSize();
+                codeSizeOfClass += pMethod->GetUserProc().GetCodeSize();
             }
 
-            if( codeSizeOfClass ){
-                temporary[0]=0;
-                lstrcat( temporary, "------------------------------------------------------------------\n" );
-                sprintf( temporary + lstrlen(temporary), "【 %s クラスのコード情報】\n", objClass.GetName().c_str() );
-                sprintf( temporary + lstrlen(temporary), "class code size: %d bytes\n", codeSizeOfClass );
-                lstrcat( temporary, "------------------------------------------------------------------\n" );
-                lstrcat( temporary, "\n" );
+            if( codeSizeOfClass )
+            {
+                sprintf(temporary,
+                    "------------------------------------------------------------------\n"
+                    "【 %s クラスのコード情報】\n"
+                    "class code size: %d bytes\n"
+                    "------------------------------------------------------------------\n"
+                    "\n",
+                    objClass.GetName().c_str(), codeSizeOfClass);
                 trace_for_size( temporary );
             }

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

@@ -26 +26 @@
 }
 
-void AddSourceCode(const char *buffer){
-    char *temp=(char *)HeapAlloc(hHeap,0,lstrlen(buffer)+8192);
-    lstrcpy(temp,buffer);
-
-    MakeMiddleCode( temp );
+void AddSourceCode(const char *buffer)
+{
+    std::size_t size = std::strlen(buffer) + 8192;
+    std::unique_ptr<char[]> temp(new char[size]);
+    strcpy_s(temp.get(), size, buffer);
+
+    MakeMiddleCode(temp.get());
 
     //最後尾に貼り付け
-    compiler.GetObjectModule().GetSource().Addition( temp );
-
-    HeapDefaultFree(temp);
+    compiler.GetObjectModule().GetSource().Addition(temp.get());
 }
 

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

@@ -39 +39 @@
     void load();
     void save();
+
+private:
+    CNonVolatile(CNonVolatile const&);
+    CNonVolatile& operator =(CNonVolatile const&);
 };
 extern CNonVolatile *pobj_nv;

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

@@ -1 +1 @@
 #include "stdafx.h"
-
-void KillSpaces(char *str1,char *str2){
+#include <abdev/ab_common/include/ab_common.h>
+#include "StrOperation.h"
+#include "common.h"
+
+void KillSpaces(char const *str1,char *str2){
     int i,i2,i3,IsStr;
     for(i=0,i2=0,IsStr=0;;i++,i2++){
@@ -30 +33 @@
     }
 }
-void KillStringSpaces(char *str){
-    char *s2;
-
-    extern HANDLE hHeap;
-    s2=(char *)HeapAlloc(hHeap,0,lstrlen(str)+1);
-    lstrcpy(s2,str);
-    KillSpaces(s2,str);
-    HeapDefaultFree(s2);
-    return;
+void KillStringSpaces(char *str)
+{
+    std::string s2(str);
+    KillSpaces(s2.c_str(), str);
 }
 BOOL RemoveStringQuotes(char *str){
@@ -362 +360 @@
     }
 }
-const std::string &FormatEscapeSequenceStringToDefaultString( const std::string &source )
+std::string FormatEscapeSequenceStringToDefaultString( const std::string &source )
 {
     int maxLength = (int)source.size();

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

@@ +1 @@
+#pragma once
 
 enum ReferenceKind

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

@@ -319 +319 @@
 
 bool IsNeedProcCompile(){
-    compiler.GetObjectModule().meta.GetUserProcs().Iterator_Reset();
-    while( compiler.GetObjectModule().meta.GetUserProcs().Iterator_HasNext() )
-    {
-        UserProc *pUserProc = compiler.GetObjectModule().meta.GetUserProcs().Iterator_GetNext();
+    foreach (auto pUserProc, compiler.GetObjectModule().meta.GetUserProcs())
+    {
         if( pUserProc->IsUsing() && pUserProc->IsCompiled() == false ){
             return true;
@@ -385 +383 @@
 
 repeat:
-    compiler.GetObjectModule().meta.GetUserProcs().Iterator_Reset();
-    while( compiler.GetObjectModule().meta.GetUserProcs().Iterator_HasNext() )
-    {
-        UserProc *pUserProc = compiler.GetObjectModule().meta.GetUserProcs().Iterator_GetNext();
+    foreach (auto pUserProc, compiler.GetObjectModule().meta.GetUserProcs())
+    {
         CompileBufferInProcedure( *pUserProc );
     }
@@ -410 +406 @@
             //プロシージャコンパイルによって、プロシージャコンパイルが必要になる場合
 
-            compiler.GetObjectModule().meta.GetUserProcs().Iterator_Reset();
-            while( compiler.GetObjectModule().meta.GetUserProcs().Iterator_HasNext() )
+            foreach(auto pUserProc, compiler.GetObjectModule().meta.GetUserProcs())
             {
-                UserProc *pUserProc = compiler.GetObjectModule().meta.GetUserProcs().Iterator_GetNext();
                 CompileBufferInProcedure( *pUserProc );
             }

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

@@ -1 +1 @@
 #include "stdafx.h"
 
+#include <boost/range/algorithm.hpp>
 #include <Compiler.h>
 
@@ -411 +412 @@
     if(pobj_dti->lplpSpBase[i2]==0) return;
 
-    UserProc *pUserProc = NULL;
-    compiler.GetObjectModule().meta.GetUserProcs().Iterator_Reset();
-    while( compiler.GetObjectModule().meta.GetUserProcs().Iterator_HasNext() )
+    auto const& t = compiler.GetObjectModule().meta.GetUserProcs();
+    auto it = boost::find_if<boost::return_found>(t, [&](UserProc *pUserProc) -> bool {
+        return rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2] &&
+            pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->GetEndOpAddress());
+    });
+    if (it == boost::end(t))
     {
-        pUserProc = compiler.GetObjectModule().meta.GetUserProcs().Iterator_GetNext();
-        if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2]  &&
-            pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->GetEndOpAddress())){
-            break;
-        }
-    }
-    if(!pUserProc) return;
+        return;
+    }
+    UserProc *pUserProc = *it;
 
     foreach( Variable *pVar, pUserProc->GetLocalVars() ){
@@ -696 +696 @@
     //プロシージャ コンボボックス
     SendMessage(hProcCombo,CB_RESETCONTENT,0,0);
-    for(i2=pobj_dti->iProcLevel;i2>=0;i2--){
-
+    for(i2=pobj_dti->iProcLevel;i2>=0;i2--)
+    {
+        auto const& t = compiler.GetObjectModule().meta.GetUserProcs();
+        auto it = boost::find_if<boost::return_found>(t, [&](UserProc* p) {
+            return rva_to_real(p->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2] &&
+                pobj_dti->lplpObp[i2] < rva_to_real(p->GetEndOpAddress());
+        });
         UserProc *pUserProc = NULL;
-        compiler.GetObjectModule().meta.GetUserProcs().Iterator_Reset();
-        while( compiler.GetObjectModule().meta.GetUserProcs().Iterator_HasNext() )
+        if (it != boost::end(t))
         {
-            pUserProc = compiler.GetObjectModule().meta.GetUserProcs().Iterator_GetNext();
-
-            if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2]  &&
-                pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->GetEndOpAddress()))
-            {
-                lstrcpy(temporary,pUserProc->GetName().c_str());
-                break;
-            }
+            pUserProc = *it;
+            lstrcpy(temporary, pUserProc->GetName().c_str());
         }
         if(!pUserProc){
@@ -811 +809 @@
     i2=pobj_dti->iProcLevel-i2;
 
-    if(pobj_dti->lplpSpBase[i2]){
-
-        UserProc *pUserProc = NULL;
-        compiler.GetObjectModule().meta.GetUserProcs().Iterator_Reset();
-        while( compiler.GetObjectModule().meta.GetUserProcs().Iterator_HasNext() )
+    if(pobj_dti->lplpSpBase[i2])
+    {
+        auto const& t = compiler.GetObjectModule().meta.GetUserProcs();
+        auto it = boost::find_if<boost::return_found>(t, [&](UserProc* p) {
+            return rva_to_real(p->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2] &&
+                pobj_dti->lplpObp[i2] < rva_to_real(p->GetEndOpAddress());
+        });
+
+        if (it != boost::end(t))
         {
-            pUserProc = compiler.GetObjectModule().meta.GetUserProcs().Iterator_GetNext();
-
-            if(rva_to_real(pUserProc->GetBeginOpAddress()) <= pobj_dti->lplpObp[i2]  &&
-                pobj_dti->lplpObp[i2] < rva_to_real(pUserProc->GetEndOpAddress())){
-                break;
-            }
-        }
-
-        if(pUserProc){
-            compiler.StartProcedureCompile( pUserProc );
+            compiler.StartProcedureCompile(*it);
         }
     }

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

@@ -1 +1 @@
 #pragma once
 
-//#define _CRT_SECURE_NO_DEPRECATE
-#pragma warning(disable : 4996)
+
+#include <psapi.h>
 
 #include <option.h>
@@ -17 +17 @@
 
 #include "../BasicCompiler_Common/NonVolatile.h"
-#include <psapi.h>
 
 
@@ -36 +35 @@
 #define MAX_PARMS       64
 #define MAX_ARRAYDIM    16
-#define MAX_HASH        32761
 
 
@@ -42 +40 @@
     #define PLATFORM    64
 #else
-#define PLATFORM    32
-    #ifndef LONG_PTR
-        typedef long LONG_PTR;
-        typedef DWORD ULONG_PTR;
-    #endif
+    #define PLATFORM    32
 #endif
 
@@ -217 +211 @@
 void GetFullPath( char *path, const std::string &baseDirPath );
 void ShowErrorLine(int LineNum,const char *FileName);
-BOOL GetFilePathDialog(HWND hwnd,char *filename,LPSTR Filter,LPSTR Title,BOOL bOpen);
+BOOL GetFilePathDialog(HWND hwnd,char *filename,LPCSTR Filter,LPCSTR Title,BOOL bOpen);
 void MakeMessageText(char *buffer,char *msg,int flag);
 
 //hash.cpp
-int hash_default(const char *name);
 DllProc *GetDeclareHash(const char *name);
 void GetOverloadSubHash( const char *lpszName, std::vector<const UserProc *> &subs );
@@ -303 +296 @@
 
 // StrOperation.cpp
-void KillSpaces(char *str1,char *str2);
+void KillSpaces(const char *str1,char *str2);
 void KillStringSpaces(char *str);
 BOOL RemoveStringQuotes(char *str);
@@ -316 +309 @@
 char GetEndXXXCommand(char es);
 void GetDefaultNameFromES(char es,char *name);
-const std::string &FormatEscapeSequenceStringToDefaultString( const std::string &source );
+std::string FormatEscapeSequenceStringToDefaultString( const std::string &source );
 bool IsFileExist(const char *path);
 BOOL ShortPathToLongPath(char ShortPath[MAX_PATH],char *LongPath);
@@ -370 +363 @@
 void SplitGenericClassInstance( const char *fullName, char *className, Jenga::Common::Strings &typeParameters, bool isDefiningClass = false, Jenga::Common::Strings *pTypeParameterBaseClassNames = NULL );
 int JumpStatement(const char *source, int &pos);
+
+//MakePeHdr.cpp
 void MakeExe();
 

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

@@ -4 +4 @@
 
 #define STRING_SYSTEM_DECLAREHANDLE "*_System_DeclareHandle_"
-void DifferentTypeError( const Type &varType, const Type &calcFormalType, const int iWarning,const char *pszFuncName,const int ParmNum){
+void DifferentTypeError(const Type &varType, const Type &calcFormalType, const int iWarning, const char *pszFuncName, const int ParmNum)
+{
     //////////////////////////
     // キャストに関する警告
     //////////////////////////
-    char temporary[255];
-    Type calcType( calcFormalType );
-
-    if(IS_LITERAL(calcType.GetIndex()))
+    std::ostringstream s;
+    Type calcType(calcFormalType);
+
+    if (IS_LITERAL(calcType.GetIndex()))
     {
         calcType.SetIndex( -1 );
     }
 
-    if(pszFuncName)
-        sprintf(temporary,"\"%s\"の第%dパラメータが、",pszFuncName,ParmNum+1);
-    else temporary[0]=0;
-
-    std::string varTypeName = compiler.TypeToString( varType );
-    if(memcmp( varTypeName.c_str(),STRING_SYSTEM_DECLAREHANDLE,lstrlen(STRING_SYSTEM_DECLAREHANDLE))==0)
-    {
-        varTypeName = varTypeName.substr( lstrlen(STRING_SYSTEM_DECLAREHANDLE) );
-    }
-
-    std::string calcTypeName = compiler.TypeToString( calcType );
-    if(memcmp( calcTypeName.c_str(),STRING_SYSTEM_DECLAREHANDLE,lstrlen(STRING_SYSTEM_DECLAREHANDLE))==0)
-    {
-        calcTypeName = calcTypeName.substr( lstrlen(STRING_SYSTEM_DECLAREHANDLE) );
-    }
-    sprintf(temporary+lstrlen(temporary),"%sから%s",calcTypeName.c_str(),varTypeName.c_str());
+    if (pszFuncName)
+    {
+        s << boost::format("\"%s\"の第%dパラメータが、") % pszFuncName % (ParmNum + 1);
+    }
+
+    std::string varTypeName = compiler.TypeToString(varType);
+    if (memcmp(varTypeName.c_str(), STRING_SYSTEM_DECLAREHANDLE, lstrlen(STRING_SYSTEM_DECLAREHANDLE)) == 0)
+    {
+        varTypeName = varTypeName.substr(strlen(STRING_SYSTEM_DECLAREHANDLE));
+    }
+
+    std::string calcTypeName = compiler.TypeToString(calcType);
+    if (memcmp(calcTypeName.c_str(), STRING_SYSTEM_DECLAREHANDLE, strlen(STRING_SYSTEM_DECLAREHANDLE)) == 0)
+    {
+        calcTypeName = calcTypeName.substr(strlen(STRING_SYSTEM_DECLAREHANDLE));
+    }
+    s << boost::format("%sから%s") % calcTypeName % varTypeName;
 
     extern int cp;
-    if(iWarning==1) compiler.errorMessenger.Output(-101,temporary,cp);
-    else if(iWarning==2) compiler.errorMessenger.Output(-102,temporary,cp);
-    else if(iWarning==3) compiler.errorMessenger.Output(50,temporary,cp);
+    int errorCode;
+    switch (iWarning)
+    {
+        case 1: errorCode = -101; break;
+        case 2: errorCode = -102; break;
+        case 3: errorCode = 50; break;
+    }
+    compiler.errorMessenger.Output(errorCode, s.str().c_str(), cp);
 }
 

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

@@ -13 +13 @@
 using namespace ActiveBasic::Compiler;
 
-int hash_default(const char *name){
-    int key;
-
-    for(key=0;*name!='\0';name++){
-        key=((key<<8)+ *name )%MAX_HASH;
-    }
-
-    return key;
-}
-
 DllProc *GetDeclareHash(const char *fullName){
     char namespaceStr[VN_SIZE];     //オブジェクト変数
@@ -32 +22 @@
     ///////////////////////////
 
+    auto const s = LexicalAnalyzer::FullNameToSymbol( fullName );
+
     // ハッシュ値を取得
-    DllProc *pDllProc = compiler.GetObjectModule().meta.GetDllProcs().GetHashArrayElement( simpleName );
-    while(pDllProc){
-        if( pDllProc->IsEqualSymbol( LexicalAnalyzer::FullNameToSymbol( fullName ) ) ){
+    foreach (auto pDllProc, compiler.GetObjectModule().meta.GetDllProcs().GetHashArrayElement(simpleName))
+    {
+        if( pDllProc->IsEqualSymbol( s ) )
+        {
             return pDllProc;
         }
-
-        pDllProc=pDllProc->GetChainNext();
     }
 

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

@@ -9 +9 @@
     BreakPointsPerFile(const char *lpszFileName,int iLineNum);
 
+    BreakPointsPerFile(BreakPointsPerFile&& y)
+        : filename(std::move(y.filename))
+        , lines(std::move(y.lines))
+    {
+    }
+
+    BreakPointsPerFile(BreakPointsPerFile const& y)
+        : filename(y.filename)
+        , lines(y.lines)
+    {
+    }
+
+    BreakPointsPerFile& operator =(BreakPointsPerFile&& y)
+    {
+        filename = std::move(y.filename);
+        lines = std::move(y.lines);
+        return *this;
+    }
+
+    BreakPointsPerFile& operator =(BreakPointsPerFile const& y)
+    {
+        return *this = std::move(BreakPointsPerFile(y));
+    }
+
     void add(int iLineNum);
     void remove(int iLineNum);
 
     void update( char *nativeCodeBuffer, const SourceLines &sourceLines );
+
 };
 typedef std::vector<BreakPointsPerFile> BreakPointsPerFiles;
@@ -27 +52 @@
 
     char *update( char *nativeCodeBuffer, int SizeOf_CodeSection, const SourceLines &sourceLines );
+
+private:
+    BreakPointManager(BreakPointManager const&);
+    BreakPointManager& operator =(BreakPointManager const&);
 };
 

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

@@ -33 +33 @@
         return typeSize;
     }
+
+private:
+    PertialSchedule(PertialSchedule const&);
+    PertialSchedule& operator =(PertialSchedule const&);
 };
 typedef std::vector<const PertialSchedule *> PertialSchedules;
@@ -68 +72 @@
         return sourceCodePos;
     }
+
+private:
+    GotoLabelSchedule(GotoLabelSchedule const&);
+    GotoLabelSchedule& operator =(GotoLabelSchedule const&);
 };
 typedef std::vector<const GotoLabelSchedule *> GotoLabelSchedules;
@@ -90 +98 @@
         , address( nativeCodePos )
     {
+    }
+
+    GotoLabel(GotoLabel&& y)
+        : name(std::move(y.name))
+        , line(std::move(y.line))
+        , address(std::move(y.address))
+    {
+    }
+
+    GotoLabel(GotoLabel const& y)
+        : name(y.name)
+        , line(y.line)
+        , address(y.address)
+    {
+    }
+
+    GotoLabel& operator =(GotoLabel&& y)
+    {
+        name = std::move(y.name);
+        line = std::move(y.line);
+        address = std::move(y.address);
+        return *this;
+    }
+
+    GotoLabel& operator =(GotoLabel const& y)
+    {
+        return *this = std::move(GotoLabel(y));
     }
 };
@@ -147 +182 @@
     void Break();
     void RunScheduleOfBreak();
+
+private:
+    LexicalScope(LexicalScope const&);
+    LexicalScope& operator =(LexicalScope const&);
 };
 
@@ -184 +223 @@
     //Returnステートメント用のデストラクタ呼び出し
     void CallDestructorsOfReturn( int BaseLevel = 0 );
+
+private:
+    LexicalScopes(LexicalScopes const&);
+    LexicalScopes& operator =(LexicalScopes const&);
 };
 
@@ -534 +577 @@
         pNativeCode->Put( c6 );
     }
+
+private:
+    CodeGenerator(CodeGenerator const&);
+    CodeGenerator& operator =(CodeGenerator const&);
 };

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

@@ +1 @@
+#include "Messenger.h"
+#include "CodeGenerator.h"
+#include "Linker.h"
+#include "Enum.h"
+#include "ErrorCode.h"
+
 #pragma once
 
@@ -209 +215 @@
     bool IsCompilingClass();
     const CClass &GetCompilingClass();
+
+private:
+    Compiler(Compiler const&);
+    Compiler& operator =(Compiler const&);
 };
 

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

@@ -27 +27 @@
         ar & BOOST_SERIALIZATION_NVP( abdevRootRelativePath );
     }
+
+    Configuration(Configuration const&);
+    Configuration& operator =(Configuration const&);
 };

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

@@ -17 +17 @@
     }
 
+private:
+    DataTableGenerator();
+    DataTableGenerator(DataTableGenerator const&);
+    DataTableGenerator& operator =(DataTableGenerator const&);
 };
 

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

@@ -24 +24 @@
         return isRunning;
     }
+
+private:
+    Debugger(Debugger const&);
+    Debugger& operator =(Debugger const&);
 };
 

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

@@ -6 +6 @@
     std::string value;
     int sourceIndex;
+
 public:
     EnumMember( const std::string &name, const std::string &value, int sourceIndex )
@@ -13 +14 @@
     {
     }
+
+    EnumMember(EnumMember&& y)
+        : name(std::move(y.name))
+        , value(std::move(y.value))
+        , sourceIndex(std::move(y.sourceIndex))
+    {
+    }
+
+    EnumMember(EnumMember const& y)
+        : name(y.name)
+        , value(y.value)
+        , sourceIndex(y.sourceIndex)
+    {
+    }
+
+    EnumMember& operator =(EnumMember&& y)
+    {
+        name = std::move(y.name);
+        value = std::move(y.value);
+        sourceIndex = std::move(y.sourceIndex);
+        return *this;
+    }
+
+    EnumMember& operator =(EnumMember const& y)
+    {
+        return *this = std::move(EnumMember(y));
+    }
+
     const std::string &GetName() const
     {
@@ -39 +68 @@
         : Symbol( namespaceScopes, name )
     {
+    }
+
+    EnumInfo(EnumInfo&& y)
+        : Symbol(std::move(y))
+        , bConst(std::move(y.bConst))
+        , members(std::move(y.members))
+    {
+    }
+
+    EnumInfo(EnumInfo const& y)
+        : Symbol(y)
+        , bConst(y.bConst)
+        , members(y.members)
+    {
+    }
+
+    EnumInfo& operator =(EnumInfo&& y)
+    {
+        Symbol::operator =(std::move(y));
+        bConst = std::move(y.bConst);
+        members = std::move(y.members);
+        return *this;
+    }
+
+    EnumInfo& operator =(EnumInfo const& y)
+    {
+        return *this = std::move(EnumInfo(y));
     }
 
@@ -80 +136 @@
         return NULL;
     };
+
+    EnumInfoCollection() {}
+
+private:
+    EnumInfoCollection(EnumInfoCollection const&);
+    EnumInfoCollection& operator =(EnumInfoCollection const&);
 };

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

@@ +1 @@
+#include <string>
+
 #pragma once
+
+class EnumInfo;
+class EnumInfoCollection;
 
 namespace ActiveBasic{ namespace Compiler{
@@ -24 +29 @@
 
     // TypeDefを収集する
-    static void AddTypeDef( TypeDefCollection &typeDefs, const NamespaceScopes &namespaceScopes, const std::string &expression, int nowLine );
+    static void AddTypeDef( TypeDefCollection &typeDefs, const NamespaceScopes &namespaceScopes, const boost::iterator_range<char const*> &expression, int nowLine );
     static void CollectTypeDefs( const char *source, TypeDefCollection &typeDefs );
 
@@ -30 +35 @@
     static void AddConstEnum( Consts &consts, const NamespaceScopes &namespaceScopes, const char *buffer );
     static void CollectConsts( const char *source, Consts &consts, ConstMacros &constMacros );
-    static bool ConstMacroToExpression( const ConstMacro &constMacro, const char *parameterStr, char *dest );
+    static bool ConstMacroToExpression( const ConstMacro &constMacro, const char *parameterStr, std::string& dest );
+    static bool ConstMacroToExpression( const ConstMacro &constMacro, const char *parameterStr, char *dest, std::size_t destSize );
+    template<std::size_t N>
+    static bool ConstMacroToExpression( const ConstMacro &constMacro, const char *parameterStr, char (&dest)[N] )
+    {
+        return ConstMacroToExpression(constMacro, parameterStr, dest, N);
+    }
 
     // クラスを収集する

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

@@ -54 +54 @@
     // データテーブルをセット
     void SetDataTable( DataTable &dataTable );
+
+private:
+    Linker(Linker const&);
+    Linker& operator =(Linker const&);
 };

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

@@ +1 @@
+#pragma once
 
 class Messenger
@@ -23 +24 @@
     {
     }
+
     ErrorInfo( int errorCode, const std::string &keyword, int sourceIndex );
+
+    ErrorInfo(ErrorInfo&& y)
+        : errorCode(std::move(y.errorCode))
+        , keyword(std::move(y.keyword))
+        , sourceFilePath(std::move(y.sourceFilePath))
+        , sourceLineNum(std::move(y.sourceLineNum))
+        , errorLineNum(std::move(y.errorLineNum))
+    {
+    }
+
+    ErrorInfo(ErrorInfo const& y)
+        : errorCode(y.errorCode)
+        , keyword(y.keyword)
+        , sourceFilePath(y.sourceFilePath)
+        , sourceLineNum(y.sourceLineNum)
+        , errorLineNum(y.errorLineNum)
+    {
+    }
+
+    ErrorInfo& operator =(ErrorInfo&& y)
+    {
+        errorCode = std::move(y.errorCode);
+        keyword = std::move(y.keyword);
+        sourceFilePath = std::move(y.sourceFilePath);
+        sourceLineNum = std::move(y.sourceLineNum);
+        errorLineNum = std::move(y.errorLineNum);
+        return *this;
+    }
+
+    ErrorInfo& operator =(ErrorInfo const& y)
+    {
+        return *this = std::move(ErrorInfo(y));
+    }
 
     int GetErrorCode() const
@@ -62 +97 @@
 
 public:
+    ErrorMessenger() {}
+
     void Output( const ErrorInfo &errorInfo );
     void Output( int errorCode, const std::string &keyword, int sourceIndex = -1 );
@@ -74 +111 @@
 
     void ShowErrorLine( int errorLineNum );
+
+private:
+    ErrorMessenger(ErrorMessenger const&);
+    ErrorMessenger& operator =(ErrorMessenger const&);
 };

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

@@ -96 +96 @@
 
     int GetExitCode() const;
+
+private:
+    Program(Program const&);
+    Program& operator =(Program const&);
 };
 

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

@@ -28 +28 @@
         ar & BOOST_SERIALIZATION_NVP( stopStep );
     }
+
+    LoggerSetting(LoggerSetting const&);
+    LoggerSetting operator =(LoggerSetting const&);
 };
 

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

@@ -1 @@
-#pragma warning(disable : 4996)
-
 #include <map>
 #include <string>
@@ -19 +17 @@
 #include <limits.h>
 #include <shlobj.h>
-#include <process.h>
-#include <fcntl.h>
-#include <io.h>
 #include <shlwapi.h>
 #include <tchar.h>
-#include <stdarg.h>
 
 //boost libraries
 #include <boost/foreach.hpp>
-
+#include <boost/cast.hpp>
+
+#pragma warning(push)
+#pragma warning(disable: 4244 6326)
 #include <boost/archive/xml_oarchive.hpp>
 #include <boost/archive/xml_iarchive.hpp>
@@ -41 +38 @@
 #include <boost/serialization/map.hpp>
 #include <boost/serialization/version.hpp>
-#include <boost/serialization/is_abstract.hpp>
+#pragma warning(pop)
 
 #include <jenga/include/jenga.h>
@@ -49 +46 @@
 using namespace Jenga::Common;
 
+using boost::polymorphic_downcast;
+
 template<class T_xml_schema> void BoostSerializationSupport<T_xml_schema>::echo( const char *msg ) const
 {
-    MessageBox( NULL, msg, "XMLシリアライズの例外", MB_OK );
+    MessageBox( NULL, msg, "シリアライズの例外", MB_OK );
 }
 template<class T_xml_schema> bool BoostSerializationSupport<T_xml_schema>::ReadXml( std::istream& ifs, bool isShowExceptionMessage )
@@ -61 +60 @@
 
         // ファイルから読込
-        ia >> boost::serialization::make_nvp( RootTagName(), *(T_xml_schema *)this );
-
-        isSuccessful = true;
-    }
-    catch( boost::archive::archive_exception e )
+        ia >> boost::serialization::make_nvp( RootTagName(), *polymorphic_downcast<T_xml_schema*>(this) );
+
+        isSuccessful = true;
+    }
+    catch( boost::archive::archive_exception const& e )
     {
         if( isShowExceptionMessage )
@@ -94 +93 @@
 
         // ファイルに書き出し
-        oa << boost::serialization::make_nvp( RootTagName(), *(T_xml_schema *)this );
-
-        isSuccessful = true;
-    }
-    catch( boost::archive::archive_exception e )
+        oa << boost::serialization::make_nvp( RootTagName(), *polymorphic_downcast<T_xml_schema const*>(this) );
+
+        isSuccessful = true;
+    }
+    catch( boost::archive::archive_exception const& e )
     {
         if( isShowExceptionMessage )
@@ -154 +153 @@
 
         // 文字列ストリームから読込
-        ia >> boost::serialization::make_nvp( RootTagName(), *(T_xml_schema *)this );
+        ia >> boost::serialization::make_nvp( RootTagName(), *polymorphic_downcast<T_xml_schema*>(this) );
 
         isSuccessful = true;
@@ -179 +178 @@
 
         // 文字列ストリームに書き出し
-        oa << boost::serialization::make_nvp( RootTagName(), *(T_xml_schema *)this );
-
-        isSuccessful = true;
-    }
-    catch( boost::archive::archive_exception e )
+        oa << boost::serialization::make_nvp( RootTagName(), *polymorphic_downcast<T_xml_schema const*>(this) );
+
+        isSuccessful = true;
+    }
+    catch( boost::archive::archive_exception const& e )
     {
         echo( e.what() );
@@ -211 +210 @@
 
         // ファイルから読込
-        ia >> boost::serialization::make_nvp( RootTagName(), *(T_xml_schema *)this );
-
-        isSuccessful = true;
-    }
-    catch( boost::archive::archive_exception e )
+        ia >> boost::serialization::make_nvp( RootTagName(), *polymorphic_downcast<T_xml_schema*>(this) );
+
+        isSuccessful = true;
+    }
+    catch( boost::archive::archive_exception const& e )
     {
         if( isShowExceptionMessage )
@@ -249 +248 @@
 
         // ファイルに書き出し
-        oa << boost::serialization::make_nvp( RootTagName(), *(T_xml_schema *)this );
-
-        isSuccessful = true;
-    }
-    catch( boost::archive::archive_exception e )
+        oa << boost::serialization::make_nvp( RootTagName(), *polymorphic_downcast<T_xml_schema const*>(this) );
+
+        isSuccessful = true;
+    }
+    catch( boost::archive::archive_exception const& e )
     {
         if( isShowExceptionMessage )
@@ -289 +288 @@
 
         // 文字列ストリームから読込
-        ia >> boost::serialization::make_nvp( RootTagName(), *(T_xml_schema *)this );
-
-        isSuccessful = true;
-    }
-    catch( boost::archive::archive_exception e )
+        ia >> boost::serialization::make_nvp( RootTagName(), *polymorphic_downcast<T_xml_schema*>(this) );
+
+        isSuccessful = true;
+    }
+    catch( boost::archive::archive_exception const& e )
     {
         echo( e.what() );
@@ -313 +312 @@
 
         // 文字列ストリームに書き出し
-        oa << boost::serialization::make_nvp( RootTagName(), *(T_xml_schema *)this );
-
-        isSuccessful = true;
-    }
-    catch( boost::archive::archive_exception e )
+        oa << boost::serialization::make_nvp( RootTagName(), *polymorphic_downcast<T_xml_schema const*>(this) );
+
+        isSuccessful = true;
+    }
+    catch( boost::archive::archive_exception const& e )
     {
         echo( e.what() );
@@ -342 +341 @@
 
         // ファイルから読込
-        ia >> boost::serialization::make_nvp( RootTagName(), *(T_xml_schema *)this );
-
-        isSuccessful = true;
-    }
-    catch( boost::archive::archive_exception e )
+        ia >> boost::serialization::make_nvp( RootTagName(), *polymorphic_downcast<T_xml_schema*>(this) );
+
+        isSuccessful = true;
+    }
+    catch( boost::archive::archive_exception const& e )
     {
         if( isShowExceptionMessage )
@@ -380 +379 @@
 
         // ファイルに書き出し
-        oa << boost::serialization::make_nvp( RootTagName(), *(T_xml_schema *)this );
-
-        isSuccessful = true;
-    }
-    catch( boost::archive::archive_exception e )
+        oa << boost::serialization::make_nvp( RootTagName(), *polymorphic_downcast<T_xml_schema const*>(this) );
+
+        isSuccessful = true;
+    }
+    catch( boost::archive::archive_exception const& e )
     {
         if( isShowExceptionMessage )
@@ -420 +419 @@
 
         // 文字列ストリームから読込
-        ia >> boost::serialization::make_nvp( RootTagName(), *(T_xml_schema *)this );
+        ia >> boost::serialization::make_nvp( RootTagName(), *polymorphic_downcast<T_xml_schema*>(this) );
 
         isSuccessful = true;
@@ -445 +444 @@
 
         // 文字列ストリームに書き出し
-        oa << boost::serialization::make_nvp( RootTagName(), *(T_xml_schema *)this );
-
-        isSuccessful = true;
-    }
-    catch( boost::archive::archive_exception e )
+        oa << boost::serialization::make_nvp( RootTagName(), *polymorphic_downcast<T_xml_schema const*>(this) );
+
+        isSuccessful = true;
+    }
+    catch( boost::archive::archive_exception const& e )
     {
         echo( e.what() );
@@ -478 +477 @@
 
         // 文字列ストリームから読込
-        ia >> boost::serialization::make_nvp( RootTagName(), *(T_xml_schema *)this );
+        ia >> boost::serialization::make_nvp( RootTagName(), *polymorphic_downcast<T_xml_schema*>(this) );
 
         isSuccessful = true;

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

@@ -353 +353 @@
 const std::string Compiler::TypeToString( const Type &type )
 {
-    if( PTR_LEVEL( type.GetBasicType() ) ){
+    if(type.GetBasicType() != DEF_NON && PTR_LEVEL( type.GetBasicType() ) ){
         //ポインタレベルが1以上の場合
         Type tempType( type );

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

@@ -3 +3 @@
 using namespace ActiveBasic::Compiler;
 
-bool LexicalAnalyzer::CollectNamespaces( const char *source, NamespaceScopesCollection &namespaceScopesCollection )
+using boost::numeric_cast;
+
+bool LexicalAnalyzer::CollectNamespaces(char const* source, NamespaceScopesCollection &namespaceScopesCollection)
 {
-    int i, i2;
-    char temporary[1024];
-
     bool isSuccessful = true;
 
@@ -13 +12 @@
     NamespaceScopes namespaceScopes;
 
-    for(i=0;;i++){
+    for (int i = 0; ; i++)
+    {
         if(source[i]=='\0') break;
 
         if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){
-            for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( source[i] ) ){
-                    temporary[i2]=0;
-                    break;
-                }
-                temporary[i2]=source[i];
+            i+=2;
+            char const* p = &source[i];
+            while (!IsCommandDelimitation(source[i]))
+            {
+                ++i;
             }
-            namespaceScopes.push_back( temporary );
+            namespaceScopes.push_back(std::string(p, &source[i]));
 
             if( !namespaceScopesCollection.IsExist( namespaceScopes ) ){
@@ -46 +45 @@
     }
 
-    if( namespaceScopes.size() > 0 ){
+    if( !namespaceScopes.empty() ){
         compiler.errorMessenger.Output( 63, NULL, cp );
         isSuccessful = false;

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

@@ -15 +15 @@
 void LexicalAnalyzer::CollectClassesForNameOnly( const char *source, Classes &classes )
 {
-    int i, i2;
+    int i2;
     char temporary[VN_SIZE];
 
@@ -25 +25 @@
     compiler.GetNamespaceSupporter().ClearImportedNamespaces();
 
-    for(i=0;;i++){
+    for(int i=0;;i++){
         if(source[i]=='\0') break;
 
         if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){
-            for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( source[i] ) ){
-                    temporary[i2]=0;
-                    break;
-                }
-                temporary[i2]=source[i];
-            }
-            namespaceScopes.push_back( temporary );
+            i+=2;
+            char const* p = &source[i];
+            while (!IsCommandDelimitation(source[i]))
+            {
+                ++i;
+            }
+            namespaceScopes.push_back(std::string(p, &source[i]));
 
             continue;
@@ -52 +51 @@
         }
         else if( source[i] == 1 && source[i+1] == ESC_IMPORTS ){
-            for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( source[i] ) ){
-                    temporary[i2]=0;
-                    break;
-                }
-                temporary[i2]=source[i];
-            }
-            if( !compiler.GetNamespaceSupporter().ImportsNamespace( temporary ) )
-            {
-                compiler.errorMessenger.Output(64,temporary,i );
+            i+=2;
+            char const* p = &source[i];
+            while (!IsCommandDelimitation(source[i]))
+            {
+                ++i;
+            }
+            std::string s(p, &source[i]);
+            if (!compiler.GetNamespaceSupporter().ImportsNamespace(s))
+            {
+                compiler.errorMessenger.Output(64, s.c_str(), i);
             }
 
@@ -1348 +1347 @@
     delete pobj_LoopRefCheck;
     pobj_LoopRefCheck=0;
-
-    // イテレータの準備
-    classes.Iterator_Init();
 }
 
@@ -1412 +1408 @@
 
     compiler.GetObjectModule().meta.GetUserProcs().Put( pUserProc );
-    compiler.GetObjectModule().meta.GetUserProcs().Iterator_Init();
 
     LexicalAnalyzer::AddMethod(
@@ -1522 +1517 @@
         else
         {
-            for( int i=0; i<pInterface->GetDynamicMethods().size(); i++ )
+            for( std::size_t i=0; i<pInterface->GetDynamicMethods().size(); i++ )
             {
                 if( pInterface->GetDynamicMethods()[i]->IsAbstract() != pExpandedInterface->GetDynamicMethods()[i]->IsAbstract() )

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

@@ -85 +85 @@
 
     int i2;
-    char temporary[1024];
 
     // 名前空間管理
@@ -91 +90 @@
     namespaceScopes.clear();
 
-    for(int i=0;;i++){
+    for (int i = 0; ; ++i)
+    {
         if( source[i] == '\0' ) break;
 
         if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){
-            for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( source[i] ) ){
-                    temporary[i2]=0;
-                    break;
-                }
-                temporary[i2]=source[i];
-            }
-            namespaceScopes.push_back( temporary );
+            i+=2;
+            char const* p = &source[i];
+            while (!IsCommandDelimitation(source[i]))
+            {
+                ++i;
+            }
+            namespaceScopes.push_back(std::string(p, &source[i]));
 
             continue;
@@ -131 +130 @@
                 }
 
+                char const* beginTemp = &source[i];
+                char const* endTemp = &source[i];
+
                 for(i2=0;;i++,i2++){
                     if(source[i]=='\"'){
-                        temporary[i2]=source[i];
                         for(i++,i2++;;i++,i2++){
-                            temporary[i2]=source[i];
                             if(source[i]=='\"') break;
                         }
@@ -141 +141 @@
                     }
                     if(IsCommandDelimitation(source[i])){
-                        temporary[i2]=0;
+                        endTemp = beginTemp + i2;
                         break;
                     }
-                    temporary[i2]=source[i];
                 }
 
                 //名前を取得
-                char name[VN_SIZE];
+                char const* nameEnd;
                 for(i2=0;;i2++){
-                    if(temporary[i2]=='\0'){
+                    if(beginTemp[i2]=='\0'){
                         compiler.errorMessenger.Output(10,"Const",cp);
                         return;
                     }
-                    if(temporary[i2]=='='||temporary[i2]=='('){
-                        name[i2]=0;
+                    if(beginTemp[i2]=='='||beginTemp[i2]=='('){
+                        nameEnd = beginTemp + i2;
                         break;
                     }
-                    name[i2]=temporary[i2];
-                }
+                }
+                std::string name(beginTemp, nameEnd);
 
                 //重複チェック
@@ -165 +164 @@
                     || compiler.GetObjectModule().meta.GetGlobalConsts().IsExistDuplicationKeyName( name ) )
                 {
-                    compiler.errorMessenger.Output(15,name,cp);
+                    compiler.errorMessenger.Output(15, name, cp);
                     return;
                 }
 
-                if( temporary[i2] == '=' )
+                if( beginTemp[i2] == '=' )
                 {
                     // 定数
-                    const char *expression = temporary + i2 + 1;
+                    std::string expression(beginTemp + i2 + 1, endTemp);
 
                     _int64 i64data;
                     Type resultType;
-                    if( StaticCalculation(false, expression, 0, &i64data, resultType) )
+                    if( StaticCalculation(false, expression.c_str(), 0, &i64data, resultType) )
                     {
                         consts.Add( Symbol( namespaceScopes, name ), i64data, resultType );
@@ -184 +183 @@
                 {
                     // 定数マクロ
-                    const char *params = temporary + i2;
-                    if( !constMacros.Add( Symbol( namespaceScopes, name ), params ) )
+                    std::string params(beginTemp + i2, endTemp);
+                    if( !constMacros.Add( Symbol( namespaceScopes, name ), params.c_str() ) )
                     {
                         compiler.errorMessenger.Output( 1, NULL, i );
@@ -206 +205 @@
         }
     }
-
-    // イテレータを初期化
-    compiler.GetObjectModule().meta.GetGlobalConsts().Iterator_Init();
-    compiler.GetObjectModule().meta.GetGlobalConstMacros().Iterator_Init();
-}
-
-bool LexicalAnalyzer::ConstMacroToExpression( const ConstMacro &constMacro, const char *parameterStr, char *dest )
-{
-    extern HANDLE hHeap;
-    int i2,i3,i4,num;
+}
+
+bool LexicalAnalyzer::ConstMacroToExpression( const ConstMacro &constMacro, const char *parameterStr, char *dest, std::size_t destSize )
+{
+    std::string s;
+    auto ret = ConstMacroToExpression(constMacro, parameterStr, s);
+    strcpy_s(dest, destSize, s.c_str());
+    return ret;
+}
+
+bool LexicalAnalyzer::ConstMacroToExpression( const ConstMacro &constMacro, const char *parameterStr, std::string& dest )
+{
+    int i2,i3;
     char temporary[VN_SIZE];
-    char *pParms[MAX_PARMS];
-    num=0;
+    std::vector<std::string> Parms;
+    dest.reserve(8192);
     i2=0;
     while(1){
         i2=GetOneParameter(parameterStr,i2,temporary);
 
-        pParms[num]=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-        lstrcpy(pParms[num],temporary);
-
-        num++;
+        Parms.push_back(temporary);
+
         if(parameterStr[i2]=='\0') break;
     }
-    if( num != constMacro.GetParameters().size() ){
+    if( Parms.size() != constMacro.GetParameters().size() ){
         extern int cp;
-        for(i2=0;i2<num;i2++) HeapDefaultFree(pParms[i2]);
         compiler.errorMessenger.Output(10,constMacro.GetName().c_str(),cp);
-        lstrcpy(dest,"0");
+        dest = '0';
         return true;
     }
 
     i2=0;
-    i4=0;
     while(1){
 
@@ -257 +255 @@
         if( i3 == (int)constMacro.GetParameters().size() ){
             //パラメータでないとき
-            lstrcpy(dest+i4,temporary);
-            i4+=lstrlen(temporary);
+            dest += temporary;
         }
         else{
             //パラメータのとき
-            lstrcpy(dest+i4,pParms[i3]);
-            i4+=lstrlen(pParms[i3]);
+            dest += Parms[i3];
         }
 
         //演算子をコピー
-        for(;;i2++,i4++){
+        for(;;i2++){
             if( constMacro.GetExpression()[i2] == 1 ){
-                dest[i4++] = constMacro.GetExpression()[i2++];
-                dest[i4] = constMacro.GetExpression()[i2];
+                dest += constMacro.GetExpression()[i2++];
+                dest += constMacro.GetExpression()[i2];
                 continue;
             }
             if(IsVariableTopChar( constMacro.GetExpression()[i2] )) break;
-            dest[i4] = constMacro.GetExpression()[i2];
+            dest += constMacro.GetExpression()[i2];
             if( constMacro.GetExpression()[i2] == '\0' ) break;
         }
@@ -281 +277 @@
     }
 
-    for(i2=0;i2<num;i2++) HeapDefaultFree(pParms[i2]);
-
     return true;
 }

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

@@ -5 +5 @@
 void LexicalAnalyzer::CollectDelegates( const char *source, Delegates &delegates )
 {
-    int i2;
-    char temporary[VN_SIZE];
-
     // 名前空間管理
     NamespaceScopes &namespaceScopes = compiler.GetNamespaceSupporter().GetLivingNamespaceScopes();
@@ -15 +12 @@
     compiler.GetNamespaceSupporter().ClearImportedNamespaces();
 
-    int length = lstrlen( source );
-    for( int i=0; i<length; i++ )
+    for (int i=0; source[i] != '\0'; i++)
     {
         if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){
-            for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( source[i] ) ){
-                    temporary[i2]=0;
-                    break;
-                }
-                temporary[i2]=source[i];
-            }
-            namespaceScopes.push_back( temporary );
+            i+=2;
+            char const* p = &source[i];
+            while (!IsCommandDelimitation(source[i]))
+            {
+                ++i;
+            }
+            namespaceScopes.push_back(std::string(p, &source[i]));
 
             continue;
@@ -42 +37 @@
         }
         else if( source[i] == 1 && source[i+1] == ESC_IMPORTS ){
-            for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( source[i] ) ){
-                    temporary[i2]=0;
-                    break;
-                }
-                temporary[i2]=source[i];
-            }
-            if( !compiler.GetNamespaceSupporter().ImportsNamespace( temporary ) )
-            {
-                compiler.errorMessenger.Output(64,temporary,i );
+            i+=2;
+            char const* p = &source[i];
+            while (!IsCommandDelimitation(source[i]))
+            {
+                ++i;
+            }
+            std::string s(p, &source[i]);
+            if (!compiler.GetNamespaceSupporter().ImportsNamespace(s))
+            {
+                compiler.errorMessenger.Output(64, s.c_str(), i);
             }
 
@@ -112 +107 @@
                 {
                     compiler.errorMessenger.Output(-104,name,nowLine);
-                    lstrcpy( returnTypeName, "Double" );
+                    strcpy( returnTypeName, "Double" );
                 }
             }
@@ -127 +122 @@
     Jenga::Common::SourceTemplate sourceTemplate( ActiveBasic::Common::Environment::GetAbdevSystemDirPath() + "\\templates\\delegate_class.tab" );
 
-    delegates.Iterator_Reset();
-    while( delegates.Iterator_HasNext() )
-    {
-        const Delegate &dg = *delegates.Iterator_GetNext();
+    foreach (auto pDelegate, delegates)
+    {
+        const Delegate &dg = *pDelegate;
 
         if( dg.IsExternal() )
@@ -263 +257 @@
 void LexicalAnalyzer::RefleshDelegatesParameterAndReturnType( Delegates &delegates )
 {
-    delegates.Iterator_Reset();
-    while( delegates.Iterator_HasNext() )
-    {
-        Delegate &dg = *delegates.Iterator_GetNext();
-        RefleshDelegateParameterAndReturnType( dg );
-    }
-}
+    foreach (auto *pDelegate, delegates)
+    {
+        RefleshDelegateParameterAndReturnType(*pDelegate);
+    }
+}

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

@@ -913 +913 @@
 
         if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){
-            for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( source[i] ) ){
-                    temporary[i2]=0;
-                    break;
-                }
-                temporary[i2]=source[i];
-            }
-            namespaceScopes.push_back( temporary );
+            i+=2;
+            char const* p = &source[i];
+            while (!IsCommandDelimitation(source[i]))
+            {
+                ++i;
+            }
+            namespaceScopes.push_back(std::string(p, &source[i]));
 
             continue;
@@ -936 +935 @@
         }
         else if( source[i] == 1 && source[i+1] == ESC_IMPORTS ){
-            for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( source[i] ) ){
-                    temporary[i2]=0;
-                    break;
-                }
-                temporary[i2]=source[i];
-            }
-            if( !compiler.GetNamespaceSupporter().ImportsNamespace( temporary ) )
-            {
-                compiler.errorMessenger.Output(64,temporary,cp );
+            i+=2;
+            char const* p = &source[i];
+            while (!IsCommandDelimitation(source[i]))
+            {
+                ++i;
+            }
+            std::string s(p, &source[i]);
+            if (!compiler.GetNamespaceSupporter().ImportsNamespace(s))
+            {
+                compiler.errorMessenger.Output(64, s.c_str(), i);
             }
 

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

@@ -1 +1 @@
 #include "stdafx.h"
+#include <abdev/ab_common/include/ab_common.h>
+#include "LexicalAnalyzer.h"
+#include "Compiler.h"
+#include "StrOperation.h"
+#include <boost/algorithm/string/predicate.hpp>
 
 using namespace ActiveBasic::Compiler;
 
-void LexicalAnalyzer::AddTypeDef( TypeDefCollection &typeDefs, const NamespaceScopes &namespaceScopes, const std::string &expression, int nowLine )
+void LexicalAnalyzer::AddTypeDef( TypeDefCollection &typeDefs, const NamespaceScopes &namespaceScopes, const boost::iterator_range<char const*> &expression, int nowLine )
 {
-    int i;
-    char temporary[VN_SIZE];
+    auto name = boost::find<boost::return_begin_found>(expression, '=');
 
-    for(i=0;;i++){
-        if(expression[i]=='='||expression[i]=='\0'){
-            temporary[i]=0;
-            break;
-        }
-        temporary[i]=expression[i];
-    }
-
-    if(expression[i]!='='){
-        compiler.errorMessenger.Output(10,"TypeDef",nowLine);
+    if (boost::end(name) == boost::end(expression))
+    {
+        compiler.errorMessenger.Output(10, "TypeDef", nowLine);
         return;
     }
 
-    const char *pTemp=expression.c_str()+i+1;
+    const char *pTemp = expression.begin() + boost::size(name) + 1;
 
     //識別文字のエラーチェック（新しい型）
-    i=0;
-    for(;;i++){
-        if(temporary[i]=='\0') break;
-        if( !( IsVariableChar( temporary[i], true) ) ){
-            compiler.errorMessenger.Output(10,"TypeDef",nowLine);
-            return;
-        }
+    if (!boost::algorithm::all(name, [](char c) {return IsVariableChar(c, true);}))
+    {
+        compiler.errorMessenger.Output(10, "TypeDef", nowLine);
+        return;
     }
 
@@ -41 +35 @@
         }
     }
-    else{
-        i=0;
+    else
+    {
+        int i=0;
         while(pTemp[i]=='*') i++;
-        for(;;i++){
-            if(pTemp[i]=='\0') break;
-            if( !( IsVariableChar( pTemp[i], true) ) )
-            {
-                compiler.errorMessenger.Output(10,"TypeDef",nowLine);
-                return;
-            }
+        if (!boost::algorithm::all(name, [](char c) {return IsVariableChar(c, true);}))
+        {
+            compiler.errorMessenger.Output(10,"TypeDef",nowLine);
+            return;
         }
     }
 
+    std::string baseName(pTemp, expression.end());
+
     //識別子が重複している場合はエラーにする
-    if(lstrcmp(temporary,pTemp)==0){
+    if (boost::algorithm::equals(name, baseName))
+    {
         compiler.errorMessenger.Output(1,NULL,nowLine);
         return;
@@ -67 +62 @@
 
     Type baseType;
-    if( !compiler.StringToType( pTemp, baseType ) )
+    if( !compiler.StringToType( baseName, baseType ) )
     {
-        compiler.errorMessenger.Output(3, pTemp, nowLine );
+        compiler.errorMessenger.Output(3, baseName, nowLine );
         return;
     }
@@ -75 +70 @@
     typeDefs.push_back(
         TypeDef(
-            Symbol( namespaceScopes, temporary ),
-            pTemp,
+            Symbol(namespaceScopes, boost::copy_range<std::string>(name)),
+            baseName,
             baseType
         )
@@ -90 +85 @@
     compiler.GetNamespaceSupporter().ClearImportedNamespaces();
 
-    int i=-1, i2;
-    char temporary[VN_SIZE];
-    while(1){
-
-        i++;
-
+    for (int i = 0; ; ++i)
+    {
         if( source[i] == 1 && source[i+1] == ESC_NAMESPACE ){
-            for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( source[i] ) ){
-                    temporary[i2]=0;
-                    break;
-                }
-                temporary[i2]=source[i];
+            i+=2;
+            char const* p = &source[i];
+            while (!IsCommandDelimitation(source[i]))
+            {
+                ++i;
             }
-            namespaceScopes.push_back( temporary );
+            namespaceScopes.push_back(std::string(p, &source[i]));
 
             continue;
@@ -120 +110 @@
         }
         else if( source[i] == 1 && source[i+1] == ESC_IMPORTS ){
-            for(i+=2,i2=0;;i2++,i++){
-                if( IsCommandDelimitation( source[i] ) ){
-                    temporary[i2]=0;
-                    break;
-                }
-                temporary[i2]=source[i];
+            i+=2;
+            char const* p = &source[i];
+            while (!IsCommandDelimitation(source[i]))
+            {
+                ++i;
             }
-            if( !compiler.GetNamespaceSupporter().ImportsNamespace( temporary ) )
+            std::string s(p, &source[i]);
+            if (!compiler.GetNamespaceSupporter().ImportsNamespace(s))
             {
-                compiler.errorMessenger.Output(64,temporary,i );
+                compiler.errorMessenger.Output(64, s.c_str(), i);
             }
 
@@ -144 +134 @@
             char temporary[VN_SIZE];
             if(source[i+1]==ESC_TYPEDEF){
-                int i2 = 0;
-                for(i+=2;;i2++,i++){
-                    if(source[i]=='\n'){
-                        temporary[i2]=0;
-                        break;
-                    }
-                    temporary[i2]=source[i];
-                    if(source[i]=='\0') break;
+                i+=2;
+                char const* p = &source[i];
+                while (!IsCommandDelimitation(source[i]))
+                {
+                    ++i;
                 }
-                AddTypeDef( typeDefs, namespaceScopes, temporary, i );
-
+                AddTypeDef(typeDefs, namespaceScopes, boost::make_iterator_range(p, &source[i]), i);
                 continue;
             }
@@ -168 +154 @@
                 }
 
-                Type baseType;
-                if( !compiler.StringToType( "Long", baseType ) )
-                {
-                    throw;
-                }
-
                 typeDefs.push_back(
                     TypeDef(
                         Symbol( namespaceScopes, temporary ),
                         "Long",
-                        baseType
+                        Type(DEF_LONG)
                     )
                 );

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

@@ -257 +257 @@
     nativeCode.PutEx( masterObjectModule.globalNativeCode );
 
-    masterObjectModule.meta.GetUserProcs().Iterator_Reset();
-    while( masterObjectModule.meta.GetUserProcs().Iterator_HasNext() )
-    {
-        const UserProc *pUserProc = masterObjectModule.meta.GetUserProcs().Iterator_GetNext();
-
+    foreach (auto pUserProc, masterObjectModule.meta.GetUserProcs())
+    {
         if( pUserProc->GetNativeCode().GetSize() > 0 )
         {

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

@@ -18 +18 @@
     int back_cp=cp;
 
-    classes.Iterator_Reset();
-    while(classes.Iterator_HasNext()){
-        CClass &objClass = *classes.Iterator_GetNext();
+    foreach(auto pClass, classes)
+    {
+        CClass &objClass = *pClass;
         if( objClass.IsExternal() )
         {
@@ -83 +83 @@
     ////////////////////////////////////////////////////////////////////
 
-    // イテレータをリセット
-    classes.Iterator_Reset();
-
-    while( classes.Iterator_HasNext() ){
-        const CClass &objClass = *classes.Iterator_GetNext();
+    foreach (auto pClass, classes)
+    {
+        const CClass &objClass = *pClass;
 
         if( !objClass.IsUsing() ){
@@ -152 +150 @@
     ChangeOpcode( temporary );
 
-    // イテレータをリセット
-    classes.Iterator_Reset();
-
-    while( classes.Iterator_HasNext() ){
-        const CClass &objClass = *classes.Iterator_GetNext();
+    foreach (auto pClass, classes)
+    {
+        const CClass &objClass = *pClass;
 
         if( !objClass.IsUsing() ){

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

@@ -93 +93 @@
 void VtblGenerator::GenerateVTablesForAllClasses( Classes &classes )
 {
-    classes.Iterator_Reset();
-    while( classes.Iterator_HasNext() )
+    foreach (auto pClass, classes)
     {
-        CClass *pClass = classes.Iterator_GetNext();
         GenerateFullVTables( *pClass );
 
@@ -177 +175 @@
 void VtblGenerator::ActionVtblScheduleForAllClasses( Classes &classes, LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection, LONG_PTR MemPos_DataSection )
 {
-    classes.Iterator_Reset();
-    while( classes.Iterator_HasNext() )
+    foreach(auto pClass, classes)
     {
-        CClass *pClass = classes.Iterator_GetNext();
         ActionVtblSchedule( *pClass, ImageBase, MemPos_CodeSection, MemPos_DataSection );