Changeset c14b554 in tol for toltcl/generic/toltableset.cpp

Timestamp:

Oct 19, 2008, 5:56:30 PM (18 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

ce06505

Parents:

6d7779d

Message:

merging from NameBlock/VMatrix branch

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

File:

• toltcl/generic/toltableset.cpp (modified) (10 diffs)

toltcl/generic/toltableset.cpp

@@ -3 +3 @@
                     GNU/tolTcl Library
 
-   Copyright (C) 2001, 2002, 2003 - Bayes Decisión, SL
+   Copyright (C) 2001, 2002, 2003 - Bayes Decisión, SL
 
    This program is free software; you can redistribute it and/or modify
@@ -37 +37 @@
 #include <tol/tol_bdatgra.h>
 #include <tol/tol_bmatgra.h>
+#include <tol/tol_bvmatgra.h>
 #include <tol/tol_bsetgra.h>
 #include <tol/tol_btxtgra.h>
@@ -161 +162 @@
     return interp;
   }
-
   int GetRows() {
     return rows;
@@ -258 +258 @@
 class Tol_TableMatrix : public Tol_Table {
 public:
-  Tol_TableMatrix(Tcl_Interp * _interp, char * matname, BMat * mat,
+  Tol_TableMatrix(Tcl_Interp * _interp, char * matname, BMatrix<double> *mat,
                   Tcl_Obj * obj_result);
 protected:
-  int Build(BMat * mat, Tcl_Obj * obj_result);  
+  int Build(BMatrix<double> *mat, Tcl_Obj * obj_result);  
 };
 
@@ -1599 +1599 @@
  */
 
-Tol_TableMatrix::Tol_TableMatrix(Tcl_Interp * _interp, char * matname, BMat * mat,
+Tol_TableMatrix::Tol_TableMatrix(Tcl_Interp * _interp, char * matname, BMatrix<double> *mat,
                                  Tcl_Obj * obj_result)
   : Tol_Table(_interp, matname)
@@ -1612 +1612 @@
  */
 
-int Tol_TableMatrix::Build(BMat * mat, Tcl_Obj * obj_result)
+int Tol_TableMatrix::Build(BMatrix<double> *mat, Tcl_Obj * obj_result)
 {
   Tol_ColumnData * ptrCol;
@@ -1632 +1632 @@
         Tcl_IncrRefCount(rowsNames[row]=Tcl_NewStringObj(buffer, -1));
       }
-      ptrCol->AppendBDat(interp,(*mat)(row,col));
+      BDat dat((*mat)(row,col));
+      ptrCol->AppendBDat(interp, dat);
     }
   }
@@ -1673 +1674 @@
 
   // syn = Tol_GetObjFromReference( interp, GraSet(), setref, obj_result );
-  if (!(syn=Tol_ResolveObject(interp, objref, ismat?GraMatrix():GraSet()))) {
-    Tcl_AppendObjToObj(obj_result,Tcl_GetObjResult(interp));    
+  if (!(syn=Tol_ResolveObject(interp, objref, obj_result))) {
     return TCL_ERROR;
   }
@@ -1683 +1683 @@
   Tol_Table * ptrTable;
   if (ismat) {
-    BMat * ptrMat = &(((BUserMat*)syn)->Contens());
+    BMatrix<double> vmat;
+    BMatrix<double> &theMat = vmat;
+    if (syn->Grammar()==GraVMatrix()) {
+      BVMat &V = VMat((BSyntaxObject *)syn);
+      V.GetDMat(vmat);
+    } else if (syn->Grammar()==GraMatrix()) {
+      theMat = ((DMat&)Mat((BSyntaxObject *)syn));
+    } else {  
+      Tcl_AppendStringsToObj( obj_result, Tcl_GetString(objref),
+                              " is not a valid Matrix|VMatrix object", NULL );    
+      return TCL_ERROR;
+    }
+    
     ptrTable = new Tol_TableMatrix( interp, objname.Buffer(),
-                                    ptrMat, obj_result );
-  } else {
-    BSet * ptrSet = &(((BUserSet*)syn)->Contens());
+                                    &theMat, obj_result );
+  } else if ( syn->Grammar()==GraSet() ) {
+    
+    BSet *ptrSet = &(Set((BSyntaxObject*)syn));
     ptrTable = new Tol_TableSet( interp, objname.Buffer(),
                                  ptrSet, obj_result );
+  } else {  
+    Tcl_AppendStringsToObj( obj_result, Tcl_GetString(objref),
+                            " is not a valid Set object", NULL );    
+    return TCL_ERROR;
   }
   if ( ptrTable->CmdStatus() != TCL_OK ) {
@@ -1696 +1713 @@
   }
   ptrTable->CreateCommand(tblname);
+  
   return TCL_OK;
 }