Changeset 293 in dev for trunk

Timestamp:

Aug 22, 2007, 11:09:26 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/NumOpe.cpp (modified) (1 diff)
• BasicCompiler32/Opcode.h (modified) (1 diff)
• BasicCompiler32/OperatorProc.cpp (modified) (2 diffs)
• BasicCompiler_Common/include/Class.h (modified) (1 diff)
• BasicCompiler_Common/include/Type.h (modified) (2 diffs)

trunk/abdev/BasicCompiler32/NumOpe.cpp

@@ -455 +455 @@
     GetArrayElement(termFull,VarName,ArrayElements);
     if(ArrayElements[0]){
-        Type leftType;
-        GetVarType(VarName,leftType,false);
-        if( leftType.IsObject() )
+        Type classType;
+        GetVarType(VarName,classType,false);
+        if( classType.IsObject() )
         {
-            CallIndexerGetterProc(/*UseReg,*/&resultType.GetClass(),VarName, leftType, ArrayElements,resultType);
+            CallIndexerGetterProc(/*UseReg,*/classType,VarName, ArrayElements,resultType);
 
             isLiteral = false;

trunk/abdev/BasicCompiler32/Opcode.h

@@ -227 +227 @@
 int CallOperatorProc(int idCalc, const Type &baseType, int *type_stack,LONG_PTR *index_stack,BOOL *bUseHeap,int &sp);
 void CallCastOperatorProc(Type &calcType,BOOL bCalcUseHeap,const Type &toType);
-void CallIndexerGetterProc(const CClass *pobj_Class,char *ObjectName, const Type &leftType, char *Parameter,Type &resultType);
+void CallIndexerGetterProc( const Type &classType, char *ObjectName, char *Parameter,Type &resultType);
 
 //Compile_Statement.cpp

trunk/abdev/BasicCompiler32/OperatorProc.cpp

@@ -252 +252 @@
     SetError(-1,"キャスト演算子がオーバーロードされていません。",cp);
 }
-void CallIndexerGetterProc(const CClass *pobj_Class,char *ObjectName, const Type &leftType, char *Parameter,Type &resultType){
+void CallIndexerGetterProc( const Type &classType, char *ObjectName, char *Parameter,Type &resultType){
     std::vector<const UserProc *> subs;
-    pobj_Class->GetMethods().Enum( CALC_ARRAY_GET, subs );
+    classType.GetClass().GetMethods().Enum( CALC_ARRAY_GET, subs );
     if( subs.size() == 0 ){
         return;
@@ -272 +272 @@
         int ptrLevel = PTR_LEVEL( resultType.GetBasicType() );
 
-        if( leftType.HasActualGenericType() )
+        if( classType.HasActualGenericType() )
         {
             // TODO: GetDummyActualGenericTypeを適切な形に実装し直す
-            resultType = leftType.GetDummyActualGenericType();
+            resultType = classType.GetDummyActualGenericType();
         }
         else

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -91 +91 @@
         ar & BOOST_SERIALIZATION_NVP( classType );
         ar & BOOST_SERIALIZATION_NVP( importedNamespaces );
+        ar & BOOST_SERIALIZATION_NVP( formalGenericTypes );
         ar & boost::serialization::make_nvp( "pSuperClass", const_cast<CClass *&>(pSuperClass) );
         ar & BOOST_SERIALIZATION_NVP( blittableType );

trunk/abdev/BasicCompiler_Common/include/Type.h

@@ -39 +39 @@
         {
             ar & boost::serialization::make_nvp("pClass", const_cast<CClass *&>(pClass));
+            ar & BOOST_SERIALIZATION_NVP( actualGenericTypes );
         }
         else
@@ -193 +194 @@
     std::string name;
     Type type;
+
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - GenericType" );
+
+        ar & BOOST_SERIALIZATION_NVP( name );
+        ar & BOOST_SERIALIZATION_NVP( type );
+    }
+
 public:
     GenericType( const std::string &name, const Type &type )