Changeset a110589 in tol

Timestamp:

Jun 24, 2010, 1:37:53 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

db38740

Parents:

dcc0498f

Message:

Refs #921
New method CheckNonDeclarativeAction

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

Location:

tol/bbasic

Files:

• out.cpp (modified) (2 diffs)
• tol_bout.h (modified) (1 diff)

tol/bbasic/out.cpp

@@ -31 +31 @@
 #include <tol/tol_bdat.h>
 #include <tol/tol_boper.h>
+#include <tol/tol_ois.h>
 
 //--------------------------------------------------------------------
@@ -538 +539 @@
 }
 
-/*
-//--------------------------------------------------------------------
-BText BOut::GetStatus()
-//--------------------------------------------------------------------
-{
-  BText vmode = "";
-  if(ErrorTerm  ()) { vmode += "E"; }
-  if(WarningTerm()) { vmode += "W"; }
-  if(StdTerm    ()) { vmode += "S"; }
-  if(InfoTerm   ()) { vmode += "U"; }
-  if(TraceTerm  ()) { vmode += "T"; }
-  if(vmode=="")     { vmode = "mA"; }
-  else              { vmode = "v"+vmode; }
-}
-  
-//--------------------------------------------------------------------
-bool BOut::SetStatusTerm()(const BText& vmode) 
-//--------------------------------------------------------------------
-{
-  bool ok = true;
-  unsigned int i=0;
-  if(!vmode.HasName()) { return; }
-  if((vmode[0]!='v')&&(vmode[0]!='m'))
-  {
-    ok = false;
-  }
-  else if((vmode[0]=='v') && (vmode[1]=='\0'))
-  {
-  //Backward compatibility of non explicit verbose mode vmode=="v"
-  //is equivalent to explicit verbose mode "vAmT", is to say, all
-  //vervose but traces
-    BOut::PutAllHci   (true);
-    BOut::PutAllTerm  (true);
-    BOut::PutTraceHci (false);
-    BOut::PutTraceTerm(false);
-  }
-  else if((vmode[0]=='m') && (vmode[1]=='\0'))
-  {
-  //Backward compatibility of non explicit verbose mode vmode=="m"
-  //is equivalent to explicit verbose mode "mAvE", is to say, all
-  //mute but errors
-    BOut::PutAllHci   (false);
-    BOut::PutAllTerm  (false);
-    BOut::PutErrorHci (true);
-    BOut::PutErrorTerm(true);
-  }
-  else
-  {
-    bool mode;
-  //If argument begis 
-    if(vmode[0]=='v')      
-    { 
-      BOut::PutAllHci (false);
-      BOut::PutAllTerm(false);
-      mode = true; 
-    }
-    else if(vmode[0]=='m') 
-    { 
-      BOut::PutAllHci (true);
-      BOut::PutAllTerm(true);
-      mode = false; 
-    }
-    else                   
-    { 
-      ok = false; 
-    }
-    for(i=1; ok && vmode[i]; i++) 
-    {
-      switch (vmode[i]) 
-      {
-        case 'A':
-          BOut::PutAllHci (mode);
-          BOut::PutAllTerm(mode);
-          break;
-        case 'E':
-          BOut::PutErrorHci (mode);
-          BOut::PutErrorTerm(mode);
-          break;
-        case 'W':
-          BOut::PutWarningHci (mode);
-          BOut::PutWarningTerm(mode);
-          break;
-        case 'S':
-          BOut::PutStdHci (mode);
-          BOut::PutStdTerm(mode);
-          break;
-        case 'U':
-          BOut::PutInfoHci (mode);
-          BOut::PutInfoTerm(mode);
-          break;
-        case 'T':
-          BOut::PutTraceHci (mode);
-          BOut::PutTraceTerm(mode);
-          break;
-        default :
-          // invalid character 
-          ok = false;
-          break;
-      }
-      if(!ok) { break; }
-    }
-  }
-  if(!ok)
-  {
-    InitVerboseMode();
-    Error(I2
-    (
-      "Wrong formatted verbose/mute argument\n"
-      "Default values will be used.\n"
-      "Unexpected character '",
-      "Formato inválido del argumento verbose/mute\n"
-      "Se usarán los valores por defecto.\n" 
-      "Caracter inesperado '"
-    )+vmode[i]+"' "+I2
-    (
-      "at position",
-      "en la posición"
-    )+" "+int(i+1)+I2
-    (
-      " of argument ",
-      " del argumento "
-    )+vmode+"\n\n\n"+HelpVerboseMode());
-  }
-}
-*/
+
+//--------------------------------------------------------------------
+  bool CheckNonDeclarativeAction(const BText& msg)
+//--------------------------------------------------------------------
+{
+  if(!BOis::RunningUseModule()) { return(false); }
+  Error(BText("OIS: ")+
+   "Sorry, non declarative actions are forbidden while Ois.UseModule "
+   "is running. Cannot use \n"+msg);
+  return(true);
+}

tol/bbasic/tol_bout.h

@@ -208 +208 @@
   //! Sends an Info level message to available outputs
   friend TOL_API void Info(const BText&);
-
+  //! Sends an error message to all current available outputs
+  //when it occurs a non declarative action while Ois.UseModule
+  //is running
+  friend TOL_API bool CheckNonDeclarativeAction(const BText&);
+  
   friend class TC_MsgMan;
 };