Changeset 84af815 in tol

Timestamp:

Mar 9, 2012, 3:54:00 PM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

0fd52fc

Parents:

bfa6580

Message:

refs #1460, #1476, se implementa TextMatch en C (tomado de la implementación interna de tcl), ya no se recurre a Tcl_Eval, el argumento pattern se pasa por referencia evitando una copia temporal, se eliminan algunos warnings de compilación

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

Location:

tol

Files:

• bbasic/StringMatch.cpp (added)
• bbasic/tol_btext.h (modified) (1 diff)
• bbasic/txtalgeb.cpp (modified) (8 diffs)
• btol/real_type/datgrav.cpp (modified) (1 diff)

tol/bbasic/tol_btext.h

@@ -386 +386 @@
 
   //! Checks if a given pattern matchs with the actual text
-  BBool Match (const BText pattern, BBool caseSensitive=BFALSE) const;
+  BBool Match (const BText &pattern, BBool caseSensitive=BFALSE) const;
 
   //! Returns the wrapped text \a txt compacted

tol/bbasic/txtalgeb.cpp

@@ -717 +717 @@
   {
     const BChar* beginText;
-    if(beginText = strstr(String() + from, txt.String()))
+    if( (beginText = strstr(String() + from, txt.String())) )
     {
       indexText = (beginText - String());
@@ -849 +849 @@
   number = 0;
   BChar* pos=Buffer();
-  while(pos=strchr(pos, oldChar)) 
+  while( (pos=strchr(pos, oldChar)) ) 
   { 
     *pos = newChar; 
@@ -907 +907 @@
         txt.ReallocateBuffer(2*txt.Size()); 
       }
-      if(pos=strstr(Buffer()+oldPos, oldText.String()))
+      if( (pos=strstr(Buffer()+oldPos, oldText.String())) )
       {
         number++;
@@ -1062 +1062 @@
 
 
-//--------------------------------------------------------------------
-BBool BText::Match(const BText pattern, BBool caseSensitive) const
+#include "StringMatch.cpp"
+
+//--------------------------------------------------------------------
+BBool BText::Match(const BText &pattern, BBool caseSensitive) const
 
 /*! Returns true if the pattern \a pattern makes match with the
@@ -1081 +1083 @@
 {
   assert(IsAllOk());
+  return Tol_StringCaseMatch( String(), pattern.String(), !caseSensitive );
+#if 0
   BBool Ok=BFALSE;
   if(!HasName() || !pattern.HasName()) { Ok=BFALSE; }
@@ -1120 +1124 @@
   }
   return(Ok);
+#endif
 }
 
@@ -1139 +1144 @@
   BText txt;
   BInt len;
-  if(len=strftime(buf, maxSize, fmt, localtime(&t)))
+  if( (len=strftime(buf, maxSize, fmt, localtime(&t))) )
   {
     txt.Copy(buf,len-1);
@@ -1225 +1230 @@
   for(n=0; (n<maxItems) && pos && oldPos[0]; n++)
   {
-    if(pos = strchr(oldPos, sep))
+    if( (pos = strchr(oldPos, sep)) )
     {
       txt[n].Copy(oldPos, 0, pos-oldPos-1);

tol/btol/real_type/datgrav.cpp

@@ -2115 +2115 @@
   BInt mode = 0;
   if(Arg(3)) { mode = (BInt)Real(Arg(3)); }
-  if(TolTclIsEnabled())
-  {
-    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));
 }