Changeset 528 in dev for trunk

Timestamp:

May 2, 2008, 11:25:38 AM (17 years ago)

Author:

dai_9181

Message:

[522]～[527]を64bit版にマージ。

Location:

trunk/ab5.0/abdev/compiler_x64

Files:

• CParameter.cpp (modified) (2 diffs)
• Compile_Calc.cpp (modified) (1 diff)
• Compile_Func.cpp (modified) (1 diff)
• MakePeHdr.cpp (modified) (3 diffs)
• NumOpe.cpp (modified) (1 diff)
• Opcode.h (modified) (2 diffs)
• compiler_x64.vcproj (modified) (1 diff)
• stdafx.h (modified) (4 diffs)

trunk/ab5.0/abdev/compiler_x64/CParameter.cpp

@@ -6 +6 @@
 #include "opcode.h"
 
-int ParamImpl::NewTempParameters( const string &procName, const Parameters &params, int SecondParmNum ){
+int ParamImpl::NewTempParameters( const std::string &procName, const Parameters &params, int SecondParmNum ){
     if( SecondParmNum == -1 ) SecondParmNum = (int)params.size();
 
@@ -195 +195 @@
 }
 
-
-void ParamImpl::SetParameter( const string &procName, const Parameters &params, int SecondParmNum, const UserProc *pUserProc ){
+void ParamImpl::SetParameter( const std::string &procName, const Parameters &params, int SecondParmNum, const UserProc *pUserProc ){
     if( SecondParmNum == -1 ) SecondParmNum = (int)params.size();
 

trunk/ab5.0/abdev/compiler_x64/Compile_Calc.cpp

@@ -240 +240 @@
     if( varType.IsObject() && compiler.GetObjectModule().meta.GetBlittableTypes().IsExist( calcType ) ){
         // Blittable型をオブジェクトとして扱う
-        vector<const UserProc *> userProcs;
+        std::vector<const UserProc *> userProcs;
         compiler.GetObjectModule().meta.GetBlittableTypes().GetClass( calcType ).GetStaticMethods().Enum( "_Create", userProcs );
         if( userProcs.size() != 1 ){

trunk/ab5.0/abdev/compiler_x64/Compile_Func.cpp

@@ -376 +376 @@
     }
 }
-void Opcode_Func_SizeOf( const string &typeName ){
+void Opcode_Func_SizeOf( const std::string &typeName ){
     Type tempType;
     if( !compiler.StringToType( typeName, tempType ) ){

trunk/ab5.0/abdev/compiler_x64/MakePeHdr.cpp

@@ -146 +146 @@
     // デリゲートに関する情報を収集
     {
-        compiler.GetObjectModule().meta.GetDelegates().Collect(
-            compiler.GetObjectModule().GetCurrentSource()
+        ActiveBasic::Compiler::LexicalAnalyzer::CollectDelegates(
+            compiler.GetObjectModule().GetCurrentSource(),
+            compiler.GetObjectModule().meta.GetDelegates()
         );
         compiler.GetObjectModule().meta.GetDelegates().Iterator_Init();
 
         // デリゲートからクラスコードを生成
-        std::string tempSource;
-        compiler.GetObjectModule().meta.GetDelegates().GenerateSourceCode( tempSource );
+        std::string tempSource = ActiveBasic::Compiler::LexicalAnalyzer::GenerateDelegatesSourceCode(
+            compiler.GetObjectModule().meta.GetDelegates()
+        );
         AddSourceCode( tempSource.c_str() );
     }
@@ -173 +175 @@
     型情報に依存するパラメータ情報を取得できないため、ここでの再取得が必要
     */
-    compiler.GetObjectModule().meta.GetDelegates().RefleshParameterAndReturnType();
+    ActiveBasic::Compiler::LexicalAnalyzer::RefleshDelegatesParameterAndReturnType(
+        compiler.GetObjectModule().meta.GetDelegates()
+    );
 
     //定数情報を取得
@@ -309 +313 @@
 #ifdef _DEBUG
     {
-        ofstream ofs("middle_code.txt");
-        ofs << basbuf << endl;
+        std::ofstream ofs( ( Jenga::Common::Environment::GetAppDir() + "\\middle_code.txt" ).c_str() );
+        ofs << basbuf << std::endl;
         ofs.close();
     }

trunk/ab5.0/abdev/compiler_x64/NumOpe.cpp

@@ -255 +255 @@
     // 動的メソッドを検索
     ///////////////////////////////////////////////////////////////////
-    vector<const UserProc *> userProcs;
+    std::vector<const UserProc *> userProcs;
 
     char methodName[VN_SIZE], lpPtrOffset[VN_SIZE], parameter[VN_SIZE], dummy[1];

trunk/ab5.0/abdev/compiler_x64/Opcode.h

@@ -267 +267 @@
 class ParamImpl{
     char *Parms[255];
-    vector<Type> types;
+    std::vector<Type> types;
     int ParmsNum;
 
@@ -297 +297 @@
 
     void ApplyDefaultParameters( const Parameters &params );
-    bool ErrorCheck( const string &procName, const Parameters &params, int SecondParmNum = -1 );
+    bool ErrorCheck( const std::string &procName, const Parameters &params, int SecondParmNum = -1 );
     void MacroParameterSupport( const Parameters &params );
     void SetStructParameter( int reg, const Type &baseType, const char *expression );
-    void SetParameter( const string &procName, const Parameters &params, int SecondParmNum = -1, const UserProc *pUserProc = NULL );
+    void SetParameter( const std::string &procName, const Parameters &params, int SecondParmNum = -1, const UserProc *pUserProc = NULL );
 
     //一時オブジェクトパラメータの生成と破棄
-    int NewTempParameters( const string &procName, const Parameters &params, int SecondParmNum = -1 );
+    int NewTempParameters( const std::string &procName, const Parameters &params, int SecondParmNum = -1 );
     void DeleteTempParameters();
 

trunk/ab5.0/abdev/compiler_x64/compiler_x64.vcproj

@@ -1258 +1258 @@
                 </File>
                 <File
+                    RelativePath="..\BasicCompiler_Common\src\LexicalAnalyzer_Delegate.cpp"
+                    >
+                </File>
+                <File
                     RelativePath="..\BasicCompiler_Common\src\Linker.cpp"
                     >

trunk/ab5.0/abdev/compiler_x64/stdafx.h

@@ -6 +6 @@
 #include <fstream>
 #include <iostream>
+#include <iomanip>
+#include <ios>
+#include <streambuf>
+#include <sstream>
 
 #include <windows.h>
@@ -19 +23 @@
 #include <io.h>
 #include <shlwapi.h>
+#include <tchar.h>
+#include <stdarg.h>
 
 //boost libraries
@@ -28 +34 @@
 #include <jenga/include/jenga.h>
 
+#include <option.h>
+
 #include <abdev/ab_common/include/ab_common.h>
 
@@ -35 +43 @@
 #include "../BasicCompiler_Common/BasicFixed.h"
 
-#include <Configuration.h>
+#include <Binary.h>
+#include <NativeCode.h>
+#include <Source.h>
 #include <Type.h>
 #include <Method.h>
 #include <Interface.h>
+#include <Member.h>
 #include <Class.h>
+#include <Parameter.h>
+#include <Variable.h>
 #include <Procedure.h>
-#include <LexicalAnalyzer.h>
-#include <Program.h>
+#include <TypeDef.h>
+#include <Const.h>
+#include <Delegate.h>
+#include <Enum.h>
+#include <DataTable.h>
+#include <Exception.h>
+#include <Meta.h>
+
+#include <logger.h>
+#include <Configuration.h>
+#include <CodeGenerator.h>
+#include <Messenger.h>
+#include <ObjectModule.h>
+#include <Linker.h>
 #include <Compiler.h>
 #include <Debugger.h>
+#include <Program.h>
+#include <LexicalAnalyzer.h>