Changeset 11f1f94 in tol

Timestamp:

May 31, 2011, 7:50:30 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

1b18f14

Parents:

344d264

Message:

Fixes #1223
Fixes #1226
Fixes #1228
Refs #1220

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3588 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/btol/bgrammar

Files:

• class.cpp (modified) (22 diffs)
• nameblock.cpp (modified) (2 diffs)
• spfuninst.cpp (modified) (2 diffs)
• tol_bclass.h (modified) (8 diffs)

tol/btol/bgrammar/class.cpp

@@ -61 +61 @@
   isMethod_    (false),
   method_      (NULL),
+  firstParent_ (NULL),
   parent_      (NULL),
   deleteBranch_(false),
   isStatic_    (false),
-  static_      (NULL) 
+  static_      (NULL),
+  description_ ("") 
 {
 }
@@ -78 +80 @@
   isMethod_    (false),
   method_      (NULL),
+  firstParent_ (NULL),
   parent_      (NULL),
   deleteBranch_(false),
   isStatic_    (false),
-  static_      (NULL)  
+  static_      (NULL),
+  description_ ("") 
 { 
   Copy(mbr); 
@@ -95 +99 @@
   isMethod_    (false),
   method_      (NULL),
+  firstParent_ (NULL),
   parent_      (NULL),
   deleteBranch_(false),
   isStatic_    (false),
-  static_      (NULL) 
+  static_      (NULL),
+  description_ ("") 
 {
   List* cdr;
   BCore* car;
+  firstParent_ = parent;
   parent_ = parent;
   isGood_ = true;
@@ -319 +326 @@
   if(!cls) { return(dump); }
   if((name[0]=='_')&&(name[1]!='.')) { return(dump); }
-  if(name.BeginWith("_.autodoc.member.")) { return(dump); }
-  BSyntaxObject* adm = cls->FindStaticMember(BText("_.autodoc.member.")+name, false);
   dump += BText("//")+
     BText((isStatic_)?"Static":"Non static")+ " "+
@@ -326 +331 @@
     BText((isMethod_)?"method":"member")+ 
     " defined at " + cls->FullName()+"\n";
-  if(adm) 
+  if(description_.HasName()) 
   { 
     dump+="/* ";  
-    dump+=Text(adm);  
+    dump+=description_;  
     dump+=" */\n"; 
   }
@@ -350 +355 @@
   definition_   = mbr.definition_;  
   isMethod_     = mbr.isMethod_;    
+  firstParent_  = mbr.firstParent_;
   parent_       = mbr.parent_; 
   method_       = mbr.method_; 
@@ -507 +513 @@
   memberHash_  (NULL),
   lastPosition_(0),
-  notImplementedMethods_(0)
+  notImplementedMethods_(0),
+  docMbrHash_(NULL),
+  docMbr_(0)
 {
 }
@@ -522 +530 @@
   memberHash_  (NULL),
   lastPosition_(0),
-  notImplementedMethods_(0)
+  notImplementedMethods_(0),
+  docMbrHash_(NULL),
+  docMbr_(0)
 { 
   Copy(mbrOwn); 
@@ -551 +561 @@
   mbrDefHash_  = new BMemberByNameHash;
   memberHash_  = new BMbrNumByNameHash;
+  docMbrHash_  = new BAutodocMemberHash;
   SetEmptyKey  ((*mbrDecHash_), NULL);
   SetEmptyKey  ((*mbrDefHash_), NULL);
   SetEmptyKey  ((*memberHash_), NULL);
+  SetEmptyKey  ((*docMbrHash_), NULL);
   SetDeletedKey((*mbrDecHash_), name_del_key());
   SetDeletedKey((*mbrDefHash_), name_del_key());
   SetDeletedKey((*memberHash_), name_del_key());
+  SetDeletedKey((*docMbrHash_), name_del_key());
 }
 
@@ -633 +646 @@
     }
   }
+  for(n=0; n<=docMbr_.Size(); n++)
+  {
+    delete docMbr_[n];
+  }
   if(mbrDecHash_) { delete mbrDecHash_; }
   if(mbrDefHash_) { delete mbrDefHash_; }
   if(memberHash_) { delete memberHash_; }
+  if(docMbrHash_) { delete docMbrHash_; }
   mbrDecHash_ = NULL;
   mbrDefHash_ = NULL;
   memberHash_ = NULL;
+  docMbrHash_ = NULL;
 }
 
@@ -763 +782 @@
 
 //--------------------------------------------------------------------
+bool BMemberOwner::AddAutodocMember(
+  const BText& name, const BText& desc, const BMemberOwner* parent)
+//--------------------------------------------------------------------
+{
+  return(true);
+}
+
+//--------------------------------------------------------------------
+  bool BMemberOwner::AddAutodocMember(BMember* mbrPtr)
+//--------------------------------------------------------------------
+{
+  return(true);
+}
+
+
+//--------------------------------------------------------------------
   bool BMemberOwner::AddMember(BMember* newMember)
 //! Adds a new member if it's compatible with existant ones
@@ -771 +806 @@
   const BText& name = newMember->name_;
   assert(name.HasName()&& dec.HasName());
+
+  if(OwnerType()==BCLASS)
+  {
+    if(name.BeginWith("_.autodoc.member."))
+    {
+      bool ok = AddAutodocMember(newMember);
+      delete newMember;
+      return(ok);
+    }
+  }
 #ifndef USE_STATIC_INHERITAGE
   if(newMember->isStatic_ && (newMember->parent_!=this)) 
@@ -838 +883 @@
       (*memberHash_)[name] = newMbrNum;
       (*mbrDefHash_)[dec ] = newMember;
+      newMember->firstParent_ = mbrDef->firstParent_;
     }
     else if(mbrDec)
@@ -854 +900 @@
         notImplementedMethods_--; 
       }
+      newMember->firstParent_ = mbrDec->firstParent_;
     }
   }
@@ -877 +924 @@
             I2(" by declaration ", " por la declaración ")+
             "\n"+newMember->FullExpression()+"\n");
+    }
+    else
+    {
+      newMember->firstParent_ = mbrDef->firstParent_;
     }
   }
@@ -913 +964 @@
     (*parentHash_)[name] = parent;
     //Adds parent members to 
-    n=0;
     for(n=0; n<parent->member_.Size(); n++)
     {
       ok = ok && AddMember(parent->member_[n]->member_);
+    }
+    for(n=0; n<parent->docMbr_.Size(); n++)
+    {
+      BAutoDocInf& a = *(parent->docMbr_[n]);
+      ok = ok && AddAutodocMember(a.name_,a.desc_,a.parent_);
     }
   }
@@ -1096 +1151 @@
 }
 
+
 //--------------------------------------------------------------------
   BText BNameBlockMemberOwner::getFullName() const 
@@ -1394 +1450 @@
 
 //--------------------------------------------------------------------
+  bool BClass::AddAutodocMember(const BText& name, const BText& desc, const BMemberOwner* parent)
+//! Adds a new member if it's compatible with existant ones
+//--------------------------------------------------------------------
+{
+  bool ok = true;
+  BAutodocMemberHash::const_iterator found = docMbrHash_->find(name);
+  if(found!=docMbrHash_->end())
+  {
+    int s = found->second;
+    BClass* cls = (BClass*)parent;
+    BClass* oldCls = (BClass*)docMbr_[s]->parent_;
+    if(cls==oldCls)
+    {
+      Error(I2("Special documentation member ",
+             "El miembro especial de documentación ")+
+          cls->getFullNameRef()+"::"+name+
+          I2(" is already defined.",
+             " ya está definido."));
+      ok=false;
+    }
+    else
+    { 
+/*
+      Std(BText("TRACE Changing inherited _.autodoc_member from ")+
+        oldCls->getFullNameRef()+"::"+name+"='"+docMbr_[s]->desc_+"' to "+
+        cls->getFullNameRef()+"::"+name+"='"+desc+"'\n");
+*/
+      docMbr_[s]->desc_ = desc;
+      docMbr_[s]->parent_ = parent;
+    }
+  }
+  else
+  {
+    int s = docMbr_.Size();
+/*
+    BClass* cls = (BClass*)parent;
+    Std(BText("TRACE Adding [")+s+"] _.autodoc_member "+
+        cls->getFullNameRef()+"::"+name+"='"+desc+"'\n");
+*/
+    docMbr_.Add(new BAutoDocInf(name, desc, parent));
+    (*docMbrHash_)[docMbr_[s]->name_] = s;
+  }
+  return(ok);
+}
+
+//--------------------------------------------------------------------
+  bool BClass::AddAutodocMember(BMember* mbrPtr)
+//! Adds a new member if it's compatible with existant ones
+//--------------------------------------------------------------------
+{
+  BMember& mbr = *mbrPtr;
+  bool ok = true;
+  if(!mbr.static_)
+  {
+    Error(I2("Special documentation member ",
+             "El miembro especial de documentación ")+
+          getFullNameRef()+"::"+mbr.name_+
+          I2(" is corrupted or it didn't have declared as static.",
+             " está corrupto o no se declaró como static."));
+    ok = false;
+  }
+  else if(mbr.static_->Grammar()!=GraText())
+  {
+    Error(I2("Special documentation member ",
+             "El miembro especial de documentación ")+
+          getFullNameRef()+"::"+mbr.name_+
+          I2(" should be a Text instead of a ",
+             " debería ser un Text en lugar de un ")+
+          mbr.static_->Grammar()->Name());
+    ok = false;
+  }
+  else
+  {
+    BText desc = Text(mbr.static_);
+    BText name = mbr.name_.SubString(17,mbr.name_.Length());
+    ok = AddAutodocMember(name, desc, this);
+  }
+  return(true);
+}
+
+//--------------------------------------------------------------------
+  bool BClass::PutMemberDescription(
+    const BText& name, 
+    const BText& desc,
+    bool autodoc)
+//--------------------------------------------------------------------
+{
+  bool ok = true;
+  BMember* mbr = FindMember(name);
+  if(!mbr)
+  {
+    ok = false;
+    if(autodoc)
+    {
+      Warning(I2("Special documentation member ",
+                 "El miembro especial de documentación ")+
+              getFullNameRef()+"::_.autodoc.member."+name+
+              I2(" is irrelevant due it doesn't exist a member nor method called ",
+                 " es irrelevante porque no existe ningún miembro ni método llamado ")+
+              name);
+    }
+    else
+    {
+      Warning(I2("Cannot apply PutDescription to inexistent member ",
+                 "No se puede aplicar PutDescription al miembro inexistente ")+
+              getFullNameRef()+"::"+name);
+    }
+  }
+  else
+  {
+    BSyntaxObject* obj = NULL;
+/*
+    if(mbr->description_.HasName())
+    {
+      Warning(I2("Description of member ","La descripción del miembro ")+
+              getFullNameRef()+"::"+name+
+              I2(" is already defined in"," ya ha sido definida en ")+
+              parent->getFullNameRef());
+    }
+    else
+    {
+      mbr->description_ = desc;
+    }
+*/
+    BClass* parent = (BClass*)mbr->parent_;
+    BClass* firstParent = (BClass*)mbr->firstParent_;
+    if(( mbr->method_ && (parent     ==this)) || 
+       (!mbr->method_ && (firstParent==mbr->parent_)) )
+       
+    {
+      mbr->description_ = desc;
+      if(mbr->method_) { obj = mbr->method_; } 
+      else if(mbr->static_) { obj = mbr->static_; } 
+      if(obj)
+      {
+        obj->PutDescription(desc);
+      } 
+    }
+    else 
+    {
+      if(!mbr->method_)
+      {
+        mbr->description_ = firstParent->FindMember(name)->description_;
+      }
+      else
+      {
+        mbr->description_ = desc;
+      }
+      ok = false;
+      if(mbr->method_)
+      {
+        Warning(I2("Cannot change to non overloaded method ",
+                   "No se puede cambiar la descripción de un método no sobrecargado ")+
+                getFullNameRef()+"::"+name+
+                I2(" inherited from "," heredado de ")+
+                parent->getFullNameRef()+"::"+name);
+      }
+      else
+      {
+        Warning(I2("Cannot change to non method member ",
+                   "No se puede cambiar la descripción de un miembro que no es un método ")+
+                getFullNameRef()+"::"+name+
+                I2(" originally inherited from "," heredado originalmente de ")+
+                firstParent->getFullNameRef()+"::"+name);
+      }
+    }  
+  }
+  return(ok);
+};
+
+//--------------------------------------------------------------------
   bool BClass::CheckAutoDoc()
 //--------------------------------------------------------------------
@@ -1399 +1626 @@
   bool ok = true;
   int n=0;
-  for(n=0; ok && (n<member_.Size()); n++)
-  {
-    if(!member_[n]) { continue; }
-    BMember& mbr = *(member_[n]->member_);
-    BSyntaxObject* obj = NULL;
-    if(mbr.name_.BeginWith("_.autodoc.member."))
-    {
-      if(!mbr.static_)
-      {
-        Error(I2("Special documentation member ",
-                 "El miembro especial de documentación ")+
-              getFullNameRef()+"::"+mbr.name_+
-              I2(" is corrupted or it didn't have declared as static.",
-                 " está corrupto o no se declaró como static."));
-        ok = false;
-      }
-      else if(mbr.static_->Grammar()!=GraText())
-      {
-        Error(I2("Special documentation member ",
-                 "El miembro especial de documentación ")+
-              getFullNameRef()+"::"+mbr.name_+
-              I2(" should be a Text instead of a ",
-                 " debería ser un Text en lugar de un ")+
-              mbr.static_->Grammar()->Name());
-        ok = false;
-      }
-      else
-      {
-        BText& desc = Text(mbr.static_);
-        BText auxName = mbr.name_.SubString(17,mbr.name_.Length());
-        BMember* auxMember = FindMember(auxName);
-        if(!auxMember)
-        {
-          Warning(I2("Special documentation member ",
-                     "El miembro especial de documentación ")+
-                  getFullNameRef()+"::"+mbr.name_+
-                  I2(" is irrelevant due it doesn't exist a member nor method called ",
-                     " es irrelevante porque no existe ningún miembro ni método llamado ")+
-                  auxName);
-        }
-        else
-        {
-          if(auxMember->method_) { obj = auxMember->method_; } 
-          else if(auxMember->static_) { obj = auxMember->static_; } 
-          if(obj)
-          {
-            obj->PutDescription(desc);
-          }  
-        }
-      }
-    }
-  }  
+  BAutodocMemberHash::const_iterator iterC;
+  BAutodocMemberHash& dmh = *docMbrHash_;
+  for(iterC=dmh.begin(); iterC!=dmh.end(); iterC++, n++)
+  {
+    int s = iterC->second;
+    const BText& name = docMbr_[s]->name_;
+    const BText& desc = docMbr_[s]->desc_;
+    PutMemberDescription(name, desc, true);
+  };
   return(ok);
 };
@@ -1893 +2077 @@
     }
     const BText& name = mbr->name_;
-    if(name.BeginWith("_.autodoc.member.")) { continue; }
+  //if(name.BeginWith("_.autodoc.member.")) { continue; }
     BSet reg;
     reg.PrepareStore(6);
@@ -1913 +2097 @@
       definedAtClass = mbr->parent_->getFullName();
     }
-
-    BText desc ="";
-    BSyntaxObject* adoc = cls->FindStaticMember(BText("_.autodoc.member.")+name, false);
-    if(adoc) { desc = Text(adoc); }
 
     reg.AddElement(new BContensDat ("",mbr->isStatic_,""));
@@ -1924 +2104 @@
     reg.AddElement(new BContensText("",access,""));
     reg.AddElement(new BContensText("",definedAtClass,""));
-    reg.AddElement(new BContensText("",desc,""));
+    reg.AddElement(new BContensText("",mbr->description_,""));
 
     reg.PutStruct(strClassMemberInfo_);

tol/btol/bgrammar/nameblock.cpp

@@ -823 +823 @@
     if(!dsc.HasName())
     {
-      BText autodocName = BText("_.autodoc.member.")+obj->Name();
-      BSyntaxObject* autodoc = NULL;
       if(class_)
       {
-        autodoc = class_->FindStaticMember(autodocName,-1);
+        BMember* mbr = class_->FindMember(obj->Name());
+        if(mbr) { obj->PutDescription(mbr->description_); }
       }
       else
       {
+        BText autodocName = BText("_.autodoc.member.")+obj->Name();
+        BSyntaxObject* autodoc = NULL;
         autodoc = Member(autodocName);
-      }
-      if(autodoc && autodoc->Grammar()==GraText())
-      {
-        BText& desc = Text(autodoc);
-        obj->PutDescription(desc);
+        if(autodoc && autodoc->Grammar()==GraText())
+        {
+          BText& desc = Text(autodoc);
+          obj->PutDescription(desc);
+        }
       }
     }
@@ -846 +847 @@
     if(!dsc.HasName())
     {
-      BText autodocName = BText("_.autodoc.member.")+obj->Name();
-      BSyntaxObject* autodoc = NULL;
       if(class_)
       {
-        autodoc = class_->FindStaticMember(autodocName,-1);
+        BMember* mbr = class_->FindMember(obj->Name());
+        if(mbr) { obj->PutDescription(mbr->description_); }
       }
       else
       {
+        BText autodocName = BText("_.autodoc.member.")+obj->Name();
+        BSyntaxObject* autodoc = NULL;
         autodoc = Member(autodocName);
-      }
-      if(autodoc && autodoc->Grammar()==GraText())
-      {
-        BText& desc = Text(autodoc);
-        obj->PutDescription(desc);
+        if(autodoc && autodoc->Grammar()==GraText())
+        {
+          BText& desc = Text(autodoc);
+          obj->PutDescription(desc);
+        }
       }
     }

tol/btol/bgrammar/spfuninst.cpp

@@ -1020 +1020 @@
             memberName = memberName.SubString(1,memberName.Length());
             BClass* cls = (BClass*)obj;
-            BMember* mbr = cls->FindMember(memberName);
-            if(!mbr)
-            {  
-              Error(third_arg_error);
+            if(!cls->PutMemberDescription(memberName, desc, false))
+            {
+              BSpecialFunction::TestResult(_name_,NIL,tre,NIL,BTRUE);
             }
-            else 
-            { 
-              BSyntaxObject* adoc = cls->FindStaticMember(BText("_.autodoc.member.")+memberName, false);
-              if(adoc) { Text(adoc)=desc; }
-              if(mbr->method_) { obj=mbr->method_; } 
-              else if(mbr->static_) { obj=mbr->static_; } 
-            }
+            SAFE_DESTROY(desObj,obj);
+            return(NULL);
           }
           else
@@ -2243 +2237 @@
 
   AddInstance("PutDescription",
-  I2("(Text newDescription, Anything object)",
-     "(Text nuevaDescripción, Anything objeto)"),
+  I2("(Text newDescription, Anything object [, Text member])",
+     "(Text nuevaDescripción, Anything objeto [, Text miembro])"),
   I2("Puts a new description to an object. "
      "You also can modify description of a Struct or a Class by "

tol/btol/bgrammar/tol_bclass.h

@@ -35 +35 @@
 class TOL_API BClass;
 struct TOL_API BMbrNum;
+
+class TOL_API BAutoDocInf
+{
+ public:
+  BText name_;
+  BText desc_;
+  const BMemberOwner* parent_;
+  BAutoDocInf(const BText& name, const BText& desc, const BMemberOwner* parent)
+  : name_(name), desc_(desc), parent_(parent)
+  { }
+  BAutoDocInf(const BAutoDocInf* a)
+  : name_(a->name_), desc_(a->desc_), parent_(a->parent_)
+  { }
+};
+
 template class TOL_API BArray<BClass*>;
 template class TOL_API BArray<BMember*>;
 template class TOL_API BArray<BMbrNum*>;
+template class TOL_API BArray<BMemberOwner*>;
+template class TOL_API BArray<BAutoDocInf*>;
+
 //template class TOL_API BArray<BMember*>;
 
@@ -54 +72 @@
   List*          branch_;       //!< Parser branch of the member
   bool           isGood_;       //!< False when there are some error
+  BMemberOwner*  firstParent_;  //!< First Member owner (Class or NameBlock)
   BMemberOwner*  parent_;       //!< Member owner (Class or NameBlock)
   BText          name_;         //!< Member name
@@ -63 +82 @@
   BSyntaxObject* method_;       //!< Store for Class member
   BSyntaxObject* static_;       //!< Store for Class static member or method
+  BText          description_;  //!< Store for Class member description
  public:
   // Constructors and destructors: bgrammar\class.cpp
@@ -100 +120 @@
   //! Type for store searchable and sortable members
   typedef hash_map_by_name<BMbrNum*>::dense_ BMbrNumByNameHash;
+  
+  //! Type for store searchable and sortable names
+  typedef hash_map_by_name<int>::dense_ BAutodocMemberHash;
+
 
   //! Type of member owner
@@ -105 +129 @@
 
   List* tree_;  //!< Parser branch of the Class 
-  bool isGood_;                   //!< False when there are som error
-  BClassByNameHash*  parentHash_; //!< Classes which inherites from
-  BClassByNameHash*  ascentHash_; //!< Classes which recursively inherites from
-  BMemberByNameHash* mbrDecHash_; //!< Members with just declaration 
-  BMemberByNameHash* mbrDefHash_; //!< Members with default value
-  BMbrNumByNameHash* memberHash_; //!< All members hashed by name
-  BArray<BMbrNum*>   member_;
+  bool isGood_;                    //!< False when there are som error
+  BClassByNameHash*    parentHash_; //!< Classes which inherites from
+  BClassByNameHash*    ascentHash_; //!< Classes which recursively inherites from
+  BMemberByNameHash*   mbrDecHash_; //!< Members with just declaration 
+  BMemberByNameHash*   mbrDefHash_; //!< Members with default value
+  BMbrNumByNameHash*   memberHash_; //!< All members hashed by name
+  BAutodocMemberHash*  docMbrHash_; //!< Autodoc members
+  BArray<BMbrNum*>     member_;
+  BArray<BAutoDocInf*> docMbr_;
   int notImplementedMethods_;
 public:
@@ -148 +174 @@
   //! Searchs a member with given declaration without default value
   BMember* FindDecMember  (const BText& declaration) const;
+  //! Adds a new autodoc member
+  virtual bool AddAutodocMember(const BText& name, const BText& desc, const BMemberOwner* parent);
+  virtual bool AddAutodocMember(BMember* mbrPtr);
   //! Adds a new member
   bool AddMember(BMember* member);
@@ -197 +226 @@
  ~BClass();
 
+  //! Adds a new autodoc member
+  bool AddAutodocMember(const BText& name, const BText& desc, const BMemberOwner* parent);
+  bool AddAutodocMember(BMember* mbrPtr);
+
   // Access & Manipulation: inline
   BOwnerType OwnerType() const { return(BCLASS); }
@@ -226 +259 @@
   int GetSortedMethods(BArray<const BMember*>& arr) const;
 
+  bool PutMemberDescription(
+    const BText& name, 
+    const BText& desc,
+    bool autodoc);
+
   DeclareClassNewDelete(BClass);
 };