Changeset c0b3749 in tol

Timestamp:

Sep 1, 2009, 8:38:59 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

8d67ff3

Parents:

83ac76d

Message:

New member BClass* staticOwner_ to allow FullName and access to other static elements from an static method

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

Location:

tol/btol/bgrammar

Files:

• opr.cpp (modified) (2 diffs)
• oprimp.cpp (modified) (4 diffs)
• tol_boper.h (modified) (2 diffs)

tol/btol/bgrammar/opr.cpp

@@ -851 +851 @@
   definition_ (NIL),
   declare_(""),
-  define_("")
+  define_(""),
+  staticOwner_(NULL)
 {
   PutName(name);
@@ -874 +875 @@
   definition_ (NIL),
   declare_(""),
-  define_("")
+  define_(""),
+  staticOwner_(NULL)
 {
   PutName(name);
   PutDescription(name);
   SetExpression(dec, def);
-
 }
 

tol/btol/bgrammar/oprimp.cpp

@@ -674 +674 @@
     {
       TRACE_SHOW_MEDIUM(fun," 6");
-
+/*
       if(!BEqualOperator::CreatingName().HasName())
       {
@@ -689 +689 @@
         }
       }
+*/
       if(!result) 
       { 
@@ -1434 +1435 @@
 
 //--------------------------------------------------------------------
+BText BUserFunction::FullName() const
+    
+/*! Returns a text with all important information about this operator
+ */
+//--------------------------------------------------------------------
+{
+  if(staticOwner_) { return(staticOwner_->FullName()+"::"+Name()); }
+  else             { return(BSyntaxObject::FullName()); }
+}
+
+
+//--------------------------------------------------------------------
 BText BUserFunction::Dump() const
     
@@ -1613 +1626 @@
     const BNameBlock* oldNameBlock = BNameBlock::Current();
     const BNameBlock* funNameBlock = NameBlock();
-    bool change = (funNameBlock || !Level() ) && (funNameBlock != oldNameBlock);
-    if(change)
-    {
-    /*Std(BText("\nBUserFunction::Evaluator ")+FullName()+
-        " changing new current NameBlock to "+
-        (funNameBlock?funNameBlock->Name():"NULL")+"\n");*/
+    const BClass* oldStaticOwner = BClass::currentStatic_;
+    if(funNameBlock)
+    {
       BNameBlock::SetCurrent(funNameBlock);
+      BClass::currentStatic_ = funNameBlock->Class();
+    }
+    else
+    {
+      BClass::currentStatic_ = staticOwner_;
     }
     result = Grammar()->EvaluateTree(definition_, 1);
-    if(change)
-    {
-    /*Std(BText("\nBUserFunction::Evaluator ")+FullName()+
-        " recovering old current NameBlock to "+
-        (oldNameBlock?oldNameBlock->Name():"NULL")+"\n");*/
-      BNameBlock::SetCurrent(oldNameBlock);
-    }
+    BClass::currentStatic_ = oldStaticOwner;
+    BNameBlock::SetCurrent(oldNameBlock);
   }
   if(result)

tol/btol/bgrammar/tol_boper.h

@@ -414 +414 @@
     BArray<BSyntaxObject*> lastCalling_;
     BArray<BText> names_;
-    
+
  public:
+    const BClass* staticOwner_;
+
     // Constructors and destructors: opr.cpp
     BUserFunction(const BText& name, BGrammar* gra);
@@ -429 +431 @@
     BInt Mode() const { return BUSERFUNMODE; };
 
-          BText  Dump()       const;
+    BText  FullName() const;
+    BText  Dump    () const;
     
     const List*  Declaration() const { return(declaration_); }