Changeset 9bece5f in tol

Timestamp:

Jan 11, 2011, 9:49:33 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

a94d7fe

Parents:

2c3c594

Message:

Refs #1054
Dependencies will be handled directly by the NameBlock

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

Location:

tol

Files:

• LoadDynLib/LoadDynLib.cpp (modified) (1 diff)
• OIS/oisloader.cpp (modified) (5 diffs)
• btol/bgrammar/nameblock.cpp (modified) (11 diffs)
• btol/bgrammar/tol_bnameblock.h (modified) (3 diffs)

tol/LoadDynLib/LoadDynLib.cpp

@@ -66 +66 @@
   uCode->PutName(name);
   uCode->PutDescription(desc);
-  nb.AddElement(uCode,true);
+  nb.AddElement(uCode,true,false);
   return(uCode);
 }

tol/OIS/oisloader.cpp

@@ -175 +175 @@
     {
       EnsureFileOpenR(hrchyDetail_, "hrchyDetail", ".hrchyDetail"    );
+    //hrchyDetail_.SetPos(strlen(".hrchyDetail"));
       TRACE_SHOW_LOW(fun,"2.15");
       EnsureFileOpenR(hrchyOffset_, "hrchyOffset", ".hrchyOffset"    );
+    //hrchyOffset_.SetPos(strlen(".hrchyOffset"));
       TRACE_SHOW_LOW(fun,"2.16");
       EnsureFileOpenR(hrchyOrder_,  "hrchyOrder",  ".hrchyOrder"     );
+    //hrchyOrder_.SetPos(strlen(".hrchyOrder"));
       TRACE_SHOW_LOW(fun,"2.17");
     }
@@ -215 +218 @@
   ERead(aux, code_   ); if(aux!=address+"/.code>\n"   ) { return(BinError(".code"    )); }
   if(control_.oisEngine_.oisVersion_>="01.07") {
-  ERead(aux, hrchyDetail_); if(aux!=address+"/.hrchyDetail>\n") { return(BinError(".hrchyDetail" )); }
-  ERead(aux, hrchyOffset_); if(aux!=address+"/.hrchyOffset>\n") { return(BinError(".hrchyOffset" )); }
-  ERead(aux, hrchyOrder_ ); if(aux!=address+"/.hrchyOrder>\n" ) { return(BinError(".hrchyOrder"  )); } }
+    ERead(aux, hrchyDetail_); 
+    if(aux!=address+"/.hrchyDetail>\n") { return(BinError(".hrchyDetail" )); }
+    hrchyDetail_->SetPos(sizeof(int)+aux.Length());
+    ERead(aux, hrchyOffset_); 
+    if(aux!=address+"/.hrchyOffset>\n") { return(BinError(".hrchyOffset" )); }
+    hrchyOffset_->SetPos(sizeof(int)+aux.Length());
+    ERead(aux, hrchyOrder_ ); 
+    if(aux!=address+"/.hrchyOrder>\n" ) { return(BinError(".hrchyOrder"  )); } 
+    hrchyOrder_->SetPos(sizeof(int)+aux.Length());
+  }
   else { numFiles-=3; }
   enable_BSE_=(control_.oisEngine_.oisVersion_>="01.08")!=0;
@@ -440 +450 @@
         owner.getFullName()+
         I2(" due to ascent Class "," debido a que su ascendiente Class ")+
-        parentName+I2(" doesn't exist"," no existe")));
+        parentName+I2(" doesn't exist"," no existe"))!=0);
     }
     const BText& fn = parent->getFullNameRef();
@@ -1206 +1216 @@
               if(!mem)
               {
-                oldBuilding->Contens().AddElement(unb, true);
+                oldBuilding->Contens().AddElement(unb, true, true);
               }
             }
@@ -1229 +1239 @@
               if(!mem)
               {
-                x.AddElement(r, true); 
+                x.AddElement(r, true, true); 
               }
             }

tol/btol/bgrammar/nameblock.cpp

@@ -426 +426 @@
     if(oldBuildingLevel == level-1)
     { 
-      oldBuilding->Contens().AddElement(ns_result, true);
+      oldBuilding->Contens().AddElement(ns_result, true, false);
     //BSyntaxObject* found = GraNameBlock()->EvaluateExpr(fullName);
     //assert(found);
@@ -466 +466 @@
           if(obj)
           {
-            newNameBlock.AddElement(obj,true);
+            newNameBlock.AddElement(obj,true,false);
           }
         }
@@ -554 +554 @@
         {
           obj = GraAnything()->EvaluateTree(mbr->branch_);
-          newNameBlock.AddElement(obj, true);
+          newNameBlock.AddElement(obj, true, false);
         }
       }
@@ -611 +611 @@
 
 //--------------------------------------------------------------------
-  bool BNameBlock::AddElement(BSyntaxObject* obj, bool addToSet)
+  bool BNameBlock::AddElement(BSyntaxObject* obj, bool addToSet, bool fromOis)
 //--------------------------------------------------------------------
 {
@@ -634 +634 @@
     return(false);
   }
-  if(name=="_this")
-  {
-    Error(I2("Reserved member name ",
-             "Nombre de miembro reservado  ")+ name+"\n"+
-            I2("Cannot build NameBlock ",
-               "No se puede construir el NameBlock ")+Name());
-    return(false);
-  }
   BSyntaxObject* mem = Member(name);
   if(mem)
@@ -690 +682 @@
       nonPrivateMembers_++; 
     //Std(BText("\nTRACE BNameBlock::Build added read only member ")+Name()+"::"+name+"\n");
-    }
-  //else { Std(BText("\nTRACE BNameBlock::Build added private member ")+Name()+"::"+name+"\n"); }
+      if(!fromOis && (name=="_.autodoc.dependencies"))
+      {
+        if(obj->Grammar()!=GraSet())
+        { 
+          Error(I2("Wrong declaration of ","Definición errónea de ")+
+                obj->Grammar()->Name()+" "+LocalName()+"::_.autodoc.dependencies"+
+                I2("It should be of type ","Debería ser de tipo ")+"Set");
+          return(false);
+        }
+        BSet& dep = ::Set(obj); 
+        if(dep.Card())
+        { 
+          Warning(I2("Obsolete declaration of ","Definición obsoleta de ")+
+                obj->Grammar()->Name()+" "+LocalName()+"::_.autodoc.dependencies"+
+                I2("It should be empty due it will be filled with required packages",
+                   "Debería estar vacío porque se rellena automáticamente con los "
+                   "paquetes requeridos"));
+        }
+        int reqNum = CountRequiredPackage();
+        dep.Delete();
+        dep.PrepareStore(reqNum);
+        int d;
+        for(d=0; d<reqNum; d++)
+        {
+          BText txt = GetRequiredPackage(d);
+          dep.AddElement(new BContensText("",txt,""));
+        }
+      }
+      else  if(!fromOis && (name=="_.autodoc.name"))
+      {
+        if(obj->Grammar()!=GraText())
+        { 
+          Error(I2("Wrong declaration of ","Definición errónea de ")+
+                obj->Grammar()->Name()+" "+LocalName()+"::_.autodoc.name"+
+                I2("It should be of type ","Debería ser de tipo ")+"Text");
+          return(false);
+        }
+        BText& nt = Text(obj); 
+        if(nt.HasName() && (nt!=LocalName()))
+        {
+          Error(I2("Wrong declaration of ","Definición errónea de ")+
+                obj->Grammar()->Name()+" "+LocalName()+"::_.autodoc.name = \""+nt+"\";\n"+
+                I2("It should be ","Debería ser \"")+LocalName()+"\"");
+          return(false);
+        } 
+        nt = LocalName();
+      }
+
+    }
+    else if(name=="_this")
+    {
+      Error(I2("Reserved member name ",
+               "Nombre de miembro reservado  ")+ name+"\n"+
+              I2("Cannot build NameBlock ",
+                 "No se puede construir el NameBlock ")+Name());
+      return(false);
+    }
     private_[name] = obj;
   }
@@ -737 +784 @@
   {
     obj = set_[i+1];
-    AddElement(obj, false);
+    AddElement(obj, false, false);
   }
   return(CheckMembers());
@@ -1217 +1264 @@
 };
 //--------------------------------------------------------------------
-  int BRequiredPackage::CountRequiredPackage()
+  int BRequiredPackage::CountRequiredPackage() const
 //--------------------------------------------------------------------
 {
@@ -1224 +1271 @@
 
 //--------------------------------------------------------------------
-  const BText& BRequiredPackage::GetRequiredPackage(int k)
+  const BText& BRequiredPackage::GetRequiredPackage(int k) const
 //--------------------------------------------------------------------
 {
@@ -1243 +1290 @@
 
 //--------------------------------------------------------------------
-  int BNameBlock::CountRequiredPackage()
+  int BNameBlock::CountRequiredPackage() const
 //--------------------------------------------------------------------
 {
@@ -1251 +1298 @@
 
 //--------------------------------------------------------------------
-  const BText& BNameBlock::GetRequiredPackage(int k)
+  const BText& BNameBlock::GetRequiredPackage(int k) const
 //--------------------------------------------------------------------
 {

tol/btol/bgrammar/tol_bnameblock.h

@@ -58 +58 @@
   BRequiredPackage();
   bool AddRequiredPackage(const BText& name);
-  int CountRequiredPackage();
-  const BText& GetRequiredPackage(int k);
+  int CountRequiredPackage() const;
+  const BText& GetRequiredPackage(int k) const;
 };
 
@@ -143 +143 @@
   int BinRead (FILE*)       { return 0; }
 
-  bool AddElement(BSyntaxObject* obj, bool addToSet);
+  bool AddElement(BSyntaxObject* obj, bool addToSet, bool fromOis);
   bool CheckMembers();
   bool Build();
@@ -159 +159 @@
 
   bool AddRequiredPackage(const BText& name);
-  int CountRequiredPackage();
-  const BText& GetRequiredPackage(int k);
+  int CountRequiredPackage() const;
+  const BText& GetRequiredPackage(int k) const;
 
   static bool AddGlobalRequiredPackage(const BText& name);