Changeset 3666 for trunk/MagicSoft/Mars/mbase/MParContainer.cc

Timestamp:

04/06/04 13:41:56 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MParContainer.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -407 +407 @@
 TMethodCall *MParContainer::GetterMethod(const char *name) const
 {
-    TClass *cls = IsA()->GetBaseDataMember(name);
+    const TString n(name);
+    const Int_t pos1 = n.First('.');
+
+    const TString part1 = pos1<0 ? n : n(0, pos1);
+    const TString part2 = pos1<0 ? TString("") : n(pos1+1, n.Length());
+
+    TClass *cls = IsA()->GetBaseDataMember(part1);
     if (cls)
     {
-        TDataMember *member = cls->GetDataMember(name);
+        TDataMember *member = cls->GetDataMember(part1);
         if (!member)
         {
-            *fLog << err << "Datamember '" << name << "' not in " << GetDescriptor() << endl;
+            *fLog << err << "Datamember '" << part1 << "' not in " << GetDescriptor() << endl;
             return NULL;
+        }
+
+        // This handles returning references of contained objects, eg
+        // class X { TObject fO; TObject &GetO() { return fO; } };
+        if (!member->IsBasic() && !part2.IsNull())
+        {
+            cls = gROOT->GetClass(member->GetTypeName());
+            if (!cls)
+            {
+                *fLog << err << "Datamember " << part1 << " [";
+                *fLog << member->GetTypeName() << "] not in dictionary." << endl;
+                return NULL;
+            }
+            if (!cls->InheritsFrom(MParContainer::Class()))
+            {
+                *fLog << err << "Datamember " << part1 << " [";
+                *fLog << member->GetTypeName() << "] does not inherit from ";
+                *fLog << "MParContainer." << endl;
+                return NULL;
+            }
+
+            const MParContainer *sub = (MParContainer*)((ULong_t)this+member->GetOffset());
+            return sub->GetterMethod(part2);
+        }
+
+        if (member->IsaPointer())
+        {
+            *fLog << warn << "Data-member " << part1 << " is a pointer..." << endl;
+            *fLog << dbginf << "Not yet implemented!" << endl;
+            //TClass *test = gROOT->GetClass(member->GetTypeName());
+            return 0;
         }
 
@@ -422 +459 @@
     }
 
-    *fLog << warn << "No standard access for '" << name << "' in ";
+    *fLog << warn << "No standard access for '" << part1 << "' in ";
     *fLog << GetDescriptor() << " or one of its base classes." << endl;
 
@@ -428 +465 @@
 
     *fLog << warn << "Trying to find MethodCall '" << ClassName();
-    *fLog << "::Get" << name << "' instead <LEAKS MEMORY>" << endl;
-    call = new TMethodCall(IsA(), (TString)"Get"+name, "");
+    *fLog << "::Get" << part1 << "' instead <LEAKS MEMORY>" << endl;
+    call = new TMethodCall(IsA(), (TString)"Get"+part1, "");
     if (call->GetMethod())
         return call;
@@ -436 +473 @@
 
     *fLog << warn << "Trying to find MethodCall '" << ClassName();
-    *fLog << "::" << name << "' instead <LEAKS MEMORY>" << endl;
-    call = new TMethodCall(IsA(), name, "");
+    *fLog << "::" << part1 << "' instead <LEAKS MEMORY>" << endl;
+    call = new TMethodCall(IsA(), part1, "");
     if (call->GetMethod())
         return call;
@@ -443 +480 @@
     delete call;
 
-    *fLog << err << "Sorry, no getter method found for " << name << endl;
+    *fLog << err << "Sorry, no getter method found for " << part1 << endl;
     return NULL;
 }