Changeset a64730a in tol

Timestamp:

Jan 26, 2009, 10:17:08 AM (18 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

556df52

Parents:

c61d3f9

Message:

TT_FindOperator : use LeftEvaluate in order to apply ::

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

File:

• toltcl/generic/tolaccess.cpp (modified) (3 diffs)

toltcl/generic/tolaccess.cpp

@@ -36 +36 @@
 #include <tol/tol_bnameblock.h>
 #include <tol/tol_bspfun.h>
+#include <tol/tol_bcodgra.h>
 #include <tol/tol_bsetgra.h>
 #include <tol/tol_btsrgra.h>
@@ -1649 +1650 @@
 }
 
+static
+BOperator* TT_FindOperator( const BGrammar *G, const char *expr )
+{
+  BOperator* opr = G->FindOperator( expr );
+  if ( opr ) {
+    return opr;
+  }
+  bool oldEnabled = BOut::Disable();
+  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;
+}
+
 /*
  * Fill in obj_result the function's prototype and description
@@ -1696 +1713 @@
     if (gra) {
       Tcl_DStringInit(&dstr);
-      Tcl_UtfToExternalDString(NULL,Tcl_GetString(fun_name),-1,&dstr);
-      BOperator* opr = gra->FindOperator(Tcl_DStringValue(&dstr));
+      Tcl_UtfToExternalDString( NULL, Tcl_GetString( fun_name ), -1, &dstr );
+      BOperator* opr = TT_FindOperator( gra, Tcl_DStringValue( &dstr ) );
       Tcl_DStringFree(&dstr);
       if (opr) {