Changeset aedc343 in tol

Timestamp:

Feb 24, 2012, 1:31:26 PM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

b0f6382

Parents:

eb21277

Message:

refs #1449, tol::info variable must use Tol_ResolveObject

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

File:

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

toltcl/generic/tolaccess.cpp

@@ -2343 +2343 @@
  * of a global container.
  */
-int Tol_SetVariablesObj (Tcl_Interp *interp, Tcl_Obj *gra_name,
+int Tol_SetVariablesObj (Tcl_Interp *interp, Tcl_Obj *obj_reference,
                          Tcl_Obj *obj_result)
 {
@@ -2352 +2352 @@
   int tcl_code;
   
-  if (Tcl_ListObjLength(interp,gra_name,&length)!=TCL_OK) {
-    Tcl_AppendObjToObj(obj_result,Tcl_GetObjResult(interp));
-    return TCL_ERROR;
-  }
-  if (length!=1) {
+  if ( Tcl_ListObjLength( interp, obj_reference, &length ) != TCL_OK ) {
+    Tcl_AppendObjToObj( obj_result, Tcl_GetObjResult( interp ) );
+    return TCL_ERROR;
+  }
+  if ( length > 1 ) {
+    /*
     if (length == 2) {
-      tcl_code = Tcl_ListObjGetElements(interp,gra_name,&length,&items);
+      tcl_code = Tcl_ListObjGetElements(interp,obj_reference,&length,&items);
       assert(tcl_code == TCL_OK);
       if (strcmp(Tcl_GetString(items[0]),"Console"))
         return Tol_SetVariableInfoObj(items[0], items[1], obj_result);
     }
-    if (!(syn=Tol_ResolveObject(interp, gra_name, obj_result))) {
+    */
+    if ( !( syn = Tol_ResolveObject( interp, obj_reference, obj_result ) ) ) {
       return TCL_ERROR;
     }
@@ -2374 +2376 @@
     return TCL_OK;
   }
-  BGrammar *gra = BGrammar::FindByName(Tcl_GetString(gra_name));
+  BGrammar *gra = BGrammar::FindByName(Tcl_GetString( obj_reference ) );
   if (!gra) {
     Tcl_AppendStringsToObj( obj_result, "'",
-                            Tcl_GetString(gra_name),
+                            Tcl_GetString( obj_reference ),
                             "' isn't a grammar", NULL );
     return TCL_ERROR;