Changeset 422 in dev for trunk

Timestamp:

Mar 8, 2008, 10:38:39 PM (16 years ago)

Author:

dai_9181

Message:

デリゲートのパラメータや戻り値にクラス型を指定できない不具合を修正。

Location:

trunk/abdev

Files:

• BasicCompiler32/MakePeHdr.cpp (modified) (1 diff)
• BasicCompiler_Common/include/Delegate.h (modified) (2 diffs)
• BasicCompiler_Common/src/Delegate.cpp (modified) (6 diffs)
• BasicCompiler_Common/src/Parameter.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -178 +178 @@
     //TypeDef情報を初期化
     compiler.GetObjectModule().meta.GetTypeDefs().CollectTypeDefs();
+
+    /*
+    デリゲートのパラメータを再取得
+    クラス/TypeDefなどの型名前情報がすべて揃ってからでないと
+    型情報に依存するパラメータ情報を取得できないため、ここでの再取得が必要
+    */
+    compiler.GetObjectModule().meta.GetDelegates().RefleshParameterAndReturnType();
 
     //定数情報を取得

trunk/abdev/BasicCompiler_Common/include/Delegate.h

@@ -4 +4 @@
 #include <Procedure.h>
 
-class Delegate : public Procedure, public Jenga::Common::ObjectInHashmap<Delegate>
+class Delegates;
+
+class Delegate
+    : public Procedure
+    , public Jenga::Common::ObjectInHashmap<Delegate>
 {
+    friend Delegates;
+
+    std::string paramStr;
+    std::string returnTypeName;
+    int sourceIndex;
+
     Parameters dynamicParams;
 
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - Delegate" );
+
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Procedure );
+        ar & BOOST_SERIALIZATION_NVP( dynamicParams );
+    }
+
 public:
-    Delegate( const NamespaceScopes &namespaceScopes, const std::string &name, Procedure::Kind procKind, const char *paramStr, const Type &returnType, int nowLine );
+    Delegate( const NamespaceScopes &namespaceScopes, const std::string &name, Procedure::Kind procKind, const char *paramStr, const std::string &returnTypeName, int sourceIndex )
+        : Procedure( namespaceScopes, name, procKind, false )
+        , paramStr( paramStr )
+        , returnTypeName( returnTypeName )
+        , sourceIndex( sourceIndex )
+    {
+    }
     Delegate()
     {
     }
+
+    void RefleshParameterAndReturnType();
 
     virtual const std::string &GetKeyName() const
@@ -30 +59 @@
     void Collect( const BasicSource &source );
     void GenerateSourceCode( std::string &destSource );
+    void RefleshParameterAndReturnType();
 };

trunk/abdev/BasicCompiler_Common/src/Delegate.cpp

@@ -3 +3 @@
 #include <Delegate.h>
 
-Delegate::Delegate( const NamespaceScopes &namespaceScopes, const std::string &name, Procedure::Kind procKind, const char *paramStr, const Type &returnType, int nowLine )
-    : Procedure( namespaceScopes, name, procKind, false )
-{
-    this->returnType = returnType;
-    params.Analyze( paramStr, nowLine );
-
+void Delegate::RefleshParameterAndReturnType()
+{
+    // パラメータを解析
+    params.Analyze( paramStr.c_str(), sourceIndex );
+
+    // 動的パラメータを作る
     dynamicParams = params;
     dynamicParams.insert( dynamicParams.begin(), new Parameter( "_System_LocalThis", Type( DEF_PTR_VOID ) ) );
+
+    if( IsFunction() )
+    {
+        // 戻り値を取得
+        if( !compiler.StringToType( returnTypeName, returnType ) )
+        {
+            SetError(3,returnTypeName,sourceIndex);
+        }
+    }
 }
 
@@ -93 +102 @@
             GetIdentifierToken( name, source.GetBuffer(), i );
 
+            if( source[i] != '(' )
+            {
+                SetError(1,NULL,nowLine);
+                continue;
+            }
+
+            // パラメータ文字列
             char paramStr[8192];
-            i += GetStringInPare( paramStr, source.GetBuffer() + i );
-
-            // 戻り値
-            Type returnType;
+            i += GetStringInPare( paramStr, source.GetBuffer() + i, true );
+
+            // 戻り値の型の文字列
+            char returnTypeName[VN_SIZE] = "";
             if( source[i] == 1 && source[i+1] == ESC_AS )
             {
                 i += 2;
-                char typeName[VN_SIZE];
-                GetCommandToken( typeName, source.GetBuffer(), i );
-                compiler.StringToType( typeName, returnType );
-            }
-
-            this->Put( new Delegate( namespaceScopes, name, procKind, paramStr, returnType, nowLine ) );
+                GetCommandToken( returnTypeName, source.GetBuffer(), i );
+
+                if( procKind != Procedure::Function )
+                {
+                    SetError(38,name,nowLine);
+                }
+            }
+            else
+            {
+                if( procKind == Procedure::Function )
+                {
+                    SetError(-104,name,nowLine);
+                    lstrcpy( returnTypeName, "Double" );
+                }
+            }
+
+            this->Put( new Delegate( namespaceScopes, name, procKind, paramStr, returnTypeName, nowLine ) );
         }
     }
@@ -156 +183 @@
         values.insert( std::map<std::string,std::string>::value_type( "#name#", dg.GetName() ) );
 
-        std::string paramsStr = dg.Params().GetString();
-
         if( dg.IsFunction() )
         {
             values.insert( std::map<std::string,std::string>::value_type(
                 "#call_method_begin#",
-                (string)"Function Call(" + paramsStr + ") As " + compiler.TypeToString( dg.ReturnType() )
+                (string)"Function Call(" + dg.paramStr + ") As " + dg.returnTypeName
             ) );
 
@@ -176 +201 @@
             values.insert( std::map<std::string,std::string>::value_type(
                 "#call_method_begin#",
-                (string)"Sub Call(" + paramsStr + ")"
+                (string)"Sub Call(" + dg.paramStr + ")"
             ) );
 
@@ -187 +212 @@
         }
 
-        values.insert( std::map<std::string,std::string>::value_type( "#params#", paramsStr ) );
+        values.insert( std::map<std::string,std::string>::value_type( "#params#", dg.paramStr ) );
 
         destSource += sourceTemplate.GetResult( values );
@@ -197 +222 @@
     */
 }
+
+void Delegates::RefleshParameterAndReturnType()
+{
+    this->Iterator_Reset();
+    while( this->Iterator_HasNext() )
+    {
+        Delegate &dg = *this->Iterator_GetNext();
+        dg.RefleshParameterAndReturnType();
+    }
+}

trunk/abdev/BasicCompiler_Common/src/Parameter.cpp

@@ -85 +85 @@
     //パラメータ
     int i = 0;
-    if(sourceOfParams[i]!='('){
-        SetError(1,NULL,nowLine);
-        return 0;
-    }
-    i++;
     while(1){
-        if(sourceOfParams[i]==')') break;
+        if( sourceOfParams[i] == '\0' )
+        {
+            break;
+        }
 
         //ByRef
@@ -222 +220 @@
         this->push_back( pParam );
 
-        if(sourceOfParams[i]==','){
+        if( sourceOfParams[i] == ',' )
+        {
             i++;
             continue;
         }
-        else if(sourceOfParams[i]==')') continue;
+        else if( sourceOfParams[i] == '\0' )
+        {
+            break;
+        }
         else{
             SetError(1,NULL,nowLine);