Changeset 0e08fa6 in tol

Timestamp:

Jul 2, 2010, 8:55:37 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

45e3d08

Parents:

902b7fa

Message:

FindStruct y FindClass deben buscar antes de nada en BNameBlock::Current()

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

Location:

tol/btol/bgrammar

Files:

• class.cpp (modified) (1 diff)
• str.cpp (modified) (2 diffs)

tol/btol/bgrammar/class.cpp

@@ -1456 +1456 @@
   BUserNameBlock* unb = NULL;
   BClass* cls = FindClassInNameBlock(name, unb);
+  if(!cls && BNameBlock::Current())
+  {
+    result = BNameBlock::Current()->Member(name);
+    if(result && (result->Mode()==BCLASSMODE))
+    {
+      cls = (BClass*)result;
+    }
+  }
   if(!cls)
   {

tol/btol/bgrammar/str.cpp

@@ -249 +249 @@
 {
   assert(name!="");
+  if((name=="Relation")||(name=="@Relation"))
+    printf("");
   TRACE_Def_StructMember("BStruct",this,name); 
   TRACE_MEMORY_SHOW(this,"BStruct::BStruct");
@@ -521 +523 @@
   BUserNameBlock* unb = NULL;
   BStruct* bstr = FindStructInNameBlock(name, unb);
+  if(!bstr && BNameBlock::Current())
+  {
+    result = BNameBlock::Current()->Member(name);
+    if(result && (result->Mode()==BSTRUCTMODE))
+    {
+      bstr = (BStruct*)result;
+    }
+  }
   if(!bstr)
   {