Changeset 8cf5460 in tol

Timestamp:

Sep 1, 2009, 8:34:27 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

ba0d09c

Parents:

15936a6d

Message:

Searching for static members and methods of classes

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

File:

• tol/btol/bgrammar/graacc.cpp (modified) (2 diffs)

tol/btol/bgrammar/graacc.cpp

@@ -495 +495 @@
 /* */
   const BClass* cls = BClass::currentClassBuildingInstance_;
-  if(!found && cls && (this==GraCode()))
-  {
-    BSyntaxObject* met = cls->FindMethod(name);
-    if(met)
+  BSyntaxObject* met = NULL;
+  if(cls && (this==GraCode()))  
+  { 
+    met = cls->FindMethod(name,true); 
+  }
+  else if(cls = BClass::currentStatic_)
+  {
+    met = cls->FindStatic(name,true);
+  }
+  if(!found && met)
+  {
+    if((met->Mode()==BUSERFUNMODE)&&(this==GraCode()))
     { 
-      if(met->Mode()==BUSERFUNMODE)
-      { 
-        opr = (BOperator*)met; 
-        found = opr->GetCode();
-      }
-      else if(met->Mode()==BOBJECTMODE)
-      {
-        found = met;
-      }
-    } 
+      opr = (BOperator*)met; 
+      found = opr->GetCode();
+    }
+    else if(met->Mode()==BOBJECTMODE)
+    {
+      found = met;
+    }
   }
 /* */
@@ -622 +627 @@
 /* */
   const BClass* cls = BClass::currentClassBuildingInstance_;
-  if(cls)
-  {
-    BSyntaxObject* met = cls->FindMethod(name);
-    if(met)
+  BSyntaxObject* met = NULL;
+  if(cls)  
+  { 
+    met = cls->FindMethod(name,true); 
+  }
+  else if(cls = BClass::currentStatic_)
+  {
+    met = cls->FindStatic(name,true);
+  }
+  if(met)
+  { 
+    if(met->Mode()==BUSERFUNMODE)
     { 
-      if(met->Mode()==BUSERFUNMODE)
-      { 
-        found = (BOperator*)met;
-      }
-      else if(met->Mode()==BOBJECTMODE)
-      {
-        BUserCode* uCode = UCode(met);
-        found = uCode->Contens().Operator();
-      }
-    } 
-  }
+      found = (BOperator*)met;
+    }
+    else if(met->Mode()==BOBJECTMODE)
+    {
+      BUserCode* uCode = UCode(met);
+      found = uCode->Contens().Operator();
+    }
+  } 
 /* */
   if(!found)