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

Timestamp:

Sep 10, 2008, 1:53:07 AM (16 years ago)

Author:

dai

Message:

• Compiler::AddStringToDataTableメソッドを実装。
• ToWStringメソッドの内部予備バッファを増やした。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• include/Compiler.h (modified) (1 diff)
• src/Compiler.cpp (modified) (1 diff)
• src/DataTableGenerator.cpp (modified) (2 diffs)
• src/Exception.cpp (modified) (1 diff)

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

@@ -164 +164 @@
         return isUnicode;
     }
+
+    int AddStringToDataTable( const std::string &text );
 
 

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

@@ -76 +76 @@
 
     return globalAreaProcName;
+}
+
+int Compiler::AddStringToDataTable( const std::string &text )
+{
+    if( this->IsUnicode() )
+    {
+        return this->GetObjectModule().dataTable.AddWString( Jenga::Common::ToWString( text ) );
+    }
+    else
+    {
+        return this->GetObjectModule().dataTable.AddString( text );
+    }
 }
 

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

@@ -178 +178 @@
 
     // 文字列バッファをデータ領域へ追加
-    if( compiler.IsUnicode() )
-    {
-        dataTable.AddWString( Jenga::Common::ToWString( str ) );
-    }
-    else
-    {
-        dataTable.AddString( str );
-    }
+    compiler.AddStringToDataTable( str );
 
     return dataTableOffset;
@@ -239 +232 @@
             {
                 // Charポインタ
-                if( compiler.IsUnicode() )
-                {
-                    strOffset = dataTable.AddWString( Jenga::Common::ToWString( tempParamStr ) );
-                }
-                else
-                {
-                    strOffset = dataTable.AddString( tempParamStr );
-                }
+                strOffset = compiler.AddStringToDataTable( tempParamStr );
             }
 

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

@@ -196 +196 @@
             // パラメータのクラス名
             char paramName[VN_SIZE] = "";
-            int paramNameDataTableOffset = 0;
             if( catchScope.GetParamType().IsObject() )
             {
                 lstrcpy( paramName, catchScope.GetParamType().GetClass().GetFullName().c_str() );
             }
-            if( compiler.IsUnicode() )
-            {
-                paramNameDataTableOffset = compiler.GetObjectModule().dataTable.AddWString( Jenga::Common::ToWString( paramName ) );
-            }
-            else
-            {
-                paramNameDataTableOffset = compiler.GetObjectModule().dataTable.AddString( paramName );
-            }
+            int paramNameDataTableOffset = compiler.AddStringToDataTable( paramName );
             *((LONG_PTR *)(buffer+pos)) = paramNameDataTableOffset;
             pos += sizeof(LONG_PTR);