Changeset 532b6fb in tol

Timestamp:

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

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

5129d30

Parents:

db38740

Message:

Refs #921
Using new method CheckNonDeclarativeAction

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

Location:

tol/btol/bdb

Files:

• bdb.cpp (modified) (15 diffs)
• bdspool.cpp (modified) (12 diffs)

tol/btol/bdb/bdb.cpp

@@ -463 +463 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("BDBOpen")) { return; }
   alias_ ++;
   BText    alias = BText("_BDB_")+alias_+"_";
@@ -546 +547 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("BDBClose")) { return; }
     BDataBase* bdb = GetDataBase(Arg(1)); if(!bdb) { return; }
     bdb->File()->Close();
@@ -569 +571 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("BDBFieldName")) { return; }
   BDataBase* bdb = GetDataBase(Arg(1)); if(!bdb) { return; }
   contens_ = bdb->File()->FieldName((BInt)Real(Arg(2))-1);
@@ -587 +590 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("BDBFieldPos")) { return; }
     BDataBase* bdb = GetDataBase(Arg(1)); if(!bdb) { return; }
     contens_ = 1+bdb->File()->Field(Text(Arg(2)));
@@ -605 +609 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("BDBLine")) { return; }
     BDataBase* bdb = GetDataBase(Arg(1)); if(!bdb) { return; }
     contens_ = bdb->File()->GetRegister((BInt)Real(Arg(2))-1);
@@ -623 +628 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("BDBReg")) { return; }
     BDataBase* bdb = GetDataBase(Arg(1)); if(!bdb) { return; }
     bdb->Reg((BInt)Real(Arg(2))-1, contens_);
@@ -640 +646 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("BDBTable")) { return; }
     BDataBase* bdb = GetDataBase(Arg(1)); if(!bdb) { return; }
     BInt reg = bdb->File()->RegNumber();
@@ -666 +673 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("BDBRead")) { return; }
     BDataBase* bdb = GetDataBase(Arg(1)); if(!bdb) { return; }
     
@@ -687 +695 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("BDBCell")) { return; }
     BDataBase* bdb = GetDataBase(Arg(1)); if(!bdb) { return; }
     
@@ -709 +718 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("BDBSort")) { return; }
     BDataBase* bdb = GetDataBase(Arg(1)); if(!bdb) { return; }
     BSet             field;
@@ -753 +763 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("BDBSortAndSave")) { return; }
     BDataBase* bdb     = GetDataBase(Arg(1)); if(!bdb) { return; }
     BText            path    = Text(Arg(2));
@@ -803 +814 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("BDBClassify")) { return; }
   BDataBase* bdb   = GetDataBase(Arg(1)); if(!bdb) { return; }
   BSet       field = Set(Arg(2));
@@ -859 +871 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("BDBSeries")) { return; }
   BDataBase*    bdb      = GetDataBase(Arg(1)); if(!bdb) { return; }
   BSet          dim      = Set(Arg(2));
@@ -955 +968 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("BDBSaveAs")) { return; }
   BDataBase* bdb = GetDataBase(Arg(1)); if(!bdb) { return; }
 
@@ -1037 +1051 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("BDBExtract")) { return; }
   BDataBase* bdb = GetDataBase(Arg(1)); if(!bdb) { return; }
 

tol/btol/bdb/bdspool.cpp

@@ -207 +207 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("DBOpen")) { return; }
   BSet dbStruct;
   
@@ -256 +257 @@
 //////////////////////////////////////////////////////////////////////////////
 {
+  if(CheckNonDeclarativeAction("DBActivate")) { return; }
   contens_ = dbActivate(Text(Arg(1)).String());
 }
@@ -283 +285 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("DBGetOpened")) { return; }
   BText B = "(Funcion DBGetOpened)";
   const char *type = Text(Arg(1)).String();
@@ -321 +324 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("DBClose")) { return; }
   const char* alias = NULL;
 
@@ -342 +346 @@
 void BDatDBExecQuery::CalcContens()
 {
+  if(CheckNonDeclarativeAction("DBExecQuery")) { return; }
     const BChar* query = Text(Arg(1)).String();
     contens_ = dbExecQuery(query);
@@ -365 +370 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("DBSeries")) { return; }
     BText B = "(Funcion DBSeries) ";
 
@@ -561 +567 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("DBSeriesColumn")) { return; }
     BText B = "(Funcion DBSeriesColumn) ";
 
@@ -761 +768 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("DBSeriesTable")) { return; }
     BText B = "(Funcion DBSeriesTable) ";
 
@@ -993 +1001 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("DBMatrix")) { return; }
     BText B = "(Funcion DBMatrix) ";
     BInt i,j;
@@ -1033 +1042 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("DBTable")) { return; }
     BText B = "(Funcion DBTable) ";
     BText query  = Text(Arg(1));
@@ -1219 +1229 @@
 //--------------------------------------------------------------------
 {
+  if(CheckNonDeclarativeAction("DBCreateSeriesTable")) { return; }
     BText B          = "(Funcion DBCreateSeriesTable) ";
     BText name       = Text(Arg(1));
@@ -1386 +1397 @@
 // problema) como en prefijos, lo cual si incompatibiliza el uso de map.
 
+  if(CheckNonDeclarativeAction("DBTableColumn")) { return; }
   BText B = "(Funcion DBTableColumn) ";
   BText query  = Text(Arg(1));