Changeset 96b1982 in tol

Timestamp:

Dec 11, 2010, 7:25:50 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

7519264

Parents:

bb16420

Message:

Refs #1029
Adding Text to Cint.import_tol_var

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

File:

• tol/contrib/cint/tolCint.cpp (modified) (4 diffs)

tol/contrib/cint/tolCint.cpp

@@ -65 +65 @@
   int G__init_cint_ = G__init_cint("cint");
   G__set_errmsgcallback(Cint_errmsgcallback);
+  G__setautoconsole(1);
   return(G__init_cint_);
-};
+}
 
 //--------------------------------------------------------------------
@@ -179 +180 @@
 }
 
-//--------------------------------------------------------------------
-  DeclareContensClass(BDat, BDatTemporary, BDatCINT_import_tol_var);
-  DefExtOpr(1, BDatCINT_import_tol_var, 
-  "Cint.import_tol_var", 1, 0, "Anything Anything",
+
+
+//--------------------------------------------------------------------
+  DeclareContensClass(BDat, BDatTemporary, BDatCINT_import_from_tol);
+  DefExtOpr(1, BDatCINT_import_from_tol, 
+  "Cint.import_from_tol", 1, 0, "Anything Anything",
   "(Anything var1 [, Anything var2, ...])",
   I2("Imports TOL variables, global or local, into CINT global scope.\n"
      "Returns the number of imported variables\n"
      "TOL variables must have a valid name in TOL and C languages.\n"
-     "At this moment these are the available TOL types :\n"
-     "  TOL       CINT\n"
-     "  Real      double\n"
-     "  Matrix    class Matrix\n"
-     "  Text      class Text\n"
-     "You can view the declaration of corresponding C/C++ types at ",    
+     "At this moment these are the available TOL types :\n",    
      "Importa variables TOL, globales o locales, al ámbito global de CINT\n"
      "Devuelve el número total de variables correctamen te importadas.\n" 
      "Las variables TOL deben tener un nombre válido en los lenguajes "
      "TOL y C\n"
-     "Los tipos TOL admitidos para la importación son los siguientes:\n"
+     "Los tipos TOL admitidos para la importación son los siguientes:\n")+
      "  TOL       CINT\n"
      "  Real      double\n"
      "  Matrix    class Matrix\n"
-     "  Text      class Text\n"
+     "  Text      class Text\n"+
+  I2("You can view the declaration of corresponding C/C++ types at ",    
      "Puede ver la declaración de los correspondientes tipos C/C++ en ")+
      "\nhttps://www.tol-project.org/browser/tolp/trunk/tol/"
      "stdlib/general/TolCint/tol_cint_casting.cpp"+
-     cint_url_link,
-     BOperClassify::Conversion_);
-  void BDatCINT_import_tol_var::CalcContens()
-//--------------------------------------------------------------------
-{
-  if(CheckNonDeclarativeAction("Cint.import_tol_var")) { return; }
+  I2("Imported variables can be modified by CINT routines but memory "
+     "allocation and the internal structure cannot be altered. "
+     "For example, you can change the elements of a Matrix but cannot "
+     "change the number of cells, rows nor columns.",
+     "Las variables importadas pueden ser modificadas por rutinas CINT "
+     "pero el alojo de memoria no puede ser alterado. "
+     "Por ejemplo, es posible cambiar los elementos de una matriz pero "
+     "no el número de celdas, filas o columnas")+
+    cint_url_link,
+  BOperClassify::Conversion_);
+  void BDatCINT_import_from_tol::CalcContens()
+//--------------------------------------------------------------------
+{
+  if(CheckNonDeclarativeAction("Cint.import_from_tol")) { return; }
   
   BSyntaxObject* var = NULL;
@@ -225 +232 @@
       int ptrNum = (int)ptr;
       BText expression = BText("double& ")+var->Name()+" = *((double *)("<<ptrNum<<"))";
-    //Std(BText("TRACE [Cint.import_tol_variable] ")+expression);
+    //Std(BText("TRACE [Cint.import_from_tol] ")+expression);
       G__exec_text(expression);
       contens_ += 1;
@@ -238 +245 @@
         mat.Columns()<<","<<
         " ((double *)("<<ptrNum<<")) ); 0;";
-    //Std(BText("TRACE [Cint.import_tol_variable] ")+expression);
+    //Std(BText("TRACE [Cint.import_from_tol] ")+expression);
       G__exec_text(expression);
       contens_ += 1;
     }
+    else if(gra==GraText())
+    {
+      BText& txt = Text(var);
+      char* ptr = (char*)(txt.Buffer());
+      int ptrNum = (int)ptr;
+      BText expression = BText("Text ")+var->Name()+" ( "<<
+        txt.Length()<<","<<
+        " ((char *)("<<ptrNum<<")) ); 0;";
+    //Std(BText("TRACE [Cint.import_from_tol] ")+expression);
+      G__exec_text(expression);
+      contens_ += 1;
+    }
     else 
     {
-      Warning(BText("[Cint.import_tol_variable] ")+
+      Warning(BText("[Cint.import_from_tol] ")+
         "Cannot import TOL variables of type "<<gra->Name());
     }