Changeset cdd0e84 in tol

Timestamp:

Feb 13, 2012, 7:46:28 PM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

4c13d5c

Parents:

1053ab7

Message:

refs #994, #1404: using exported function from TOL CheckSyntax

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

Location:

tol/btol/text_type

Files:

• tol_btxtgra.h (modified) (1 diff)
• txtgra.cpp (modified) (2 diffs)

tol/btol/text_type/tol_btxtgra.h

@@ -38 +38 @@
 template class TOL_API BGraContens     < BText >;
 
-TOL_API BText EvalText (const BText& expr, const BText& defVal); 
+TOL_API BText EvalText (const BText& expr, const BText& defVal);
+TOL_API BText CheckSyntax( const BText &expr );
 
 //--------------------------------------------------------------------

tol/btol/text_type/txtgra.cpp

@@ -96 +96 @@
   BGrammar::DecLevel();
   return(result);
+}
+
+//--------------------------------------------------------------------
+TOL_API BText CheckSyntax( const BText& expr ) 
+//--------------------------------------------------------------------
+{
+  BBool stat = BOut::ErrorHci();
+  BOut::PutErrorHci(BFALSE);
+  BParser* parser = new BParser;
+  Tree* tree = parser->Parsing( expr );
+  BText result = parser->MessageError();
+  delete parser;
+  BOut::PutErrorHci( stat );
+  DESTROY(tree);
+  return result;
 }
 
@@ -2598 +2613 @@
 //--------------------------------------------------------------------
 {
-    BText expr = Text(Arg(1));
-    BBool stat = BOut::ErrorHci();
-    BOut::PutErrorHci(BFALSE);
-    BParser* parser = new BParser;
-    Tree* tree = parser->Parsing(expr);
-    contens_ = parser->MessageError();
-    delete parser;
-    BOut::PutErrorHci(stat);
-    DESTROY(tree);
+  BText &expr = Text(Arg(1));
+  contens_ = CheckSyntax( expr );
 }