Changeset 43a523a in tol

Timestamp:

Apr 2, 2012, 12:31:50 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

fa76d3a

Parents:

61fc3db

Message:

Fixes #1497

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

Location:

tol/btol/bgrammar

Files:

• nameblock.cpp (modified) (2 diffs)
• tol_bnameblock.h (modified) (2 diffs)

tol/btol/bgrammar/nameblock.cpp

@@ -1391 +1391 @@
 {
   return(array_[k]);
+}
+
+//--------------------------------------------------------------------
+  BText BRequiredPackage::GetRequiredPackageVersion(int k) const
+//--------------------------------------------------------------------
+{
+  BText pkg = array_[k];
+  BText pkg_ver_expr = BText("\".\"<<")+
+      pkg+"::_.autodoc.version.high << \".\" << "+
+      pkg+"::_.autodoc.version.low";
+//Std(BText("\nTRACE pkg_ver_expr=")+pkg_ver_expr+"\n");
+  BSyntaxObject*  aux = GraText()->EvaluateExpr(pkg_ver_expr);
+  BText pkg_ver = pkg+Text(aux);
+  DESTROY(aux);
+  return(pkg_ver);
 }
 
@@ -1876 +1891 @@
 
 
+//--------------------------------------------------------------------
+DeclareContensClass(BSet, BSetTemporary, BSetRequiredPackages);
+DefExtOpr(1, BSetRequiredPackages, "RequiredPackages", 1, 1, "Real",
+ "(Real unused)",
+ I2("Returns a set of strings with the extact name and version of "
+    "all currently required packages.",
+    "Devuelve un conjunto de textos con los nombres y versiones "
+    "exactas de todos los paquetes requeridos en el momento de la "
+    "llamada."),
+ BOperClassify::System_);
+//--------------------------------------------------------------------
+void BSetRequiredPackages::CalcContens()
+//--------------------------------------------------------------------
+{
+  int i;
+  BText pkg_ver;
+  BSyntaxObject* aux;
+  const BRequiredPackage& grp = BNameBlock::GlobalRequiredPackages();
+  int n = grp.CountRequiredPackage();
+  contens_.PrepareStore(n);
+  for(i=0; i<n; i++)
+  {
+    pkg_ver = grp.GetRequiredPackageVersion(i);
+    contens_.AddElement(new BContensText("",pkg_ver,""));
+  }
+}
+
+//--------------------------------------------------------------------
+DeclareContensClass(BDat, BDatTemporary, BDatRequireSetOfPackages);
+DefExtOpr(1, BDatRequireSetOfPackages, "RequireSetOfPackages", 1, 1, "Set",
+ "(Set packages)",
+ I2("Requires a list of packages. Returns the number of true loaded "
+    "packages.",
+    "Requiere una lista de paquetes. Devuelve el número de paquetes "
+    "que realmente se han podido cargar o ya lo estaban."),
+ BOperClassify::System_);
+//--------------------------------------------------------------------
+void BDatRequireSetOfPackages::CalcContens()
+//--------------------------------------------------------------------
+{
+  const BSet& pkg = Set(Arg(1));
+  int i;
+  int k = 0;
+  for(i=1; i<=pkg.Card(); i++)
+  {
+    if(pkg[i]->Grammar() == GraText())
+    {
+      BSyntaxObject* loaded = BPackage::Load(Text(pkg[i]),true);
+      if(loaded) { k++; }
+    }
+  }
+  contens_ = k;
+}

tol/btol/bgrammar/tol_bnameblock.h

@@ -60 +60 @@
   int CountRequiredPackage() const;
   const BText& GetRequiredPackage(int k) const;
+  BText GetRequiredPackageVersion(int k) const;
 };
 
@@ -110 +111 @@
   static BSyntaxObject* UsingMember(const BObjClassify&  oc, const BText& memberName);
   static BList* Select(BList* lst, const BObjClassify&  oc);
+  static const BRequiredPackage& GlobalRequiredPackages() { return globalRequiredPackages_; }
 
   BNameBlock();