From: ian <ian>
Date: Sun, 8 Sep 2002 17:16:10 +0000 (+0000)
Subject: hbytes range
X-Git-Tag: debian/1.1.1~158
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl.git;a=commitdiff_plain;h=05bed2aad2154e0e8c084789387bf900c5ee513b

hbytes range
---

diff --git a/base/chiark-tcl.h b/base/chiark-tcl.h
index 4422d32..f542fe0 100644
--- a/base/chiark-tcl.h
+++ b/base/chiark-tcl.h
@@ -13,6 +13,8 @@
  *  hbytes chopto VAR NEWVARLENGTH               => suffix (removed from VAR)
  *                                                  (too short? error)
  *
+ *  hbytes range VALUE START SIZE                => substring (or error)
+ *
  *  hbytes compare A B
  *      =>  -2   A is lexically earlier than B and not a prefix of B  (A<B)
  *          -1   A is prefix of B but not equal                       (A<B)
diff --git a/base/hook.c b/base/hook.c
index 8774f7b..0efc5f1 100644
--- a/base/hook.c
+++ b/base/hook.c
@@ -197,6 +197,21 @@ int do_hbytes_compare(ClientData cd, Tcl_Interp *ip,
   return TCL_OK;
 }
 
+int do_hbytes_range(ClientData cd, Tcl_Interp *ip,
+		    HBytes_Value v, int start, int size,
+		    HBytes_Value *result) {
+  const Byte *data;
+  int l;
+
+  l= hbytes_len(&v);
+  if (start<0 || size<0 || l<start+size)
+    return staticerr(ip, "hbytes range subscripts out of range");
+
+  data= hbytes_data(&v);
+  hbytes_array(result, data+start, size);
+  return TCL_OK;
+}
+  
 int do__hbytes(ClientData cd, Tcl_Interp *ip,
 	       const HBytes_SubCommand *subcmd,
 	       int objc, Tcl_Obj *const *objv) {
diff --git a/base/tables-examples.tct b/base/tables-examples.tct
index 6bdc7ff..b5a104b 100644
--- a/base/tables-examples.tct
+++ b/base/tables-examples.tct
@@ -47,6 +47,11 @@ Table hbytes HBytes_SubCommand
 		a	hb
 		b	hb
 		=>	int
+	range
+		v	hb
+		start	int
+		size	int
+		=>	hb
  	prepend
  		v	hbv
  		str	...
diff --git a/hbytes/hbytes.h b/hbytes/hbytes.h
index 4422d32..f542fe0 100644
--- a/hbytes/hbytes.h
+++ b/hbytes/hbytes.h
@@ -13,6 +13,8 @@
  *  hbytes chopto VAR NEWVARLENGTH               => suffix (removed from VAR)
  *                                                  (too short? error)
  *
+ *  hbytes range VALUE START SIZE                => substring (or error)
+ *
  *  hbytes compare A B
  *      =>  -2   A is lexically earlier than B and not a prefix of B  (A<B)
  *          -1   A is prefix of B but not equal                       (A<B)
diff --git a/hbytes/hook.c b/hbytes/hook.c
index 8774f7b..0efc5f1 100644
--- a/hbytes/hook.c
+++ b/hbytes/hook.c
@@ -197,6 +197,21 @@ int do_hbytes_compare(ClientData cd, Tcl_Interp *ip,
   return TCL_OK;
 }
 
+int do_hbytes_range(ClientData cd, Tcl_Interp *ip,
+		    HBytes_Value v, int start, int size,
+		    HBytes_Value *result) {
+  const Byte *data;
+  int l;
+
+  l= hbytes_len(&v);
+  if (start<0 || size<0 || l<start+size)
+    return staticerr(ip, "hbytes range subscripts out of range");
+
+  data= hbytes_data(&v);
+  hbytes_array(result, data+start, size);
+  return TCL_OK;
+}
+  
 int do__hbytes(ClientData cd, Tcl_Interp *ip,
 	       const HBytes_SubCommand *subcmd,
 	       int objc, Tcl_Obj *const *objv) {