Changeset 387 in dev for trunk/abdev/BasicCompiler_Common/src/DataTable.cpp

Timestamp:

Feb 11, 2008, 12:06:15 PM (17 years ago)

Author:

dai_9181

Message:

メンバ情報を保持するようにした

File:

• trunk/abdev/BasicCompiler_Common/src/DataTable.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/src/DataTable.cpp

@@ -65 +65 @@
     return retSize;
 }
-int DataTable::AddString( const char *str ){
-    int retSize = size;
-    AddString( str, lstrlen( str ) );
-    return retSize;
+int DataTable::AddString( const char *str )
+{
+    return AddString( str, lstrlen( str ) );
+}
+int DataTable::AddString( const std::string &str )
+{
+    return AddString( str.c_str(), static_cast<int>(str.length()) );
+}
+int DataTable::AddSpace( int size )
+{
+    int retSize = this->size;
+    Realloc( this->size + size );
+    return retSize;
+}
+void DataTable::AddAlignment( int size )
+{
+    if( this->size % size == 0 )
+    {
+        // 既に境界のとき
+        return;
+    }
+    Realloc( this->size + ( size - (int)(this->size%size) ) );
 }
 
@@ -262 +280 @@
     RemoveStringBracket( buffer );
 
-    void *binary = malloc( 1 );
-    int num = 0;
-
+    Jenga::Common::Strings parameters;
+    SplitParameter( buffer, parameters );
+
+    // アラインメント
+    AddAlignment( tempBaseType.GetSize() );
+
+    // データテーブルに空間を確保
+    dataTableOffset = AddSpace( static_cast<int>(tempBaseType.GetSize() * parameters.size()) );
+
+    bool isSuccessful = true;
     int i = 0;
-    bool isSuccessful = true;
-    while( buffer[i] ){
-        char temporary[1024];
-
-        i = GetOneParameter( buffer, i, temporary );
-        if( buffer[i] == ',' ){
-            i++;
-        }
-
-        Type resultType;
-        _int64 i64data;
-        if( !StaticCalculation( true, temporary, tempBaseType.GetBasicType(), &i64data, resultType ) ){
-            isSuccessful = false;
-            break;
-        }
-        if( !resultType.IsWhole() ){
-            // TODO: 実数に未対応
-            SetError();
-            isSuccessful = false;
-            break;
-        }
-
-        binary = realloc( binary, ( num + 1 ) * tempBaseType.GetSize() );
-        memcpy( (char *)binary + (num * tempBaseType.GetSize()), &i64data, tempBaseType.GetSize() );
-        num++;
+    BOOST_FOREACH( const std::string &paramStr, parameters )
+    {
+        if( paramStr[0] == '\"' )
+        {
+            // 文字列
+            std::string tempParamStr = paramStr;
+            if( !RemoveStringQuotes( tempParamStr ) )
+            {
+                SetError();
+            }
+
+            // 文字列を追加
+            _int64 strOffset = this->AddString( tempParamStr );
+
+            // ポインタ値を上書き
+            int tempOffset = dataTableOffset + i * tempBaseType.GetSize();
+            this->OverwriteBinary( tempOffset, &strOffset, tempBaseType.GetSize() );
+
+            // DataTableスケジュール
+            this->schedules.push_back( Schedule( Schedule::DataTable, tempOffset  ) );
+        }
+        else
+        {
+            // 数値
+            Type resultType;
+            _int64 i64data;
+            if( !StaticCalculation( true, paramStr.c_str(), tempBaseType.GetBasicType(), &i64data, resultType ) ){
+                isSuccessful = false;
+                break;
+            }
+            if( !resultType.IsWhole() ){
+                // TODO: 実数に未対応
+                SetError();
+                isSuccessful = false;
+                break;
+            }
+
+            // 上書き
+            this->OverwriteBinary( dataTableOffset + i * tempBaseType.GetSize(), &i64data, tempBaseType.GetSize() );
+        }
+
+        i++;
     }
 
     free( buffer );
-
-    dataTableOffset = this->AddBinary( binary, num * tempBaseType.GetSize() );
-
-    free( binary );
 
     return isSuccessful;