Changeset 809 in dev for branches

Timestamp:

Feb 13, 2011, 4:10:19 PM (14 years ago)

Author:

イグトランス (egtra)

Message:

実行時で落っこちるところ（2ヶ所）を修正

Location:

branches/egtra/ab5.0/abdev

Files:

• BasicCompiler_Common/error.cpp (modified) (1 diff)
• BasicCompiler_Common/src/Compiler.cpp (modified) (1 diff)
• BasicCompiler_Common/stdafx.h (modified) (1 diff)
• ab_common/src/ResourceManager/ResourceManager.cpp (modified) (1 diff)

branches/egtra/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);
 }
 

branches/egtra/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 );

branches/egtra/ab5.0/abdev/BasicCompiler_Common/stdafx.h

@@ -28 +28 @@
 //boost libraries
 #include <boost/foreach.hpp>
+#include <boost/format.hpp>
+#include <boost/optional.hpp>
 #include <boost/serialization/serialization.hpp>
 #include <boost/serialization/nvp.hpp>

branches/egtra/ab5.0/abdev/ab_common/src/ResourceManager/ResourceManager.cpp

@@ -39 +39 @@
 
     std::string baseDir = Jenga::Common::Path::ExtractDirPath( resourceFilePath );
+
+    if (buffer.empty())
+    {
+        return false;
+    }
 
     i2=0;