Changeset 194e48b in tol

Timestamp:

Apr 27, 2011, 5:28:04 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

a5bc35a

Parents:

13977f3

Message:

Fixes #1178

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

File:

• tol/btol/bgrammar/spfuninst.cpp (modified) (3 diffs)

tol/btol/bgrammar/spfuninst.cpp

@@ -986 +986 @@
 {
   static BText _name_ = "PutDescription";
+  static BText third_arg_error =
+    I2("Optional third argument of PutDescription must be the name of a member "
+       "of the class specified in second one",
+       "El tercer argumento opcional de PutDescription debe ser el nombre de "
+       "un miembro de la clase especificada en el segundo argumento");
+
 //if(CheckNonDeclarativeAction(_name_)) { return(NULL); }
   BInt nb = BSpecialFunction::NumBranches(tre);
-  if(BSpecialFunction::TestNumArg(_name_, 2, nb, 2))
+  if(BSpecialFunction::TestNumArg(_name_, 2, nb, 3))
   {
     BSyntaxObject* desObj = GraText    ()->EvaluateTree(Branch(tre,1));
+    if(!desObj) { return(NULL); }
+    BText desc = Text(desObj);
     BGrammar::PutLast(gra);
     BText tokenName = BParser::treToken(Branch(tre,2))->Name();
@@ -998 +1006 @@
       tokenName = tokenName.SubString(1,tokenName.Length());
       obj = FindStruct(tokenName);
+      if(obj && nb==3)
+      {  
+        Error(third_arg_error);
+      }
       if(!obj)
       {
         obj = FindClass(tokenName,-1);
-      }
+        if(obj && nb==3)
+        {
+          BText memberName = BParser::treToken(Branch(tre,3))->Name();
+          if(memberName[0]=='\"')
+          {
+            memberName = memberName.SubString(1,memberName.Length());
+            BClass* cls = (BClass*)obj;
+            BMember* mbr = cls->FindMember(memberName);
+            if(!mbr)
+            {  
+              Error(third_arg_error);
+            }
+            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_; } 
+            }
+          }
+          else
+          {  
+            Error(third_arg_error);
+          }
+        } 
+      }
+    }
+    else if (nb==3)
+    {
+      Error(third_arg_error);
     }
     if(!obj)
@@ -1008 +1049 @@
     };
     BGrammar::PutLast(gra);
-    if(desObj && obj)
-    {
-      BText desc = Text(desObj);
+    if(obj)
+    {
       obj->PutDescription(desc);
       if(obj->Grammar()==GraCode())