Changeset 7e5625d in tol

Timestamp:

Jun 24, 2010, 1:47:16 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

7508034

Parents:

ff4ad677

Message:

Refs #921
Using new method CheckNonDeclarativeAction
New built-in functions ClassAscentOf

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

File:

• tol/btol/set_type/setgra.cpp (modified) (7 diffs)

tol/btol/set_type/setgra.cpp

@@ -43 +43 @@
 #include <tol/tol_btsrgrp.h>
 #include <tol/tol_bstruct.h>
+#include <tol/tol_bclass.h>
 
 #if defined(__USE_TC__)
@@ -130 +131 @@
   BSyntaxObject* Evaluator(BList* arg) const
   { 
+    if(CheckNonDeclarativeAction("Append")) { return(NULL); }
     BList* lst = arg;
     bool incrementalIndexByName = false;
@@ -472 +474 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("PutStructure")) { return; }
   BText    name = Text(Arg(1));
   BStruct* str  = FindStruct(name);
@@ -942 +945 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("SetIndexByName")) { return; }
   BSet& set = Set(Arg(1));
   contens_ = set.SetIndexByName();
@@ -2595 +2599 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("Tcl_Eval")) { return; }
   BText &script = Text(Arg(1));
   BList * result = NIL;
@@ -2636 +2641 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("Tcl_EvalEx")) { return; }
   BSet &cmd = Set(Arg(1));
   BList * result = NIL;
@@ -2751 +2757 @@
 
 
-
+//--------------------------------------------------------------------
+DeclareContensClass(BSet, BSetTemporary, BSetClassAscentOf);
+DefExtOpr(1, BSetClassAscentOf, "ClassAscentOf", 1, 1,
+          "Text",
+          "(Text className)",
+          I2("Returns the ascent classes of a given class\"\"",
+             "Retorna las clases ascendientes de una clase dada \"\""),
+          BOperClassify::General_);
+
+//--------------------------------------------------------------------
+void BSetClassAscentOf::CalcContens()
+//--------------------------------------------------------------------
+{
+  const BText& name = Text(Arg(1));
+  BClass* found = FindClass(name,1);
+  if(found)
+  {
+    BMemberOwner::BClassByNameHash* hash = found->ascentHash_;
+    BMemberOwner::BClassByNameHash::const_iterator iterC;
+    contens_.PrepareStore(hash->size());
+    for(iterC=hash->begin(); iterC!=hash->end(); iterC++)
+    {
+      BText fn = iterC->second->FullName();
+    //Std(BText(""\nBOisCreator::Write BMemberOwner parent ")+fn);
+      contens_.AddElement(new BContensText("",fn,""));
+    }
+  }
+}