Changeset b6a0831 in tol

Timestamp:

Feb 27, 2012, 8:00:00 AM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

477d78a

Parents:

44d90fd

Message:

refs #1449, index information is better built from tcl when invoking tol::foreach

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

File:

• toltcl/generic/tolaccess.cpp (modified) (9 diffs)

toltcl/generic/tolaccess.cpp

@@ -1002 +1002 @@
   BSyntaxObject* container;
   Tcl_DString dstr;
-  Tcl_Obj * ArgIndexes;
   int tcl_code = TCL_OK;
   int i;
-  int n, index_length;
-  Tcl_Obj ** items;
 
   int length = 0;
@@ -1038 +1035 @@
   const int OBJ_DESC       = OBJ_PATHV + 1;
   const int OBJ_DESCV      = OBJ_DESC + 1;
-  const int OBJ_INDEXES    =  OBJ_DESCV + 1;
-  const int OBJ_INDEXESV   =  OBJ_INDEXES + 1;
-  const int OBJ_ISFILE     = OBJ_INDEXESV + 1;
+  const int OBJ_ISFILE     = OBJ_DESCV + 1;
   const int OBJ_ISFILEV    = OBJ_ISFILE + 1;
   const int OBJ_HASSUBSET  = OBJ_ISFILEV + 1;
@@ -1068 +1063 @@
   }
   
-  // is ok to ask for a list
-  Tcl_ListObjGetElements( interp, objv[ 1 ], &n, &items );
-
-  // initialize the list of indexes (the common part) for every item
-  // in the Set
-  if (strcmp(Tcl_GetString( items[ 0 ] ),"Console")) {
-    if (n>2)
-      ArgIndexes = Tcl_NewListObj( n - 2, items + 2 );
-    else
-      ArgIndexes = Tcl_NewListObj( 0, NULL );
-  } else {
-    if ( n > 1 )
-      ArgIndexes = Tcl_NewListObj( n - 1, items + 1 );
-    else
-      ArgIndexes = Tcl_NewListObj( 0, NULL );
-  }
-
   datav[ OBJ_GRAMMAR ]  = Tcl_NewStringObj( "grammar", -1 );
   datav[ OBJ_GRAMMARV ] = Tcl_NewObj( );
@@ -1095 +1073 @@
   datav[ OBJ_DESC ]     = Tcl_NewStringObj( "description", -1 );
   datav[ OBJ_DESCV ]    = Tcl_NewObj( );
-  Tcl_Obj * last_index  = Tcl_NewIntObj( 1 );
-  Tcl_ListObjAppendElement( NULL, ArgIndexes, last_index );
-  datav[ OBJ_INDEXES ]  = Tcl_NewStringObj( "indexes", -1 );
-  datav[ OBJ_INDEXESV ] = ArgIndexes;
-  Tcl_ListObjLength( NULL, datav[ OBJ_INDEXES ], &index_length );
   datav[ OBJ_ISFILE ]     = Tcl_NewStringObj( "isfile", -1 );
   datav[ OBJ_ISFILEV ]    = Tcl_NewObj( );
@@ -1145 +1118 @@
     /* read the path */
     btxt = syn_i->SourcePath();
-    Tcl_ExternalToUtfDString(NULL,btxt,-1,&dstr);
+    Tcl_ExternalToUtfDString(NULL, btxt, -1,& dstr);
     SAVE_SET_STRING( datav + OBJ_PATHV, &dstr ); 
     Tcl_DStringFree(&dstr);
@@ -1152 +1125 @@
     btxt = syn_i->Description();
     Tcl_ExternalToUtfDString(NULL,btxt,-1,&dstr);
-    SAVE_SET_STRING( datav + OBJ_PATHV, &dstr ); 
+    SAVE_SET_STRING( datav + OBJ_DESCV, &dstr ); 
     Tcl_DStringFree(&dstr);
 
-    /* update last index */
-    if ( Tcl_IsShared( last_index ) ) {
-      last_index = Tcl_NewIntObj( i );
-      Tcl_ListObjReplace( NULL, datav[ OBJ_INDEXESV ], index_length-1,
-                          1, 1, &last_index );
-    } else {
-      Tcl_SetIntObj( last_index, i );
-    }
-    /* to refresh the string */
-    Tcl_InvalidateStringRep( datav[ OBJ_INDEXESV ] );
     // Este if es para incluir en los items que son Set informacion
     // que solo ellos llevan como: Subtype, IsFile, etc ...
@@ -1225 +1188 @@
       datac = NUM_OBJS;
     } else
-      datac = OBJ_INDEXESV + 1;
+      datac = OBJ_DESCV + 1;
     // set the loop variable
     Tcl_Obj *varValuePtr = Tcl_ObjSetVar2( interp, objv[ 0 ], NULL,
@@ -1240 +1203 @@
     }
     tcl_code = Tcl_EvalObjEx( interp, objv[ 2 ], 0 );
+    // unset loop variable
+    Tcl_UnsetVar( interp, Tcl_GetString( objv[ 0 ] ), 0 );
     if ( tcl_code != TCL_OK) {
       if ( tcl_code == TCL_CONTINUE) {
@@ -1257 +1222 @@
   delete citer;
   
-  /* liberar los objetos tcl */
+  /* release tcl objects holds on datav */
   for ( i = 0; i < NUM_OBJS; ++i ) {
     Tcl_DecrRefCount( datav[ i ] );