many improvements: use Get/SetAssocData for idtables to avoid globals, and adns bindi...

[chiark-tcl.git] / hbytes / parse.c

diff --git a/hbytes/parse.c b/hbytes/parse.c
index 125dd61eb9e182a2fbfd36f46ac824f38a9f006e..0fa5acdd4705d942ca158f5475e1691b5651e5ac 100644 (file)
--- a/hbytes/parse.c
+++ b/hbytes/parse.c
@@ -1,16 +1,111 @@
-  sc= enum_lookup_cached(ip,objv[1],subcommands,"hbytes subcommand");
+/*
+ */
 
+#include "tables.h"
 
-static Tcl_Obj *hb_getvar(Tcl_Interp *ip, Tcl_Obj *varname) {
-  int ec;
-  Tcl_Obj *value;
+int pat_charfrom(Tcl_Interp *ip, Tcl_Obj *obj, int *val,
+                const char *opts, const char *what) {
+  *val= enum1_lookup_cached_func(ip,obj,opts,what);
+  if (*val==-1) return TCL_ERROR;
+  return TCL_OK;
+}
+
+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_constv(Tcl_Interp *ip, Tcl_Obj *var,
+              Tcl_Obj **val_r, Tcl_ObjType *type) {
+  int rc;
+  Tcl_Obj *val;
   
-  value= Tcl_ObjGetVar2(ip,varname,0,TCL_LEAVE_ERR_MSG);
-  if (!value) return 0;
+  val= Tcl_ObjGetVar2(ip,var,0,TCL_LEAVE_ERR_MSG);
+  if (!val) return TCL_ERROR;
 
-  ec= Tcl_ConvertToType(ip,value,&hbytes_type);
-  if (ec) return 0;
+  if (type) {
+    rc= Tcl_ConvertToType(ip,val,type);
+    if (rc) return rc;
+  }
 
-  return value;
+  *val_r= val;
+  return TCL_OK;
 }
 
+void init_somethingv(Something_Var *sth) {
+  sth->obj=0; sth->var=0; sth->copied=0;
+}
+
+int pat_somethingv(Tcl_Interp *ip, Tcl_Obj *var,
+                  Something_Var *sth, Tcl_ObjType *type) {
+  int rc;
+  Tcl_Obj *val;
+
+  sth->var= var;
+
+  val= Tcl_ObjGetVar2(ip,var,0,TCL_LEAVE_ERR_MSG);
+  if (!val) return TCL_ERROR;
+
+  rc= Tcl_ConvertToType(ip,val,type);
+  if (rc) return rc;
+
+  if (Tcl_IsShared(val)) {
+    val= Tcl_DuplicateObj(val);
+    sth->copied= 1;
+  }
+  Tcl_InvalidateStringRep(val);
+  sth->obj= val;
+
+  return TCL_OK;
+}
+
+int pat_hbv(Tcl_Interp *ip, Tcl_Obj *var, HBytes_Var *agg) {
+  int rc;
+  rc= pat_somethingv(ip,var,&agg->sth,&hbytes_type);  if (rc) return rc;
+  agg->hb= OBJ_HBYTES(agg->sth.obj);
+  return TCL_OK;
+}
+
+void fini_somethingv(Tcl_Interp *ip, int rc, Something_Var *sth) {
+  Tcl_Obj *ro;
+  
+  if (!rc) {
+    assert(sth->obj);
+    ro= Tcl_ObjSetVar2(ip,sth->var,0,sth->obj,TCL_LEAVE_ERR_MSG);
+    if (!ro) rc= TCL_ERROR;
+  }
+  if (rc && sth->copied)
+    Tcl_DecrRefCount(sth->obj);
+}
+
+int pat_hb(Tcl_Interp *ip, Tcl_Obj *obj, HBytes_Value *val) {
+  int rc;
+  rc= Tcl_ConvertToType(ip,obj,&hbytes_type);  if (rc) return rc;
+  *val= *OBJ_HBYTES(obj);
+  return TCL_OK;
+}
+
+Tcl_Obj *ret_hb(Tcl_Interp *ip, HBytes_Value val) {
+  Tcl_Obj *obj;
+  obj= Tcl_NewObj();
+  Tcl_InvalidateStringRep(obj);
+  *OBJ_HBYTES(obj)= val;
+  obj->typePtr= &hbytes_type;
+  return obj;
+}
+
+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);
+}