Changeset d108507 in tol

Timestamp:

Jan 2, 2010, 4:22:40 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

f9b4992

Parents:

7618682

Message:

Checking all declared Static elements are well defined

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

File:

• tol/btol/bgrammar/class.cpp (modified) (4 diffs)

tol/btol/bgrammar/class.cpp

@@ -352 +352 @@
     isStatic_ = true;
   }
-  if(!static_ && isStatic_ && definition_.HasName())
+  if(!static_ && isStatic_)
   {
     BClass* cls = (BClass*)parent_; 
-    BGrammar::IncLevel();
-    int stackPos = BGrammar::StackSize();
-    const BClass* oldStaticOwner = BClass::currentStatic_;
-    BClass::currentStatic_ = cls;
-    BSyntaxObject* obj = GraAnything()->EvaluateTree(branch_);
-    BClass::currentStatic_ = oldStaticOwner;
-    BGrammar::DestroyStackUntil(stackPos, obj);    
-    BGrammar::DecLevel();
-    if(obj)
-    {
-      static_ = obj;
-      if(isMethod_)
-      {
-        if(obj->Mode()==BOBJECTMODE)
+    if(!definition_.HasName())
+    {
+      Error(I2("Cannot declare an Static element without definig it "
+               "inline",
+               "No se puede declarar un elemento estático sin "
+               "definirlo en línea")+":\n"+
+      "  Static "+BParser::Unparse(branch_,"","\n")+
+      I2(" of Class ", "de Class ")+parent_->getName());
+      return(0);
+    }
+    else
+    {
+      BGrammar::IncLevel();
+      int stackPos = BGrammar::StackSize();
+      const BClass* oldStaticOwner = BClass::currentStatic_;
+      BClass::currentStatic_ = cls;
+      BSyntaxObject* obj = GraAnything()->EvaluateTree(branch_);
+      BClass::currentStatic_ = oldStaticOwner;
+      BGrammar::DestroyStackUntil(stackPos, obj);    
+      BGrammar::DecLevel();
+      if(obj)
+      {
+        static_ = obj;
+        if(isMethod_)
         {
-          obj = UCode(obj)->Contens().Operator();
+          if(obj->Mode()==BOBJECTMODE)
+          {
+            obj = UCode(obj)->Contens().Operator();
+          }
+          ((BUserFunction*)obj)->staticOwner_=(const BClass*)parent_;
         }
-        ((BUserFunction*)obj)->staticOwner_=(const BClass*)parent_;
-      }
-      static_->IncNRefs(); 
-      return(1);
-    }
-    else
-    {
-      isGood_ = false;
-      Error(I2("Wrong syntax in static declaration ",
-               "Sintaxis incorrecta en declaración estática ")+
-            "static "+BParser::Unparse(branch_,"","\n")+
-            I2(" of Class ", "de Class ")+parent_->getName());
-      return(0);
+        static_->IncNRefs(); 
+        return(1);
+      }
+      else
+      {
+        isGood_ = false;
+        Error(I2("Wrong syntax in static declaration ",
+                 "Sintaxis incorrecta en declaración estática ")+
+              "Static "+BParser::Unparse(branch_,"","\n")+
+              I2(" of Class ", "de Class ")+parent_->getName());
+        return(0);
+      }
     }
   }
@@ -1457 +1470 @@
      checkNonPrivate(this, methodName, fullAccess))
   { 
-    result = mbr->static_;
-    result->PutNameBlock(NULL);
+    if(result = mbr->static_) { result->PutNameBlock(NULL); }
   } 
   return(result);
@@ -1472 +1484 @@
      checkNonPrivate(this, memberName, fullAccess))
   { 
-    result = mbr->static_;
-    result->PutNameBlock(NULL);
+    if(result = mbr->static_) { result->PutNameBlock(NULL); }
   } 
   return(result);
@@ -1486 +1497 @@
   if(mbr && mbr->isStatic_  && checkNonPrivate(this, methodName, fullAccess))
   { 
-    result = mbr->static_;
-    result->PutNameBlock(NULL);
+    if(result = mbr->static_) { result->PutNameBlock(NULL); }
   } 
   return(result);