Changeset 20663cb in tol for toltcl/generic

Timestamp:

Jan 26, 2009, 3:52:03 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

d0b30d4

Parents:

0a512a2

Message:

Handling with returned Code objects having mode BUSERFUNMODE

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

File:

• toltcl/generic/tolaccess.cpp (modified) (1 diff)

toltcl/generic/tolaccess.cpp

@@ -1660 +1660 @@
   BSyntaxObject* obj = GraCode( )->BGrammar::LeftEvaluateExpr( expr );
   if( oldEnabled ) { BOut::Enable( ); }
-  BUserCode *uc = dynamic_cast<BUserCode*>( obj );
-  
-  return
-    ( uc && ( uc->Contens().Grammar( ) == G ) ) ? uc->Contens().Operator( ) : NULL;
+  if(obj)
+  {
+    if(obj->Mode()==BUSERFUNMODE)
+    {
+      opr = dynamic_cast<BOperator*>(obj);
+    }    
+    if(obj->Mode()==BOBJECTMODE)
+    {
+      BUserCode *uc = dynamic_cast<BUserCode*>( obj );
+      opr = uc->Contens().Operator( );
+      if(opr && (opr->Grammar( ) != G)) { opr = NULL; }
+    }
+  }
+  return(opr);
 }