Changeset aa86123 in tol

Timestamp:

Jun 7, 2011, 9:09:33 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

c00e3a5

Parents:

21a0cae

Message:

Fixes #1224

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

Location:

tol/btol/bgrammar

Files:

• class.cpp (modified) (3 diffs)
• spfuninst.cpp (modified) (1 diff)
• tol_bclass.h (modified) (1 diff)

tol/btol/bgrammar/class.cpp

@@ -503 +503 @@
 
 //--------------------------------------------------------------------
+  void BMember::PutDescription(const BText& desc)
+//--------------------------------------------------------------------
+{
+//if(desc=="Devuelve el valor de @C::_.A")
+//  printf("");
+  BSyntaxObject* obj = NULL;
+  description_ = desc;
+  if(method_) { obj = method_; } 
+  else if(static_) { obj = static_; } 
+  if(obj)
+  {
+    obj->PutDescription(desc);
+  } 
+}
+
+//--------------------------------------------------------------------
 BMemberOwner::BMemberOwner()
 //--------------------------------------------------------------------
@@ -1567 +1583 @@
     BClass* parent = (BClass*)mbr->parent_;
     BClass* firstParent = (BClass*)mbr->firstParent_;
-    if(!parent || !firstParent) { return(false); }
+    if(!parent || !firstParent) 
+    { 
+      if(mbr->description_.HasName() && mbr->description_!=desc)
+      {
+        return(false); 
+      }
+      else
+      {
+        mbr->PutDescription(desc);
+        return(true); 
+      }
+    }
     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);
-      } 
+      mbr->PutDescription(desc);
     }
     else 
     {
-      if(!mbr->method_)
-      {
-        mbr->description_ = firstParent->FindMember(name)->description_;
-      }
-      else
-      {
-        mbr->description_ = desc;
-      }
-      ok = false;
       if(mbr->method_)
       {
+        ok = false;
         Warning(I2("Cannot change description of non overloaded method ",
                    "No se puede cambiar la descripción de un método no sobrecargado ")+
@@ -1600 +1613 @@
       else
       {
+        BMember* inherited = firstParent->FindMember(name);
+        ok = false;
+        if(!inherited)
+        {
+          Warning(I2("Cannot find attribute ",
+                     "No se encuentra el atributo ")+
+                  getFullNameRef()+"::"+name+
+                  I2(" inherited from "," heredado de ")+
+                  firstParent->getFullNameRef()+"::"+name);
+        }
+        else 
+        {
+          mbr->PutDescription(inherited->description_);
+        }
         Warning(I2("Cannot change description of non method member ",
-                   "No se puede cambiar la descripción de un miembro que no es un método ")+
+                   "No se puede cambiar la descripción de un atrib ")+
                 getFullNameRef()+"::"+name+
                 I2(" originally inherited from "," heredado originalmente de ")+

tol/btol/bgrammar/spfuninst.cpp

@@ -1031 +1031 @@
       else if(!obj)
       {
-        obj = gra->LeftEvaluateExpr(tokenName);      
+        obj = FindStruct(tokenName);
+        if(!obj) { obj = gra->LeftEvaluateExpr(tokenName); }
       }
     }

tol/btol/bgrammar/tol_bclass.h

@@ -102 +102 @@
   int BuildMethod();
   int BuildStatic();
-        BText       Dump             () const;
-
+        BText   Dump () const;
+  void PutDescription(const BText& desc);
   DeclareClassNewDelete(BMember);
 };