Changeset 28bccd2 in tol

Timestamp:

May 5, 2011, 10:57:08 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

e2cfb5f

Parents:

d6b52ea

Message:

Fixes #297
TextMatch calls to TextMatch _tcl if available and else sows a warning and use old BText::Match

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

Location:

tol

Files:

• btol/real_type/datgrav.cpp (modified) (3 diffs)
• stdlib/general/grammars/_text.tol (modified) (1 diff)

tol/btol/real_type/datgrav.cpp

@@ -25 +25 @@
 
 #include <tol/tol_bdatgra.h>
+#include <tol/tol_init.h>
 #include <tol/tol_bout.h>
 #include <tol/tol_bdir.h>
@@ -2033 +2034 @@
   DeclareContensClass(BDat, BDatTemporary, BDatMatchText);
   DefExtOpr(1, BDatMatchText, "TextMatch", 2, 3, "Text Text Real",
-  I2("(Text chain, Text pattern [, Real case = 0 ])",
+  I2("(Text string, Text pattern [, Real case = 0 ])",
      "(Text cadena, Text modelo [, Real modo = 0 ])"),
   I2(
@@ -2072 +2073 @@
 //--------------------------------------------------------------------
 {
+  BText& string  = Text(Arg(1));
+  BText& pattern = Text(Arg(2));
   BInt mode = 0;
   if(Arg(3)) { mode = (BInt)Real(Arg(3)); }
-  contens_ = (BReal)(Text(Arg(1)).Match(Text(Arg(2)), mode));
+  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));
+  }
 }
 

tol/stdlib/general/grammars/_text.tol

@@ -1248 +1248 @@
   WriteFile(filePath, Replace(contens, old, new))
 };
+
+//////////////////////////////////////////////////////////////////////////////
+Real TextMatch_Tcl(Text text, Text pattern, Real case) 
+//////////////////////////////////////////////////////////////////////////////
+{
+  Text text.tcl = "{"<<Replace(Replace(Replace(text, "\\", "\\\\"), 
+    "{",  "\\{"), "}",  "\\}") << "}";
+  Text pattern.tcl = "{"<<Replace(Replace(Replace(pattern, "\\", "\\\\"), 
+    "{",  "\\{"), "}",  "\\}") << "}";
+  Text caseText = If(case, "", "-nocase ");
+  Eval(Tcl_Eval("string match "<<caseText<<pattern.tcl<<" "<<text.tcl)[1])
+};