Changeset ef21614 in tol

Timestamp:

Mar 3, 2012, 11:12:15 AM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

c300cb7

Parents:

53ea6a0

Message:

fixes #1460, evitamos pasar por el parser para que no se produzcan las sustituciones en los argumentos.

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

File:

• tol/btol/real_type/datgrav.cpp (modified) (3 diffs)

tol/btol/real_type/datgrav.cpp

@@ -767 +767 @@
 
 
-static char* structFinder_ = "Struct";
-static char* classFinder_  = "Class";
+static const char* structFinder_ = "Struct";
+static const char* classFinder_  = "Class";
 static BSyntaxObject* structGra_ = (BSyntaxObject*)structFinder_;
 static BSyntaxObject* classGra_  = (BSyntaxObject*)classFinder_;
@@ -2064 +2064 @@
 
 
-
+static BUserFunction *tclTextMatch = NULL;
 //--------------------------------------------------------------------
   DeclareContensClass(BDat, BDatTemporary, BDatMatchText);
@@ -2113 +2113 @@
   if(TolTclIsEnabled())
   {
-    BText expr = BText("TextMatch_Tcl(\"")+string+"\",\""+pattern+"\","+mode+")";
-    BSyntaxObject* uMatch = GraReal()->EvaluateExpr(expr);
-    if(uMatch)
-    { 
-      contens_ = Real(uMatch)!=0;
-      DESTROY(uMatch);
-    }
-  }
-  else
-  {
-    Warning("Using internal version of TextMatch could cause invalid results. "
-    "Please use a TCL version of TOL like tolsh or tolbase.");
-    contens_ = (BReal)(string.Match(pattern, mode));
-  }
+    if ( tclTextMatch || ( tclTextMatch = (BUserFunction*)GraReal()->FindOperator( "TextMatch_Tcl" ) ) ) {
+      BList *args = Cons( Arg(1), NCons( Arg(2) ) );
+
+      if ( Arg(3) ) {
+        LstAppend( args, Arg(3) );
+      } else {
+        BUserDat *uMode = BContensDat::New( "", BDat(mode), "" );
+        uMode->PutName( "case" );
+        LstAppend( args, uMode ); 
+      }
+      BSyntaxObject *evalResult = tclTextMatch->Evaluator( args );
+      if ( evalResult ) {
+        contens_ = Dat( evalResult );
+      }
+      // DUDA: debo destruir args?
+      DESTROY( evalResult );
+      return;
+    }
+  }
+  Warning("Using internal version of TextMatch could cause invalid results. "
+          "Please use a TCL version of TOL like tolsh or tolbase.");
+  contens_ = (BReal)(string.Match(pattern, mode));
 }