Changeset 8bf03c1 in tol

Timestamp:

Feb 6, 2012, 4:39:49 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

e9c7cc8

Parents:

017310d

Message:

Refs #1416
Refs #1415

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

Location:

tol

Files:

• bbasic/bfsmem.cpp (modified) (2 diffs)
• bbasic/tol_bfsmem.h (modified) (1 diff)
• btol/bgrammar/nameblock.cpp (modified) (6 diffs)
• btol/bgrammar/spfuninst.cpp (modified) (1 diff)
• btol/bgrammar/syn.cpp (modified) (1 diff)
• btol/bgrammar/tol_bgencon.h (modified) (1 diff)
• btol/real_type/datgrav.cpp (modified) (1 diff)

tol/bbasic/bfsmem.cpp

@@ -353 +353 @@
 {
   BYTE2 p = (address-pool_)/baseSize_;
+  if(available_>=pageSize_)
+  {
+    printf("\nBPage()::Delete() available_:%u  pageSize_:%u ",
+           available_, 
+           pageSize_); 
+  }
 # ifdef BFSMEM_DEBUG_PAGE
   assert(available_<pageSize_);
@@ -366 +372 @@
          baseSize_, 
          pageSize_, 
-         p); div
+         p);
 # endif
   avail_[available_++] = p; 

tol/bbasic/tol_bfsmem.h

@@ -95 +95 @@
 #define UndeclareClassNewDelete \
 public: \
+  short IsAssigned() const  \
+  { \
+    return(-1); \
+  } \
   static void* operator new(size_t size) \
   { \

tol/btol/bgrammar/nameblock.cpp

@@ -130 +130 @@
   SetEmptyKey(private_,NULL);
 #if (__USE_POOL__==__POOL_BFSMEM__)
-  short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->_bfsm_PageNum__);
+  short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->GetPageNum());
 #else
   short isAssigned = -1;
@@ -158 +158 @@
   SetEmptyKey(private_,NULL);
 #if (__USE_POOL__==__POOL_BFSMEM__)
-  short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->_bfsm_PageNum__);
+  short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->GetPageNum());
 #else
   short isAssigned = -1;
@@ -184 +184 @@
 {
 #if (__USE_POOL__==__POOL_BFSMEM__)
-  short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->_bfsm_PageNum__);
+  short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->GetPageNum());
 #else
   short isAssigned = -1;
@@ -293 +293 @@
   if(createdWithNew_) 
   { 
-    short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->_bfsm_PageNum__);
+    short isAssigned = BFSMEM_Hndlr->IsAssigned(this,this->GetPageNum());
     return(isAssigned); 
   }
@@ -339 +339 @@
   if(current_ && 
      current_->createdWithNew_ &&
-     !(BFSMEM_Hndlr->IsAssigned(current_,current_->_bfsm_PageNum__)))
-  {
-    BFSMEM_Hndlr->IsAssigned(current_,current_->_bfsm_PageNum__);
+     !(BFSMEM_Hndlr->IsAssigned(current_,current_->GetPageNum())))
+  {
+    BFSMEM_Hndlr->IsAssigned(current_,current_->GetPageNum());
     current_ = NULL;
   }
@@ -365 +365 @@
      building_->Contens().createdWithNew_ &&
      !(BFSMEM_Hndlr->IsAssigned(&building_->Contens(),
-                                building_->Contens()._bfsm_PageNum__)))
+                                building_->Contens().GetPageNum())))
   {
     BFSMEM_Hndlr->IsAssigned(&building_->Contens(),
-                             building_->Contens()._bfsm_PageNum__);
+                             building_->Contens().GetPageNum());
     building_ = NULL;
   }

tol/btol/bgrammar/spfuninst.cpp

@@ -1462 +1462 @@
   }
   SAFE_DESTROY(uTxt,result);
-  result=BSpecialFunction::TestResult(_name_,result,tre,NIL,BTRUE);
+//result=BSpecialFunction::TestResult(_name_,result,tre,NIL,BTRUE);
   return(result);
 }

tol/btol/bgrammar/syn.cpp

@@ -495 +495 @@
     &pageNum);
   if( objMask.obj_ &&
+      (pageNum >= 0) && (pageNum <= 65535) && 
+      (mode >= 1) && (mode < BLASTMODE) && 
+      (size >= 1) && (sizeof(objMask.obj_) == size))
+  {
+    if(
+     (objMask.obj_->GetPageNum() == pageNum) &&
      (objMask.obj_->Grammar() == graMask.gra_) &&
      (objMask.obj_->Mode() == mode) &&
-     (sizeof(objMask.obj_) == size) &&
-     (objMask.obj_->GetPageNum() == pageNum)&&
 #if (__USE_POOL__==__POOL_BFSMEM__)
      (objMask.obj_->GetMemHandler() == mhnMask.mhn_)&&
 #endif
      (objMask.obj_->IsAssigned()!=0))
-  {
-    obj = objMask.obj_;
+    {
+      obj = objMask.obj_;
+    }
   }
   return((BSyntaxObject*)obj);

tol/btol/bgrammar/tol_bgencon.h

@@ -667 +667 @@
     return(this->contens_);
   }
-  UndeclareClassNewDelete;
+  RedeclareClassNewDelete(BTmpContens<Any>);
 };
 

tol/btol/real_type/datgrav.cpp

@@ -863 +863 @@
   }
   return(result);
+}
+
+//--------------------------------------------------------------------
+  DeclareContensClass(BDat, BDatTemporary, BDatAddressIsAlive);
+  DefExtOpr(1, BDatAddressIsAlive, "AddressIsAlive", 1, 1, "Text",
+  "(Text address)",
+  I2("Returns true if the address given matches for an alive TOL object."
+     "The address must be obtained by mean of calling GetAddressFromObject",
+     "Devuelve verdadero si la dirección dada por el argumento 'address' "
+     "corresponde efectivamente a un objeto TOL vivo."
+     "Dicha dirección interna se habrá obtenido previamente llamando a "
+     "la función GetAddressFromObject."),
+     BOperClassify::System_);
+  void BDatAddressIsAlive::CalcContens()
+//--------------------------------------------------------------------
+{
+  const BText&  address = Text(Arg(1));
+  BSyntaxObject* result = BSyntaxObject::GetObjectFromAddress(address);
+  contens_ = result!=NULL;
 }