Changeset 715 in dev

Timestamp:

Aug 5, 2008, 2:59:15 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

bufferをstringにして直接返すようにした

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Enum.cpp (modified) (2 diffs)

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

@@ -157 +157 @@
 std::string LexicalAnalyzer::GenerateEnumsSourceCode( const EnumInfoCollection &enums )
 {
-    char *buffer;
-    int MaxSize,length;
-    MaxSize=65535;
-    buffer=(char *)HeapAlloc(hHeap,0,MaxSize+65535);
-    length=0;
-
-    buffer[0]=0;
+    std::string buffer;
+    buffer.reserve(65536);
 
     BOOST_FOREACH( const EnumInfo &enumInfo, enums )
     {
         BOOST_FOREACH( const std::string &namespaceStr, enumInfo.GetNamespaceScopes() ){
-            sprintf(buffer+length,"Namespace %s\n",namespaceStr.c_str());
-            length+=lstrlen(buffer+length);
-        }
-
-        sprintf(buffer+length,"Class Enum %s\n",enumInfo.GetName().c_str());
-        length+=lstrlen(buffer+length);
-        sprintf(buffer+length,"\tInherits EnumBase<%s>\n",enumInfo.GetName().c_str());
-        length+=lstrlen(buffer+length);
-        sprintf(buffer+length,"\tSub %s(value As Long,lpszName As LPCTSTR)\n",enumInfo.GetName().c_str());
-        length+=lstrlen(buffer+length);
-        lstrcpy(buffer+length,"\t\tEnumBase(value,lpszName)\n");
-        length+=lstrlen(buffer+length);
-        lstrcpy(buffer+length,"\tEnd Sub\n");
-        length+=lstrlen(buffer+length);
-        lstrcpy(buffer+length,"Public\n");
-        length+=lstrlen(buffer+length);
-        sprintf(buffer+length,"\tSub %s()\n",enumInfo.GetName().c_str());
-        length+=lstrlen(buffer+length);
-        if( enumInfo.GetMembers().size()){
-            sprintf(buffer+length,"\t\tEnumBase(%s)\n",
-                enumInfo.GetMembers().begin()->GetName().c_str() );
-            length+=lstrlen(buffer+length);
-        }
-        lstrcpy(buffer+length,"\tEnd Sub\n");
-        length+=lstrlen(buffer+length);
-        sprintf(buffer+length,"\tSub ~%s()\n",enumInfo.GetName().c_str());
-        length+=lstrlen(buffer+length);
-        lstrcpy(buffer+length,"\tEnd Sub\n");
-        length+=lstrlen(buffer+length);
+            buffer.append("Namespace ").append(namespaceStr) += '\n';
+        }
+
+        buffer.append("Class Enum ").append(enumInfo.GetName()) += '\n';
+        buffer.append("\tInherits EnumBase<").append(enumInfo.GetName()).append(">\n");
+        buffer.append("\tSub ").append(enumInfo.GetName()).append("(value As Long,lpszName As LPCTSTR)\n");
+        buffer.append("\t\tEnumBase(value,lpszName)\n"
+            "\tEnd Sub\n"
+            "Public\n");
+        buffer.append("\tSub ").append(enumInfo.GetName()).append("()\n");
+        if( !enumInfo.GetMembers().empty() ){
+            buffer.append("\t\tEnumBase(").append(enumInfo.GetMembers().front().GetName())
+                .append(")\n");
+        }
+        buffer.append("\tEnd Sub\n");
 
         BOOST_FOREACH( const EnumMember &member, enumInfo.GetMembers() )
         {
-            sprintf(buffer+length,"\tStatic %s As %s((%s) As Long,\"%s\")\n",
-                member.GetName().c_str(),
-                enumInfo.GetName().c_str(),
-                member.GetValueStr().c_str(),
-                member.GetName().c_str());
-            length+=lstrlen(buffer+length);
-        }
-
-        lstrcpy(buffer+length,"End Class\n");
-        length+=lstrlen(buffer+length);
+            buffer.append("\tStatic ")
+                .append(member.GetName()).append(" As ")
+                .append(enumInfo.GetName()).append("((")
+                .append(member.GetValueStr()).append(") As Long,\"")
+                .append(member.GetName()).append("\")\n");
+        }
+
+        buffer.append("End Class\n");
 
         BOOST_FOREACH( const std::string &namespaceStr, enumInfo.GetNamespaceScopes() ){
-            lstrcpy( buffer+length, "End Namespace\n" );
-            length+=lstrlen(buffer+length);
-        }
-
-
-        //バッファ領域が足りなくなった場合はバッファを増量する
-        if(length>MaxSize){
-            MaxSize+=65535;
-            buffer=(char *)HeapReAlloc(hHeap,0,buffer,MaxSize+65535);
+            buffer.append("End Namespace\n");
         }
     }
@@ -229 +200 @@
     logger << buffer << std::endl;
 #endif
-
-    std::string result = buffer;
-
-    HeapDefaultFree( buffer );
-
-    return result;
+    return buffer;
 }