X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=hbytes%2Fchop.c;h=cccd43f285358968b2bb36c894bc96ab7f51375b;hb=9547c7ba84dfcccaa3ff7032ddeb698e163ad81d;hp=49995339b2fdcf43d5919054d5b49904b2152d33;hpb=4ab162065d72217bcad27748442cbb27860c0cbd;p=chiark-tcl.git

diff --git a/hbytes/chop.c b/hbytes/chop.c
index 4999533..cccd43f 100644
--- a/hbytes/chop.c
+++ b/hbytes/chop.c
@@ -4,58 +4,86 @@
 #include <string.h>
 
 #include "hbytes.h"
+#include "tables.h"
 
-static int strs(Tcl_Interp *ip, int strc, Tcl_Obj *const *strv, int *l_r) {
+static int strs1(Tcl_Interp *ip, int strc, Tcl_Obj *const *strv, int *l_r) {
   int rc, l, i;
 
   l= 0;
   for (i=1; i<strc; i++) {
     rc= Tcl_ConvertToType(ip,strv[i],&hbytes_type);
     if (rc) return rc;
-    l += HBYTES_LEN(HBYTES(strv[i]));
-fprintf(stderr,"strs #%d %d %02x\n",i,l,
-	HBYTES(strv[i]).start ? HBYTES(strv[i]).start[0] : 0xff);
+    l += hbytes_len(OBJ_HBYTES(strv[i]));
   }
   *l_r= l;
   return TCL_OK;
 }
 
-int app_pre(ClientData cd, Tcl_Interp *ip, int begin,
-	    HBytes_Var v, int strc, Tcl_Obj *const *strv) {
-  int ol, rc, al, i, tl;
-
-  rc= strs(ip,strc,strv,&al);  if (rc) return rc;
-
-  ol= HBYTES_LEN(*v.hb);
-  v.hb->start= v.hb->end= Tcl_Realloc(v.hb->start, ol + al);
-
-  if (begin) v.hb->end += ol;
-  else memmove(v.hb->start + al, v.hb->start, ol);
+static void strs2(Byte *dest, int strc, Tcl_Obj *const *strv) {
+  int tl, i;
   
   for (i=1; i<strc; i++) {
-    tl= HBYTES_LEN(HBYTES(strv[i]));
-    memcpy(v.hb->end, HBYTES(strv[i]).start, tl);
-    v.hb->end += tl;
+    tl= hbytes_len(OBJ_HBYTES(strv[i]));
+    memcpy(dest, hbytes_data(OBJ_HBYTES(strv[i])), tl);
+    dest += tl;
   }
-  return TCL_OK;
-}  
-
-int do_hbytes_append(ClientData cd, Tcl_Interp *ip,
-		     HBytes_Var v, int strc, Tcl_Obj *const *strv) {
-  return app_pre(cd,ip,0,v,strc,strv);
 }
-  
+
 int do_hbytes_prepend(ClientData cd, Tcl_Interp *ip,
 		      HBytes_Var v, int strc, Tcl_Obj *const *strv) {
-  return app_pre(cd,ip,1,v,strc,strv);
+  int rc, el;
+  Byte *dest;
+  
+  rc= strs1(ip,strc,strv,&el);  if (rc) return rc;
+  dest= hbytes_prepend(v.hb, el);
+  strs2(dest, strc,strv);
+  return TCL_OK;
+}
+  
+int do_hbytes_append(ClientData cd, Tcl_Interp *ip,
+		     HBytes_Var v, int strc, Tcl_Obj *const *strv) {
+  int rc, el;
+  Byte *dest;
+
+  rc= strs1(ip,strc,strv,&el);  if (rc) return rc;
+  dest= hbytes_append(v.hb, el);
+  strs2(dest,  strc,strv);
+  return TCL_OK;
 }
 
 int do_hbytes_concat(ClientData cd, Tcl_Interp *ip,
 		     int strc, Tcl_Obj *const *strv, HBytes_Value *result) {
-  HBytes_Var fake;
+  int rc, l;
+  Byte *dest;
   
-  result->start= result->end= 0;
-  fake.hb= result;
-  return app_pre(cd,ip,1,fake,strc,strv);
+  rc= strs1(ip,strc,strv,&l);  if (rc) return rc;
+  dest= hbytes_arrayspace(result,l);
+  strs2(dest, strc,strv);
+  return TCL_OK;
 }
 
+static int underrun(Tcl_Interp *ip) {
+  return staticerr(ip,"data underrun","HBYTES LENGTH UNDERRUN");
+}
+
+int do_hbytes_unprepend(ClientData cd, Tcl_Interp *ip,
+			HBytes_Var v, int preflength, HBytes_Value *result) {
+  const Byte *rdata= hbytes_unprepend(v.hb, preflength);
+  if (!rdata) return underrun(ip);
+  hbytes_array(result, rdata, preflength);
+  return TCL_OK;
+}
+
+int do_hbytes_unappend(ClientData cd, Tcl_Interp *ip,
+		       HBytes_Var v, int suflength, HBytes_Value *result) {
+  const Byte *rdata= hbytes_unappend(v.hb, suflength);
+  if (!rdata) return underrun(ip);
+  hbytes_array(result, rdata, suflength);
+  return TCL_OK;
+}
+
+int do_hbytes_chopto(ClientData cd, Tcl_Interp *ip,
+		     HBytes_Var v, int newlength, HBytes_Value *result) {
+  int suflength= hbytes_len(v.hb) - newlength;
+  return do_hbytes_unappend(0,ip,v, suflength, result);
+}