Changeset dea29fb in tol

Timestamp:

Dec 10, 2009, 11:00:45 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

2adcbae

Parents:

2fb8329

Message:

Relates to #795

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

Location:

tol/btol/bgrammar

Files:

• class.cpp (modified) (4 diffs)
• nameblock.cpp (modified) (2 diffs)
• oprimp.cpp (modified) (1 diff)
• syn.cpp (modified) (1 diff)
• tol_bsyntax.h (modified) (3 diffs)

tol/btol/bgrammar/class.cpp

@@ -229 +229 @@
   {
     isGood_ = false;
-    Error(I2("Wrong syntax in member declaration ",
-             "Sintaxis incorrecta en declaración de miembro ")+
+    Error(I2("Wrong syntax in member declaration \n",
+             "Sintaxis incorrecta en declaración de miembro \n")+
           BParser::Unparse(branch_,"","\n")+
           I2(" of Class ", " de Class ")+parent->getName());
   }
+  if(isGood_ && declaration_.BeginWith("Code") && !isMethod_)
+  {
+    Warning(I2("Potential failure due to a non standard use of OOP:\n"
+               "A class should have no members of type Code as \n",
+               "Error potencial debido a un uso no estándar de OOP:\n"
+               "Una clase no debería tener miembros de tipo Code como \n")+
+            BParser::Unparse(branch_,"","\n")+
+            I2(" of Class ", " de Class ")+parent->getName());
+  }
   if(parent->OwnerType()==BMemberOwner::BCLASS)
   {
@@ -240 +249 @@
   }
 }
-
 
 //--------------------------------------------------------------------
@@ -295 +303 @@
       method_ = obj;
       method_->IncNRefs(); 
+      method_->PutMethod();
+      BUserCode* uCode = UCode(method_);
+      uCode->Contens().Operator()->PutMethod();
       return(1);
     }
@@ -906 +917 @@
   if(!ok)
   {
-    Error(I2("Wrong syntax on member area of Class declaration",
+    Error(I2("Wrong syntax on member area of declaration ",
              "Sintaxis errónea en el área de de miembros de "
-             "declaración de Class")+ getDump());
+             "declaración de ")+ getDump());
   }
   isGood_ = ok;

tol/btol/bgrammar/nameblock.cpp

@@ -167 +167 @@
 //--------------------------------------------------------------------
 {
+  int n;
   owner_ = NULL;
+  for(n=1; n<=set_.Card(); n++)
+        {
+    set_[n]->PutNameBlock(NULL);
+  }
   public_.clear();
   private_.clear();
@@ -683 +688 @@
   if((nonPrivateMembers_==0)&&!class_)
   {
-    Warning(I2("A NameBlock should have at least a public or read only member.",
-               "Un NameBlock debería tener al menos un miembro público o de sólo lectura."));
+    Warning(BText("NameBlock ")+Name()+" "+
+            I2("should have at least a public or read only member.",
+               "debería tener al menos un miembro público o de sólo lectura."));
     return(false);
   }

tol/btol/bgrammar/oprimp.cpp

@@ -1632 +1632 @@
   if(arglistOK)
   {
+    const BClass* oldStaticOwner = BClass::currentStatic_;
     const BNameBlock* oldNameBlock = BNameBlock::Current();
     const BNameBlock* funNameBlock = NameBlock();
-    const BClass* oldStaticOwner = BClass::currentStatic_;
+    if(funNameBlock && funNameBlock->Class() && !IsMethod()) 
+    { 
+      funNameBlock = NULL; 
+    }
+    if(funNameBlock && !funNameBlock->EnsureIsAssigned())
+    { 
+      if(!funNameBlock->Class()) 
+      {
+        Error(BText("Corrupted method ")+Identify()+"\n"
+          "Possibly this problem is due to a non standard use of OOP, if "
+          "this function was assigned to a member of type Code of a "
+          "NameBlock or Class instance that has been destroyed already.");
+      } 
+      funNameBlock = NULL;
+    }
     if(funNameBlock)
     {

tol/btol/bgrammar/syn.cpp

@@ -176 +176 @@
   PutSystem(!TOLHasBeenInitialized());
   flags_.isConst_= false;
+  flags_.isMethod_ = false;
   if(flags_.system_) { IncNRefs(); IncNRefs(); IncNRefs(); }
   TRACE_MEMORY_SHOW(this, "BSyntaxObject::InitSynObj");

tol/btol/bgrammar/tol_bsyntax.h

@@ -118 +118 @@
     bool isDeadObj_   :1; //!< Indicates if object is a false or dead object
     bool isConst_     :1; //!< Indicates if object value is constant or variable
+    bool isMethod_    :1; //!< Indicates if object is a method of a class
   } flags_;
 
@@ -200 +201 @@
   bool                 IsDeadObj   () const { return(flags_.isDeadObj_); }
   bool                 IsConstant  () const { return(flags_.isConst_); }
+  bool                 IsMethod    () const { return(flags_.isMethod_); }
   int            Ems         () const { return(ems_); }
 
@@ -212 +214 @@
   void PutReleased()           { flags_.released_ = true; }
   void PutConstant()           { flags_.isConst_  = true; }
+  void PutMethod()             { flags_.isMethod_  = true; }
   void PutEms     (int ems)    { ems_ = ems; }