Changeset 2175 for trunk/lang

Timestamp:

Mar 30, 2011 1:45:19 PM (13 years ago)

Author:

gah

Message:

updates to makefiles

Location:

trunk/lang/tcl

Files:

• scripts/library.tcl (modified) (1 diff)
• src/RpRusage.c (modified) (2 diffs)

trunk/lang/tcl/scripts/library.tcl

@@ -509 +509 @@
         return ""
     }
+    # Expat (via tDOM) will always produce utf-8 output, regardless of the
+    # encoding of the tool.xml.  We need to convert utf-8 to unicode for
+    # Tcl/Tk.  This shouldn't affect ASCII tool.xml files.
+    set string [encoding convertfrom utf-8 [$node text]]
     if {$params(-decode) == "yes"} {
-        return [Rappture::encoding::decode -- [string trim [$node text]]]
-    } else {
-        return [string trim [$node text]]
-    }
+        set string [Rappture::encoding::decode -- $string]
+    }
+    return [string trim $string]
 }
 

trunk/lang/tcl/src/RpRusage.c

@@ -195 +195 @@
     double tval;
     RpRusageStats curstats;
-    char buffer[TCL_DOUBLE_SPACE];
+    Tcl_Obj *listObjPtr, *objPtr;
 
     if (RpRusageCapture(interp, &curstats) != TCL_OK) {
@@ -213 +213 @@
     markPtr = (RpRusageStats*)Tcl_GetHashValue(entryPtr);
 
+    listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
     /*
      * Compute: START TIME
      */
-    Tcl_AppendElement(interp, "start");
+    objPtr = Tcl_NewStringObj("start", 5);
+    Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
     tval = RpRusageTimeDiff(&markPtr->times, &RpRusage_Start.times);
-    Tcl_PrintDouble(interp, tval, buffer);
-    Tcl_AppendElement(interp, buffer);
+    objPtr = Tcl_NewDoubleObj(tval);
+    Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
 
     /*
      * Compute: WALL TIME
      */
-    Tcl_AppendElement(interp, "walltime");
+    objPtr = Tcl_NewStringObj("walltime", 8);
+    Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
     tval = RpRusageTimeDiff(&curstats.times, &markPtr->times);
-    Tcl_PrintDouble(interp, tval, buffer);
-    Tcl_AppendElement(interp, buffer);
+    objPtr = Tcl_NewDoubleObj(tval);
+    Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
+
 
     /*
      * Compute: CPU TIME = user time + system time
      */
-    Tcl_AppendElement(interp, "cputime");
+    objPtr = Tcl_NewStringObj("cputime", 7);
+    Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
     tval = RpRusageTimeDiff(&curstats.resources.ru_utime,
              &markPtr->resources.ru_utime)
          + RpRusageTimeDiff(&curstats.resources.ru_stime,
              &markPtr->resources.ru_stime);
-    Tcl_PrintDouble(interp, tval, buffer);
-    Tcl_AppendElement(interp, buffer);
-
+    objPtr = Tcl_NewDoubleObj(tval);
+    Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
+    Tcl_SetObjResult(interp, listObjPtr);
     return TCL_OK;
 }