Changeset a8b5f73 in tol

Timestamp:

Nov 12, 2009, 2:39:05 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

59dc492

Parents:

4ddca89

Message:

Fixed #780

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

File:

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

tol/btol/bgrammar/graacc.cpp

@@ -533 +533 @@
   bool isGraCode = (this==GraCode());
 /* */
+  if(!found) 
+  { 
+    found = BNameBlock::LocalMember(name); 
+    found = getOperand(this, found);
+  }
+  if(!found) 
+  { 
+    found = FindLocal(name); 
+    found = getOperand(this, found);
+  }
   const BClass* cls = BClass::currentClassBuildingInstance_;
   if(cls && (this==GraCode()))  
@@ -553 +563 @@
       found = met;
     }
-  }
-/* */
-  if(!found) 
-  { 
-    found = BNameBlock::LocalMember(name); 
-    found = getOperand(this, found);
-  }
-  if(!found) 
-  { 
-    found = FindLocal(name); 
-    found = getOperand(this, found);
   }
   if(!found)
@@ -676 +675 @@
   BSyntaxObject* met = NULL;
 /* */
+  if(!found) 
+  { 
+    found = getOperator(this, BNameBlock::LocalMember(name));
+  }
   const BClass* cls = BClass::currentClassBuildingInstance_;
+  if(!found) 
+  { 
+    found = getOperator(this, FindLocal(name));
+  }
   if(!found && cls)  
   { 
@@ -697 +704 @@
     }
   } 
-/* */
-  if(!found) 
-  { 
-    found = getOperator(this, BNameBlock::LocalMember(name));
-  }
-  if(!found) 
-  { 
-    found = getOperator(this, FindLocal(name));
-  }
   BGrammar* g;
   BObjByClassHash* obch=NULL;