Changeset 1384 for trunk/lang

Timestamp:

Apr 6, 2009, 10:19:50 AM (16 years ago)

Author:

gah

Message:

 

Location:

trunk/lang

Files:

• python/Rappture/PyRpEncode.cc (modified) (1 diff)
• tcl/src/RpEncodeTclInterface.cc (modified) (12 diffs)

trunk/lang/python/Rappture/PyRpEncode.cc

@@ -45 +45 @@
     }
 
-    rv = PyFloat_FromDouble(Rappture::encoding::isbinary(data,dlen));
-
+    rv = PyFloat_FromDouble(Rappture::encoding::isBinary(data,dlen));
     return rv;
 }

trunk/lang/tcl/src/RpEncodeTclInterface.cc

@@ -19 +19 @@
 }
 
-static Tcl_ObjCmdProc RpTclEncodingIs;
-static Tcl_ObjCmdProc RpTclEncodingEncode;
-static Tcl_ObjCmdProc RpTclEncodingDecode;
+static Tcl_ObjCmdProc IsCmd;
+static Tcl_ObjCmdProc EncodeCmd;
+static Tcl_ObjCmdProc DecodeCmd;
 
 /**********************************************************************/
@@ -37 +37 @@
 RpEncoding_Init(Tcl_Interp *interp)
 {
-
     Tcl_CreateObjCommand(interp, "::Rappture::encoding::is",
-        RpTclEncodingIs, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
+        IsCmd, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
 
     Tcl_CreateObjCommand(interp, "::Rappture::encoding::encode",
-        RpTclEncodingEncode, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
+        EncodeCmd, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
 
     Tcl_CreateObjCommand(interp, "::Rappture::encoding::decode",
-        RpTclEncodingDecode, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
-
-    return TCL_OK;
-}
-
-/**********************************************************************/
-// FUNCTION: RpTclEncodingIs()
+        DecodeCmd, (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
+    return TCL_OK;
+}
+
+/**********************************************************************/
+// FUNCTION: IsCmd()
 /// Rappture::encoding::is checks to see if given string is binary.
 /**
@@ -61 +59 @@
 
 static int
-RpTclEncodingIs (ClientData cdata, Tcl_Interp *interp,
-    int objc, Tcl_Obj *const objv[])
+IsCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const *objv)
 {
     Tcl_ResetResult(interp);
@@ -79 +76 @@
     const char *buf;
     const char *string;
-    buf = (const char*) Tcl_GetByteArrayFromObj(objv[2], &bufLen);
+    buf = (const char *)Tcl_GetByteArrayFromObj(objv[2], &bufLen);
     const char *type = Tcl_GetString(objv[1]);
-    if (('b' == *type) && (strcmp(type,"binary") == 0)) {
-        bool isBinary;
-
-        isBinary = (Rappture::encoding::isbinary(buf,bufLen) != 0);
-        string = (isBinary) ? "yes" : "no" ;
+    if (('b' == *type) && (strcmp(type, "binary") == 0)) {
+        string = (Rappture::encoding::isBinary(buf, bufLen)) ? "yes" : "no";
     } else if (('e' == *type) && (strcmp(type,"encoded") == 0)) {
         bool isEncoded;
@@ -101 +95 @@
 
 /**********************************************************************/
-// FUNCTION: RpTclEncodingEncode()
+// FUNCTION: EncodeCmd --
 /// Rappture::encoding::encode function in Tcl, encodes provided string
 /**
@@ -167 +161 @@
 typedef struct {
     unsigned int flags;
-    unsigned int noheader;
 } EncodeSwitches;
 
@@ -174 +167 @@
     {SWITCH_CUSTOM, "-as", "z|b64|zb64",
         offsetof(EncodeSwitches, flags), 0, 0, &asSwitch},
-    {SWITCH_VALUE, "-no-header", "", 
-        offsetof(EncodeSwitches, noheader), 0, true},
+    {SWITCH_BITMASK, "-noheader", "", 
+        offsetof(EncodeSwitches, flags), 0, RPENC_RAW},
     {SWITCH_END}
 };
 
 static int
-RpTclEncodingEncode (ClientData cdata, Tcl_Interp *interp, int objc,
-                     Tcl_Obj *const *objv)
+EncodeCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
+          Tcl_Obj *const *objv)
 {
     if (objc < 1) {
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
                 Tcl_GetString(objv[0]), 
-                " ?-as z|b64|zb64? ?-no-header? ?--? string\"", (char*)NULL);
+                " ?-as z|b64|zb64? ?-noheader? ?--? string\"", (char*)NULL);
         return TCL_ERROR;
     }
     EncodeSwitches switches;
     switches.flags = 0;
-    switches.noheader = 0;
     int n;
     n = Rp_ParseSwitches(interp, encodeSwitches, objc - 1, objv + 1, &switches,
@@ -203 +195 @@
         Tcl_AppendResult(interp, "wrong # args: should be \"", 
                 Tcl_GetString(objv[0]), 
-                " ?-as z|b64|zb64? ?-no-header? ?--? string\"", (char*)NULL);
+                " ?-as z|b64|zb64? ?-noheader? ?--? string\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -213 +205 @@
     }
     Rappture::Buffer buf(string, nBytes);
-    if (!switches.noheader) {
-        switches.flags |= RPENC_HDR;
-    }
     Rappture::Outcome status;
     if (!Rappture::encoding::encode(status, buf, switches.flags)) {
@@ -227 +216 @@
 
 /**********************************************************************/
-// FUNCTION: RpTclEncodingDecode()
+// FUNCTION: DecodeCmd()
 /// Rappture::encoding::decode function in Tcl, decodes provided string
 /**
@@ -236 +225 @@
  * Full function call:
  * ::Rappture::encoding::decode ?-as z|b64|zb64? <string>
+ *
+ *      I'd rather the interface be
+ *      
+ *              decode -b64 -z string 
  */
 
@@ -246 +239 @@
     {SWITCH_CUSTOM, "-as", "z|b64|zb64",
         offsetof(DecodeSwitches, flags), 0, 0, &asSwitch},
+    {SWITCH_BITMASK, "-raw", "", 
+        offsetof(DecodeSwitches, flags), 0, RPENC_RAW},
     {SWITCH_END}
 };
 
 static int
-RpTclEncodingDecode(ClientData clientData, Tcl_Interp *interp, int objc,
-                    Tcl_Obj *const *objv)
+DecodeCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
+          Tcl_Obj *const *objv)
 {
     if (objc < 1) {