Changeset 628 in dev for trunk

Timestamp:

May 29, 2008, 1:36:02 AM (16 years ago)

Author:

dai_9181

Message:

ジェネリクス型の型解決ができない場合のエラーメッセージを実装した。

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/VariableOpe.cpp (modified) (1 diff)
• BasicCompiler_Common/include/Compiler.h (modified) (1 diff)
• BasicCompiler_Common/include/ErrorCode.h (added)
• BasicCompiler_Common/src/Compiler.cpp (modified) (7 diffs)
• BasicCompiler_Common/src/Messenger.cpp (modified) (2 diffs)
• compiler_x64/compiler_x64.vcproj (modified) (1 diff)
• compiler_x64/stdafx.h (modified) (1 diff)
• compiler_x86/compiler_x86.vcproj (modified) (1 diff)
• compiler_x86/stdafx.h (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/VariableOpe.cpp

@@ -849 +849 @@
         }
 
-        if( !compiler.StringToType( temporary, type ) ){
-            compiler.errorMessenger.Output(3,temporary,cp);
+        ActiveBasic::Compiler::Error::StringToTypeErrorCode::EnumType result = compiler.StringToTypeEx( temporary, type, true );
+        if( result != ActiveBasic::Compiler::Error::StringToTypeErrorCode::Successful )
+        {
+            if( result == ActiveBasic::Compiler::Error::StringToTypeErrorCode::FailedResolveGenericType )
+            {
+                compiler.errorMessenger.Output(143,temporary,cp);
+            }
+            else
+            {
+                compiler.errorMessenger.Output(3,temporary,cp);
+            }
             return false;
         }

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

@@ -184 +184 @@
 
 
+    ActiveBasic::Compiler::Error::StringToTypeErrorCode::EnumType StringToTypeEx( const std::string &typeName, Type &type, bool isResolveGenerics = false );
     bool StringToType( const std::string &typeName, Type &type );
     const std::string TypeToString( const Type &type );

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

@@ -14 +14 @@
 }
 
-bool Compiler::StringToType( const std::string &typeName, Type &type ){
+ActiveBasic::Compiler::Error::StringToTypeErrorCode::EnumType Compiler::StringToTypeEx( const std::string &typeName, Type &type, bool isResolveGenerics )
+{
     type.SetIndex( -1 );
 
@@ -35 +36 @@
         if( !pGenericClass )
         {
-            return false;
+            return ActiveBasic::Compiler::Error::StringToTypeErrorCode::NotfoundGenericClass;
         }
 
@@ -70 +71 @@
         type.SetActualGenericTypes( genericTypes );
 
-        return true;
+        return ActiveBasic::Compiler::Error::StringToTypeErrorCode::Successful;
     }
 
@@ -102 +103 @@
             type.SetBasicType( DEF_PTR_PROC );
             type.SetIndex( this->GetObjectModule().meta.GetProcPointers().size() - 1 );
-            return true;
+            return ActiveBasic::Compiler::Error::StringToTypeErrorCode::Successful;
         }
 
         const std::string &nextTypeName = typeName.substr( 1 );
 
-        if( !StringToType( nextTypeName, type ) ){
-            return false;
+        ActiveBasic::Compiler::Error::StringToTypeErrorCode::EnumType result = StringToTypeEx( nextTypeName, type, isResolveGenerics );
+        if( result != ActiveBasic::Compiler::Error::StringToTypeErrorCode::Successful )
+        {
+            return result;
         }
 
         type.PtrLevelUp();
 
-        return true;
+        return ActiveBasic::Compiler::Error::StringToTypeErrorCode::Successful;
     }
 
     {
         int basicType;
-        if( Type::StringToBasicType( typeName, basicType ) ){
+        if( Type::StringToBasicType( typeName, basicType ) )
+        {
             // 基本型だったとき
             type.SetBasicType( basicType );
-            return true;
+            return ActiveBasic::Compiler::Error::StringToTypeErrorCode::Successful;
         }
     }
 
     // Object型だったとき
-    if( typeName == "Object" ){
+    if( typeName == "Object" )
+    {
         type.SetType( DEF_OBJECT, this->GetObjectModule().meta.GetClasses().GetObjectClassPtr() );
-        return true;
+        return ActiveBasic::Compiler::Error::StringToTypeErrorCode::Successful;
     }
 
     // String型だったとき
-    if( typeName == "String" ){
+    if( typeName == "String" )
+    {
         type.SetType( DEF_OBJECT, this->GetObjectModule().meta.GetClasses().GetStringClassPtr() );
-        return true;
+        return ActiveBasic::Compiler::Error::StringToTypeErrorCode::Successful;
     }
 
@@ -142 +148 @@
     ////////////////////
     int i=this->GetObjectModule().meta.GetTypeDefs().GetIndex( LexicalAnalyzer::FullNameToSymbol( typeName ) );
-    if(i!=-1){
+    if(i!=-1)
+    {
         type = this->GetObjectModule().meta.GetTypeDefs()[i].GetBaseType();
-        return true;
+        return ActiveBasic::Compiler::Error::StringToTypeErrorCode::Successful;
     }
 
     //クラス
     const CClass *pobj_c = this->GetObjectModule().meta.GetClasses().FindEx( LexicalAnalyzer::FullNameToSymbol( typeName ) );
-    if(pobj_c){
-        if( pobj_c->IsStructure() ){
+    if(pobj_c)
+    {
+        if( isResolveGenerics )
+        {
+            if( pobj_c->IsGeneric() )
+            {
+                // ジェネリッククラスの場合
+                trace( "型解決されていない" );
+                return ActiveBasic::Compiler::Error::StringToTypeErrorCode::FailedResolveGenericType;
+            }
+        }
+
+        if( pobj_c->IsStructure() )
+        {
             type.SetBasicType( DEF_STRUCT );
         }
-        else{
+        else
+        {
             type.SetBasicType( DEF_OBJECT );
         }
         type.SetClassPtr( pobj_c );
-        return true;
+        return ActiveBasic::Compiler::Error::StringToTypeErrorCode::Successful;
     }
 
@@ -176 +196 @@
             type.SetFormalTypeName( typeName );
             type.SetFormalTypeIndex( formalTypeIndex );
-            return true;
+            return ActiveBasic::Compiler::Error::StringToTypeErrorCode::Successful;
         }
     }
@@ -183 +203 @@
     /////////////////////////////////////////////////////////
 
-    return false;
+    return ActiveBasic::Compiler::Error::StringToTypeErrorCode::NotfoundType;
+}
+
+bool Compiler::StringToType( const std::string &typeName, Type &type )
+{
+    return ( StringToTypeEx( typeName, type, false ) == ActiveBasic::Compiler::Error::StringToTypeErrorCode::Successful );
 }
 

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

@@ -76 +76 @@
         for( int i3=0; ; i3++ )
         {
-            if( !IsVariableChar( tempKeyWord[i3] ) || tempKeyWord[i3] == '.' )
+            if( !IsVariableChar( tempKeyWord[i3] ) )
             {
                 temporary[i3] = 0;
@@ -249 +249 @@
     if(errorCode==141) lstrcpy(msg,"Blittable修飾子をクラス以外の型に指定することはできません。");
     if(errorCode==142) lstrcpy(msg,"不正なThis参照です。");
+    if(errorCode==143) sprintf(msg,"\"%s\" ジェネリクス型に型パラメータが指定されていません。",tempKeyWord);
 
     //Enum関連

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

@@ -326 +326 @@
                 </File>
                 <File
+                    RelativePath="..\BasicCompiler_Common\include\ErrorCode.h"
+                    >
+                </File>
+                <File
                     RelativePath="..\BasicCompiler_Common\include\LexicalAnalyzer.h"
                     >

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

@@ -48 +48 @@
 #include <CodeGenerator.h>
 #include <Messenger.h>
+#include <ErrorCode.h>
 #include <Linker.h>
 #include <Compiler.h>

trunk/ab5.0/abdev/compiler_x86/compiler_x86.vcproj

@@ -1382 +1382 @@
                 </File>
                 <File
+                    RelativePath="..\BasicCompiler_Common\include\ErrorCode.h"
+                    >
+                </File>
+                <File
                     RelativePath="..\BasicCompiler_Common\include\LexicalAnalyzer.h"
                     >

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

@@ -48 +48 @@
 #include <CodeGenerator.h>
 #include <Messenger.h>
+#include <ErrorCode.h>
 #include <Linker.h>
 #include <Compiler.h>