X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl.git;a=blobdiff_plain;f=hbytes%2Fparse.c;h=539f0748727a31d1b88db14225d35781d89c300e;hp=b81511cc827e0c45d1cb53bfe318c74cb1a34cfe;hb=2fbe5a5eee8d5d28af55ea9e161d89543a9d8565;hpb=d23a32272b954579fe15c78d6ea605e087d0a512

diff --git a/hbytes/parse.c b/hbytes/parse.c
index b81511c..539f074 100644
--- a/hbytes/parse.c
+++ b/hbytes/parse.c
@@ -26,35 +26,48 @@ int pat_int(Tcl_Interp *ip, Tcl_Obj *obj, int *val) {
   return Tcl_GetIntFromObj(ip, obj, val);
 }
   
+int pat_long(Tcl_Interp *ip, Tcl_Obj *obj, long *val) {
+  return Tcl_GetLongFromObj(ip, obj, val);
+}
+  
+int pat_string(Tcl_Interp *ip, Tcl_Obj *obj, const char **val) {
+  *val= Tcl_GetString(obj);
+  return TCL_OK;
+}
+  
 int pat_hbv(Tcl_Interp *ip, Tcl_Obj *var, HBytes_Var *agg) {
   int rc;
   Tcl_Obj *val;
 
-  Tcl_IncrRefCount(var);
   agg->var= var;
 
   val= Tcl_ObjGetVar2(ip,var,0,TCL_LEAVE_ERR_MSG);
   if (!val) return TCL_ERROR;
-  if (Tcl_IsShared(val)) val= Tcl_DuplicateObj(val);
-  Tcl_IncrRefCount(val);
-  agg->obj= val;
-  
+
   rc= Tcl_ConvertToType(ip,val,&hbytes_type);
   if (rc) return rc;
 
-  agg->hb= OBJ_HBYTES(val); return TCL_OK; }
+  if (Tcl_IsShared(val)) {
+    val= Tcl_DuplicateObj(val);
+    agg->copied= 1;
+  }
+  Tcl_InvalidateStringRep(val);
+  agg->obj= val;
+
+  agg->hb= OBJ_HBYTES(val);
+  return TCL_OK;
+}
 
 void fini_hbv(Tcl_Interp *ip, int rc, HBytes_Var *agg) {
   Tcl_Obj *ro;
   
-  if (agg->obj) Tcl_InvalidateStringRep(agg->obj);
   if (!rc) {
     assert(agg->obj);
     ro= Tcl_ObjSetVar2(ip,agg->var,0,agg->obj,TCL_LEAVE_ERR_MSG);
     if (!ro) rc= TCL_ERROR;
   }
-  if (agg->obj) Tcl_DecrRefCount(agg->obj);
-  if (agg->var) Tcl_DecrRefCount(agg->var);
+  if (rc && agg->copied)
+    Tcl_DecrRefCount(agg->obj);
 }
 
 int pat_hb(Tcl_Interp *ip, Tcl_Obj *obj, HBytes_Value *val) {
@@ -77,6 +90,14 @@ Tcl_Obj *ret_int(Tcl_Interp *ip, int val) {
   return Tcl_NewIntObj(val);
 }
 
+Tcl_Obj *ret_long(Tcl_Interp *ip, long val) {
+  return Tcl_NewLongObj(val);
+}
+
+Tcl_Obj *ret_string(Tcl_Interp *ip, const char *val) {
+  return Tcl_NewStringObj(val,-1);
+}
+
 Tcl_Obj *ret_obj(Tcl_Interp *ip, Tcl_Obj *val) {
   return val;
 }