Changeset c06378c in tol

Timestamp:

Dec 15, 2010, 2:13:10 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

a29d86c4

Parents:

4e10a23

Message:

Refs #1029
Using Gdouble and Gint

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

File:

• tol/btol/bgrammar/spfuninst.cpp (modified) (5 diffs)

tol/btol/bgrammar/spfuninst.cpp

@@ -1811 +1811 @@
       const BText& name = Text(uNam);
       int ptr = 0;
-      G__value g;
       if(gra==GraReal())
       {
-        g = G__calc(BText("(int)(double*)(")+name+")");
-        if(g.type == 105 ) { ptr = g.obj.i; }
-        if(ptr)
+        BDat cnt = G__double(G__calc(name));
+/*
+        g = G__calc(name);
+        bool ok = true;
+        switch (g.type) 
         {
-          double cnt = *(double*)ptr;
+          case 100: cnt = g.obj.d; break;
+          case 105: cnt = g.obj.i; break;
+          default:  ok = false;
+        }
+        if(!ok)
+        {
+          Error(I2("Unknown CINT numerical type ",
+                   "Tipo CINT numérico desconocido ")<<g.type);
+        }
+        else
+*/
+        {
           result = new BContensDat("",cnt,"");
         }
@@ -1826 +1838 @@
         int rows = -1, columns = -1;
         double* buffer = NULL;
-        g = G__calc(name+".rows_");
-        if(g.type == 105 ) { rows = g.obj.i; }
-        g = G__calc(name+".columns_");
-        if(g.type == 105 ) { columns = g.obj.i; }
-        g = G__calc(BText("(int)(double*)(")+name+".buffer_)");
-        if(g.type == 105 ) { buffer = (double*)g.obj.i; }
+        rows = G__int(G__calc(name+".rows_"));
+        columns = G__int(G__calc(name+".columns_"));
+        buffer = (double*)G__int(G__calc(BText("(int)(")+name+".buffer_)"));
         if(rows>0 && columns>0 && buffer!=NULL)
         {
@@ -1842 +1851 @@
         int length = -1;
         char* buffer = NULL;
-        g = G__calc(name+".length_");
-        if(g.type == 105 ) { length = g.obj.i; }
-        g = G__calc(BText("(int)(char*)(")+name+".buffer_)");
-        if(g.type == 105 ) { buffer = (char*)g.obj.i; }
+        length = G__int(G__calc(name+".length_"));
+        buffer = (char*)G__int(G__calc(BText("(int)(")+name+".buffer_)"));
         if(length>0 && buffer!=NULL)
         {
@@ -2342 +2349 @@
   AddInstance("Cint.export_to_tol",
      "(Text name)",
-     I2("Export global CINT variables to current TOL scope.\n"
+     I2("Exports global CINT variables to current TOL scope.\n"
      "CINT variables must have a valid name in TOL and C languages.\n"
      "At this moment these are the available TOL types :\n",    
@@ -2363 +2370 @@
   return(true);
 }
+