/*
*/
-#include "tables.h"
+#include "chiark_tcl_hbytes.h"
-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_enum(Tcl_Interp *ip, Tcl_Obj *obj, const void **val,
- const void *opts, size_t sz, const char *what) {
- *val= enum_lookup_cached_func(ip,obj,opts,sz,what);
- if (!*val) return TCL_ERROR;
- return TCL_OK;
-}
-
-int pat_obj(Tcl_Interp *ip, Tcl_Obj *obj, Tcl_Obj **val) {
- *val= obj;
- return TCL_OK;
-}
-
-int pat_hbv(Tcl_Interp *ip, Tcl_Obj *var, HBytes_Var *agg) {
+int cht_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);
+ rc= cht_pat_somethingv(ip,var,&agg->sth,&cht_hbytes_type);
if (rc) return rc;
-
- agg->hb= &HBYTES(val);
+ agg->hb= OBJ_HBYTES(agg->sth.obj);
return TCL_OK;
}
-
-void fini_hbv(Tcl_Interp *ip, int rc, HBytes_Var *agg) {
- Tcl_Obj *ro;
-
- 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);
-}
-
-int pat_hb(Tcl_Interp *ip, Tcl_Obj *obj, HBytes_Value *val) {
+int cht_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= HBYTES(obj);
+ rc= Tcl_ConvertToType(ip,obj,&cht_hbytes_type); if (rc) return rc;
+ *val= *OBJ_HBYTES(obj);
return TCL_OK;
}
-Tcl_Obj *ret_hb(Tcl_Interp *ip, HBytes_Value val) {
- return hbytes_set_obj(0, val.start, HBYTES_LEN(val));
+Tcl_Obj *cht_ret_hb(Tcl_Interp *ip, HBytes_Value val) {
+ Tcl_Obj *obj;
+ obj= Tcl_NewObj();
+ Tcl_InvalidateStringRep(obj);
+ *OBJ_HBYTES(obj)= val;
+ obj->typePtr= &cht_hbytes_type;
+ return obj;
}